Fix term counters in script field terms facet

Fixes #2878
elastic · Apr 9, 2013 · b0e44a2 · b0e44a2
1 parent ae74a8d
commit b0e44a2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/...ava/org/elasticsearch/search/facet/terms/strings/ScriptTermsStringFieldFacetExecutor.java b/...ava/org/elasticsearch/search/facet/terms/strings/ScriptTermsStringFieldFacetExecutor.java
@@ -182,7 +182,7 @@ public void collect(int doc) throws IOException {
         @Override
         public void postCollection() {
             ScriptTermsStringFieldFacetExecutor.this.missing = missing;
-            ScriptTermsStringFieldFacetExecutor.this.total = missing;
+            ScriptTermsStringFieldFacetExecutor.this.total = total;
         }
 
         private boolean match(String value) {

diff --git a/src/test/java/org/elasticsearch/test/integration/search/facet/SimpleFacetsTests.java b/src/test/java/org/elasticsearch/test/integration/search/facet/SimpleFacetsTests.java
@@ -1297,11 +1297,15 @@ private void testTermsFacets(String executionHint) throws Exception {
 
             facet = searchResponse.getFacets().facet("facet1");
             assertThat(facet.getName(), equalTo("facet1"));
+            assertThat(facet.getTotalCount(), equalTo(2l));
+            assertThat(facet.getOtherCount(), equalTo(0l));
             assertThat(facet.getEntries().size(), equalTo(1));
             assertThat(facet.getEntries().get(0).getTerm().string(), equalTo("111"));
             assertThat(facet.getEntries().get(0).getCount(), equalTo(2));
 
             facet = searchResponse.getFacets().facet("facet2");
+            assertThat(facet.getTotalCount(), equalTo(4l));
+            assertThat(facet.getOtherCount(), equalTo(0l));
             assertThat(facet.getName(), equalTo("facet2"));
             assertThat(facet.getEntries().size(), equalTo(3));
             assertThat(facet.getEntries().get(0).getTerm().string(), equalTo("yyy"));