Skip to content

Render sum as zero if count is zero for stats aggregation #27193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 2, 2017
Merged

Render sum as zero if count is zero for stats aggregation #27193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/InternalStats.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ public XContentBuilder doXContentBody(XContentBuilder builder, Params params) th
builder.nullField(Fields.MIN);
builder.nullField(Fields.MAX);
builder.nullField(Fields.AVG);
builder.nullField(Fields.SUM);
builder.field(Fields.SUM, 0.0d);
}
otherStatsToXContent(builder, params);
return builder;
Expand Down
57 changes: 56 additions & 1 deletion core/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalStatsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,18 @@
package org.elasticsearch.search.aggregations.metrics;

import org.elasticsearch.common.io.stream.Writeable;
import org.elasticsearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.json.JsonXContent;
import org.elasticsearch.search.DocValueFormat;
import org.elasticsearch.search.aggregations.ParsedAggregation;
import org.elasticsearch.search.aggregations.metrics.stats.InternalStats;
import org.elasticsearch.search.aggregations.metrics.stats.ParsedStats;
import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator;
import org.elasticsearch.test.InternalAggregationTestCase;

import java.io.IOException;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -80,7 +85,7 @@ static void assertStats(InternalStats aggregation, ParsedStats parsed) {
long count = aggregation.getCount();
assertEquals(count, parsed.getCount());
// for count == 0, fields are rendered as `null`, so we test that we parse to default values used also in the reduce phase
assertEquals(count > 0 ? aggregation.getMin() : Double.POSITIVE_INFINITY , parsed.getMin(), 0);
assertEquals(count > 0 ? aggregation.getMin() : Double.POSITIVE_INFINITY, parsed.getMin(), 0);
assertEquals(count > 0 ? aggregation.getMax() : Double.NEGATIVE_INFINITY, parsed.getMax(), 0);
assertEquals(count > 0 ? aggregation.getSum() : 0, parsed.getSum(), 0);
assertEquals(count > 0 ? aggregation.getAvg() : 0, parsed.getAvg(), 0);
Expand Down Expand Up @@ -153,5 +158,55 @@ protected InternalStats mutateInstance(InternalStats instance) {
}
return new InternalStats(name, count, sum, min, max, formatter, pipelineAggregators, metaData);
}

public void testDoXContentBody() throws IOException {
// count is greater than zero
double min = randomDoubleBetween(-1000000, 1000000, true);
double max = randomDoubleBetween(-1000000, 1000000, true);
double sum = randomDoubleBetween(-1000000, 1000000, true);
int count = randomIntBetween(1, 10);
DocValueFormat format = randomNumericDocValueFormat();
InternalStats internalStats = createInstance("stats", count, sum, min, max, format, Collections.emptyList(), null);
XContentBuilder builder = JsonXContent.contentBuilder().prettyPrint();
builder.startObject();
internalStats.doXContentBody(builder, ToXContent.EMPTY_PARAMS);
builder.endObject();

String expected = "{\n" +
" \"count\" : " + count + ",\n" +
" \"min\" : " + min + ",\n" +
" \"max\" : " + max + ",\n" +
" \"avg\" : " + internalStats.getAvg() + ",\n" +
" \"sum\" : " + sum;
if (format != DocValueFormat.RAW) {
expected += ",\n"+
" \"min_as_string\" : \"" + format.format(internalStats.getMin()) + "\",\n" +
" \"max_as_string\" : \"" + format.format(internalStats.getMax()) + "\",\n" +
" \"avg_as_string\" : \"" + format.format(internalStats.getAvg()) + "\",\n" +
" \"sum_as_string\" : \"" + format.format(internalStats.getSum()) + "\"";
}
expected += "\n}";
assertEquals(expected, builder.string());

// count is zero
format = randomNumericDocValueFormat();
min = 0.0;
max = 0.0;
sum = 0.0;
count = 0;
internalStats = createInstance("stats", count, sum, min, max, format, Collections.emptyList(), null);
builder = JsonXContent.contentBuilder().prettyPrint();
builder.startObject();
internalStats.doXContentBody(builder, ToXContent.EMPTY_PARAMS);
builder.endObject();

assertEquals("{\n" +
" \"count\" : 0,\n" +
" \"min\" : null,\n" +
" \"max\" : null,\n" +
" \"avg\" : null,\n" +
" \"sum\" : 0.0\n" +
"}", builder.string());
}
}