From 1dc425a53b8e3aa2795af4c928c6bba4a39f609d Mon Sep 17 00:00:00 2001 From: Colin Goodheart-Smithe Date: Tue, 5 Aug 2014 10:38:59 +0100 Subject: [PATCH] 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 --- .../search/aggregations/bucket/terms/DoubleTerms.java | 2 +- .../search/aggregations/bucket/terms/LongTerms.java | 2 +- 2 files changed, 2 insertions(+), 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 index 876499c8505cb..90c3723d501dd 100644 --- 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 index 9d697d2e91133..e7d95d2074419 100644 --- 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());