use cache recycler for count histo and data histo facets

modules/benchmark/micro/src/main/java/org/elasticsearch/benchmark/search/facet/HistogramFacetSearchBenchmark.java

@@ -61,7 +61,7 @@ public class HistogramFacetSearchBenchmark {
 
         Client client = clientNode.client();
 
-        long COUNT = SizeValue.parseSizeValue("1m").singles();
+        long COUNT = SizeValue.parseSizeValue("5m").singles();
         int BATCH = 500;
         int QUERY_WARMUP = 20;
         int QUERY_COUNT = 200;
@@ -112,7 +112,8 @@ public class HistogramFacetSearchBenchmark {
             }
         }
         client.admin().indices().prepareRefresh().execute().actionGet();
-        System.out.println("--> Number of docs in index: " + client.prepareCount().setQuery(matchAllQuery()).execute().actionGet().count());
+        COUNT = client.prepareCount().setQuery(matchAllQuery()).execute().actionGet().count();
+        System.out.println("--> Number of docs in index: " + COUNT);
 
         System.out.println("--> Warmup...");
         // run just the child query, warm up first

modules/elasticsearch/src/main/java/org/elasticsearch/common/CacheRecycler.java

@@ -38,6 +38,36 @@ public class CacheRecycler {
         intArray.remove();
     }
 
+    // ----- TLongLongHashMap ----
+
+    private static ThreadLocal<SoftReference<Deque<TLongLongHashMap>>> longLongHashMap = new ThreadLocal<SoftReference<Deque<TLongLongHashMap>>>();
+
+
+    public static TLongLongHashMap popLongLongMap() {
+        SoftReference<Deque<TLongLongHashMap>> ref = longLongHashMap.get();
+        Deque<TLongLongHashMap> deque = ref == null ? null : ref.get();
+        if (deque == null) {
+            deque = new ArrayDeque<TLongLongHashMap>();
+            longLongHashMap.set(new SoftReference<Deque<TLongLongHashMap>>(deque));
+        }
+        if (deque.isEmpty()) {
+            return new TLongLongHashMap();
+        }
+        TLongLongHashMap map = deque.pollFirst();
+        map.clear();
+        return map;
+    }
+
+    public static void pushLongLongMap(TLongLongHashMap map) {
+        SoftReference<Deque<TLongLongHashMap>> ref = longLongHashMap.get();
+        Deque<TLongLongHashMap> deque = ref == null ? null : ref.get();
+        if (deque == null) {
+            deque = new ArrayDeque<TLongLongHashMap>();
+            longLongHashMap.set(new SoftReference<Deque<TLongLongHashMap>>(deque));
+        }
+        deque.add(map);
+    }
+
     // ----- TIntIntHashMap ----
 
     private static ThreadLocal<SoftReference<Deque<TIntIntHashMap>>> intIntHashMap = new ThreadLocal<SoftReference<Deque<TIntIntHashMap>>>();

modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/datehistogram/CountDateHistogramFacetCollector.java

@@ -20,6 +20,7 @@
 package org.elasticsearch.search.facet.datehistogram;
 
 import org.apache.lucene.index.IndexReader;
+import org.elasticsearch.common.CacheRecycler;
 import org.elasticsearch.common.joda.time.MutableDateTime;
 import org.elasticsearch.common.trove.map.hash.TLongLongHashMap;
 import org.elasticsearch.index.cache.field.data.FieldDataCache;
@@ -93,6 +94,7 @@ public class CountDateHistogramFacetCollector extends AbstractFacetCollector {
     }
 
     @Override public Facet facet() {
+        CacheRecycler.pushLongLongMap(histoProc.counts());
         return new InternalCountDateHistogramFacet(facetName, comparatorType, histoProc.counts());
     }
 
@@ -102,7 +104,7 @@ public class CountDateHistogramFacetCollector extends AbstractFacetCollector {
 
     public static class DateHistogramProc implements LongFieldData.DateValueInDocProc {
 
-        protected final TLongLongHashMap counts = new TLongLongHashMap();
+        protected final TLongLongHashMap counts = CacheRecycler.popLongLongMap();
 
         @Override public void onValue(int docId, MutableDateTime dateTime) {
             counts.adjustOrPutValue(dateTime.getMillis(), 1, 1);

modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/histogram/CountHistogramFacetCollector.java

@@ -20,6 +20,7 @@
 package org.elasticsearch.search.facet.histogram;
 
 import org.apache.lucene.index.IndexReader;
+import org.elasticsearch.common.CacheRecycler;
 import org.elasticsearch.common.trove.map.hash.TLongLongHashMap;
 import org.elasticsearch.index.cache.field.data.FieldDataCache;
 import org.elasticsearch.index.field.data.FieldDataType;
@@ -85,6 +86,7 @@ public class CountHistogramFacetCollector extends AbstractFacetCollector {
     }
 
     @Override public Facet facet() {
+        CacheRecycler.pushLongLongMap(histoProc.counts());
         return new InternalCountHistogramFacet(facetName, comparatorType, histoProc.counts());
     }
 
@@ -96,7 +98,7 @@ public class CountHistogramFacetCollector extends AbstractFacetCollector {
 
         private final long interval;
 
-        private final TLongLongHashMap counts = new TLongLongHashMap();
+        private final TLongLongHashMap counts = CacheRecycler.popLongLongMap();
 
         private int missing;