Issue 6465 - Maintain separate long-term cache in CombinedMatcher

lib/matcher.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 "use strict";
 
 /**
  * @fileOverview Matcher class implementing matching addresses against
  *               a list of filters.
  */
 
 const {Filter, WhitelistFilter} = require("./filterClasses");
+
+function Cache(capacity)
+{
+  this.capacity = capacity;
+
+  this.fresh = new Map();
+  this.hot = new Map();
+}
+
+Cache.prototype = {
+  get(key)
+  {
+    let value = this.hot.get(key);
+    if (value !== undefined)
+      return value;
+
+    value = this.fresh.get(key);
+    if (value !== undefined)
+      this.set(key, value, this.hot);
+
+    return value;
+  },
+
+  set(key, value, map = this.fresh)
+  {
+    if (map.size >= this.capacity / 2)
+      map.clear();
+
+    map.set(key, value);
+  },
+
+  clear()
+  {
+    this.fresh.clear();
+    this.hot.clear();
+  }
+};
 
 /**
  * Blacklist/whitelist filter matching
  * @constructor
  */
 function Matcher()
 {
   this.clear();
 }
 exports.Matcher = Matcher;
@@ skipping 205 matching lines @@
 /**
  * Combines a matcher for blocking and exception rules, automatically sorts
  * rules into two Matcher instances.
  * @constructor
  * @augments Matcher
  */
 function CombinedMatcher()
 {
   this.blacklist = new Matcher();
   this.whitelist = new Matcher();
-  this.resultCache = new Map();
-  this.frequentResultCache = new Map();
+  this.resultCache = new Cache(CombinedMatcher.maxCacheEntries);
 }
 exports.CombinedMatcher = CombinedMatcher;
 
 /**
  * Maximal number of matching cache entries to be kept
  * @type {number}
  */
-CombinedMatcher.maxCacheEntries = 500;
+CombinedMatcher.maxCacheEntries = 1000;
 
 CombinedMatcher.prototype =
 {
   /**
    * Matcher for blocking rules.
    * @type {Matcher}
    */
   blacklist: null,
 
   /**
    * Matcher for exception rules.
    * @type {Matcher}
    */
   whitelist: null,
 
   /**
    * Lookup table of previous matchesAny results
-   * @type {Map.<string,Filter>}
+   * @type {Cache.<string,Filter>}
    */
   resultCache: null,
-
-  /**
-   * Lookup table of frequently accessed previous matchesAny results
-   * @type {Map.<string,Filter>}
-   */
-  frequentResultCache: null,
 
   /**
    * @see Matcher#clear
    */
   clear()
   {
     this.blacklist.clear();
     this.whitelist.clear();
     this.resultCache.clear();
-    this.frequentResultCache.clear();
   },
 
   /**
    * @see Matcher#add
    * @param {Filter} filter
    */
   add(filter)
   {
     if (filter instanceof WhitelistFilter)
       this.whitelist.add(filter);
     else
       this.blacklist.add(filter);
 
     this.resultCache.clear();
-    this.frequentResultCache.clear();
   },
 
   /**
    * @see Matcher#remove
    * @param {Filter} filter
    */
   remove(filter)
   {
     if (filter instanceof WhitelistFilter)
       this.whitelist.remove(filter);
     else
       this.blacklist.remove(filter);
 
     this.resultCache.clear();
-    this.frequentResultCache.clear();
   },
 
   /**
    * @see Matcher#findKeyword
    * @param {Filter} filter
    * @return {string} keyword
    */
   findKeyword(filter)
   {
     if (filter instanceof WhitelistFilter)
@@ skipping 76 matching lines @@
 
   /**
    * @see Matcher#matchesAny
    * @inheritdoc
    */
   matchesAny(location, typeMask, docDomain, thirdParty, sitekey, specificOnly)
   {
     let key = location + " " + typeMask + " " + docDomain + " " + thirdParty +
       " " + sitekey + " " + specificOnly;
 
-    let result = this.frequentResultCache.get(key);
+    let result = this.resultCache.get(key);
     if (result !== undefined)
       return result;
 
-    result = this.resultCache.get(key);
-    if (result !== undefined)
-    {
-      if (this.frequentResultCache.size >= CombinedMatcher.maxCacheEntries)
-        this.frequentResultCache.clear();
-
-      this.frequentResultCache.set(key, result);
-
-      return result;
-    }
-
     result = this.matchesAnyInternal(location, typeMask, docDomain,
                                      thirdParty, sitekey, specificOnly);
-
-    if (this.resultCache.size >= CombinedMatcher.maxCacheEntries)
-      this.resultCache.clear();
 
     this.resultCache.set(key, result);
 
     return result;
   }
 };
 
 /**
  * Shared CombinedMatcher instance that should usually be used.
  * @type {CombinedMatcher}
  */
 exports.defaultMatcher = new CombinedMatcher();