Fork LRUQueryCache

Author: dnhatn

server/src/main/java/org/elasticsearch/indices/IndicesQueryCache.java

@@ -11,9 +11,9 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.search.Explanation;
-import org.apache.lucene.search.LRUQueryCache;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.QueryCache;
 import org.apache.lucene.search.QueryCachingPolicy;
@@ -30,6 +30,7 @@
 import org.elasticsearch.index.cache.query.QueryCacheStats;
 import org.elasticsearch.index.shard.IndexShard;
 import org.elasticsearch.index.shard.ShardId;
+import org.elasticsearch.lucene.search.XLRUQueryCache;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -66,7 +67,7 @@ public class IndicesQueryCache implements QueryCache, Closeable {
         Property.NodeScope
     );
 
-    private final LRUQueryCache cache;
+    private final XLRUQueryCache cache;
     private final ShardCoreKeyMap shardKeyMap = new ShardCoreKeyMap();
     private final Map<ShardId, Stats> shardStats = new ConcurrentHashMap<>();
     private volatile long sharedRamBytesUsed;
@@ -336,7 +337,7 @@ public void onClose(ShardId shardId) {
         shardStats.remove(shardId);
     }
 
-    private class ElasticsearchLRUQueryCache extends LRUQueryCache {
+    private class ElasticsearchLRUQueryCache extends XLRUQueryCache {
 
         ElasticsearchLRUQueryCache(int maxSize, long maxRamBytesUsed, Predicate<LeafReaderContext> leavesToCache, float skipFactor) {
             super(maxSize, maxRamBytesUsed, leavesToCache, skipFactor);
@@ -432,5 +433,16 @@ protected void onMiss(Object readerCoreKey, Query filter) {
             final Stats shardStats = getOrCreateStats(readerCoreKey);
             shardStats.missCount += 1;
         }
+
+        @Override
+        protected CacheAndCount tryPopulateCache(
+            IndexReader.CacheHelper cacheKey,
+            Weight weight,
+            ScorerSupplier scorerSupplier,
+            LeafReaderContext context
+        ) throws IOException {
+            // TODO: handle intra-segment Weight
+            return super.tryPopulateCache(cacheKey, weight, scorerSupplier, context);
+        }
     }
 }