honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix missing null values for std_deviation_bounds in ext. stats aggs (#58000) 

Adds missing null values for std_deviation_bounds in extended stats aggs and
improves null handling in parsed extended stats.
This commit is contained in:
Igor Motov 2020-06-11 16:23:20 -04:00 committed by GitHub
parent 1814b66a69
commit 5138c0c045
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/main/java/org/elasticsearch/search/aggregations/metrics/InternalExtendedStats.java
View File

@ -329,6 +329,10 @@ public class InternalExtendedStats extends InternalStats implements ExtendedStat
{
builder.nullField(Fields.UPPER);
builder.nullField(Fields.LOWER);
builder.nullField(Fields.UPPER_POPULATION);
builder.nullField(Fields.LOWER_POPULATION);
builder.nullField(Fields.UPPER_SAMPLING);
builder.nullField(Fields.LOWER_SAMPLING);
}
builder.endObject();
}

35
server/src/main/java/org/elasticsearch/search/aggregations/metrics/ParsedExtendedStats.java
View File

@ -95,14 +95,12 @@ public class ParsedExtendedStats extends ParsedStats implements ExtendedStats {
}
private void setStdDeviationBounds(List<Double> bounds) {
int i = 0;
this.stdDeviationBoundUpper = bounds.get(i++);
this.stdDeviationBoundLower = bounds.get(i++);
this.stdDeviationBoundUpperPopulation = bounds.get(i++);
this.stdDeviationBoundLowerPopulation = bounds.get(i++);
this.stdDeviationBoundUpperSampling = bounds.get(i++);
this.stdDeviationBoundLowerSampling = bounds.get(i);
this.stdDeviationBoundUpper = bounds.get(0);
this.stdDeviationBoundLower = bounds.get(1);
this.stdDeviationBoundUpperPopulation = bounds.get(2) == null ? 0 : bounds.get(2);
this.stdDeviationBoundLowerPopulation = bounds.get(3) == null ? 0 : bounds.get(3);
this.stdDeviationBoundUpperSampling = bounds.get(4) == null ? 0 : bounds.get(4);
this.stdDeviationBoundLowerSampling = bounds.get(5) == null ? 0 : bounds.get(5);
}
@Override
@ -126,13 +124,20 @@ public class ParsedExtendedStats extends ParsedStats implements ExtendedStats {
}
private void setStdDeviationBoundsAsString(List<String> boundsAsString) {
int i = 0;
this.valueAsString.put(Fields.STD_DEVIATION_BOUNDS_AS_STRING + "_upper", boundsAsString.get(i++));
this.valueAsString.put(Fields.STD_DEVIATION_BOUNDS_AS_STRING + "_lower", boundsAsString.get(i++));
this.valueAsString.put(Fields.STD_DEVIATION_BOUNDS_AS_STRING + "_upper_population", boundsAsString.get(i++));
this.valueAsString.put(Fields.STD_DEVIATION_BOUNDS_AS_STRING + "_lower_population", boundsAsString.get(i++));
this.valueAsString.put(Fields.STD_DEVIATION_BOUNDS_AS_STRING + "_upper_sampling", boundsAsString.get(i++));
this.valueAsString.put(Fields.STD_DEVIATION_BOUNDS_AS_STRING + "_lower_sampling", boundsAsString.get(i));
this.valueAsString.put(Fields.STD_DEVIATION_BOUNDS_AS_STRING + "_upper", boundsAsString.get(0));
this.valueAsString.put(Fields.STD_DEVIATION_BOUNDS_AS_STRING + "_lower", boundsAsString.get(1));
if (boundsAsString.get(2) != null) {
this.valueAsString.put(Fields.STD_DEVIATION_BOUNDS_AS_STRING + "_upper_population", boundsAsString.get(2));
}
if (boundsAsString.get(3) != null) {
this.valueAsString.put(Fields.STD_DEVIATION_BOUNDS_AS_STRING + "_lower_population", boundsAsString.get(3));
}
if (boundsAsString.get(4) != null) {
this.valueAsString.put(Fields.STD_DEVIATION_BOUNDS_AS_STRING + "_upper_sampling", boundsAsString.get(4));
}
if (boundsAsString.get(5) != null) {
this.valueAsString.put(Fields.STD_DEVIATION_BOUNDS_AS_STRING + "_lower_sampling", boundsAsString.get(5));
}
}
@Override