terms lookup filter builder cache

brandonkearby · Jun 28, 2017 · e0755c6 · e0755c6
1 parent e738014
commit e0755c6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.elasticsearch</groupId>
     <artifactId>elasticsearch</artifactId>
-    <version>1.4.1-rest-1.0.71</version>
+    <version>1.4.1-rest-1.0.72</version>
     <packaging>jar</packaging>
     <description>Elasticsearch - Open Source, Distributed, RESTful Search Engine</description>
     <inceptionYear>2009</inceptionYear>

diff --git a/src/main/java/org/elasticsearch/index/query/TermsLookupFilterBuilder.java b/src/main/java/org/elasticsearch/index/query/TermsLookupFilterBuilder.java
@@ -22,6 +22,7 @@
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.elasticsearch.Version;
+import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.xcontent.ToXContentUtils;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 
@@ -111,6 +112,7 @@ public TermsLookupFilterBuilder cacheKey(String cacheKey) {
     @Override
     public void doXContent(XContentBuilder builder, Params params) throws IOException {
         if (ToXContentUtils.getVersionFromParams(params).onOrAfter(Version.V_5_0_0) && BooleanUtils.isTrue(cache) && StringUtils.isNotBlank(cacheKey)) {
+            // doing it this way as query response gets cached and query builder gets cached as well.
             BoolFilterBuilder boolFilter = FilterBuilders.boolFilter().must(this).cache(true).cacheKey(cacheKey);
             doCopyingCacheKey(builder, params, boolFilter);
         } else {
@@ -120,14 +122,11 @@ public void doXContent(XContentBuilder builder, Params params) throws IOExceptio
 
     private void doCopyingCacheKey(XContentBuilder builder, Params params, BoolFilterBuilder boolFilter) throws IOException {
         boolean cacheCopy = cache;
-        String cacheKeyCopy = cacheKey;
         cache = null; // avoid recursion
-        cacheKey = null;
         try {
             boolFilter.doXContent(builder, params);
         } finally {
             this.cache = cacheCopy;
-            this.cacheKey = cacheKeyCopy;
         }
     }
 
@@ -147,6 +146,12 @@ private void doLookupXContent(XContentBuilder builder, Params params) throws IOE
             builder.field("cache", lookupCache);
         }
         builder.field("path", lookupPath);
+
+        if (Strings.hasLength(cacheKey) && ToXContentUtils.getVersionFromParams(params).onOrAfter(Version.V_5_0_0)) {
+            // cache key support for es5 terms lookup
+            builder.field("_cache_key", cacheKey);
+        }
+
         builder.endObject();
 
         if (filterName != null) {