Aggregations: key_as_string only shown when format specified in terms…

… agg The key_as_string field is now not shown in the terms aggregation for long and double fields unless the format parameter is specified Closes #7125
elastic · Sep 8, 2014 · 1dc425a · 1dc425a
1 parent 1cf9000
commit 1dc425a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/DoubleTerms.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/DoubleTerms.java
@@ -180,7 +180,7 @@ public XContentBuilder doXContentBody(XContentBuilder builder, Params params) th
         for (InternalTerms.Bucket bucket : buckets) {
             builder.startObject();
             builder.field(CommonFields.KEY, ((Bucket) bucket).term);
-            if (formatter != null) {
+            if (formatter != null && formatter != ValueFormatter.RAW) {
                 builder.field(CommonFields.KEY_AS_STRING, formatter.format(((Bucket) bucket).term));
             }
             builder.field(CommonFields.DOC_COUNT, bucket.getDocCount());

diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/LongTerms.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/LongTerms.java
@@ -181,7 +181,7 @@ public XContentBuilder doXContentBody(XContentBuilder builder, Params params) th
         for (InternalTerms.Bucket bucket : buckets) {
             builder.startObject();
             builder.field(CommonFields.KEY, ((Bucket) bucket).term);
-            if (formatter != null) {
+            if (formatter != null && formatter != ValueFormatter.RAW) {
                 builder.field(CommonFields.KEY_AS_STRING, formatter.format(((Bucket) bucket).term));
             }
             builder.field(CommonFields.DOC_COUNT, bucket.getDocCount());