diff --git a/modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/stats/ParsedMatrixStats.java b/modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/stats/ParsedMatrixStats.java index 62b51a8dd934b..a0b9224ad0d25 100644 --- a/modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/stats/ParsedMatrixStats.java +++ b/modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/stats/ParsedMatrixStats.java @@ -41,14 +41,20 @@ public class ParsedMatrixStats extends ParsedAggregation implements MatrixStats private final Map> covariances = new HashMap<>(); private final Map> correlations = new HashMap<>(); + private long docCount; + @Override public String getType() { return MatrixStatsAggregationBuilder.NAME; } + private void setDocCount(long docCount) { + this.docCount = docCount; + } + @Override public long getDocCount() { - throw new UnsupportedOperationException(); + return docCount; } @Override @@ -97,6 +103,7 @@ public double getCorrelation(String fieldX, String fieldY) { @Override protected XContentBuilder doXContentBody(XContentBuilder builder, Params params) throws IOException { + builder.field(CommonFields.DOC_COUNT.getPreferredName(), getDocCount()); if (counts != null && counts.isEmpty() == false) { builder.startArray(InternalMatrixStats.Fields.FIELDS); for (String fieldName : counts.keySet()) { @@ -148,6 +155,7 @@ private static T checkedGet(final Map values, final String fieldN new ObjectParser<>(ParsedMatrixStats.class.getSimpleName(), true, ParsedMatrixStats::new); static { declareAggregationFields(PARSER); + PARSER.declareLong(ParsedMatrixStats::setDocCount, CommonFields.DOC_COUNT); PARSER.declareObjectArray((matrixStats, results) -> { for (ParsedMatrixStatsResult result : results) { final String fieldName = result.name; diff --git a/modules/aggs-matrix-stats/src/test/java/org/elasticsearch/search/aggregations/matrix/stats/InternalMatrixStatsTests.java b/modules/aggs-matrix-stats/src/test/java/org/elasticsearch/search/aggregations/matrix/stats/InternalMatrixStatsTests.java index 13c67b9dbb38d..a6c6ed834d8df 100644 --- a/modules/aggs-matrix-stats/src/test/java/org/elasticsearch/search/aggregations/matrix/stats/InternalMatrixStatsTests.java +++ b/modules/aggs-matrix-stats/src/test/java/org/elasticsearch/search/aggregations/matrix/stats/InternalMatrixStatsTests.java @@ -133,8 +133,7 @@ protected void assertFromXContent(InternalMatrixStats expected, ParsedAggregatio assertTrue(parsedAggregation instanceof ParsedMatrixStats); ParsedMatrixStats actual = (ParsedMatrixStats) parsedAggregation; - //norelease add parsing logic for doc count and enable this test once elastic/elasticsearch#24776 is merged - //assertEquals(expected.getDocCount(), actual.getDocCount()); + assertEquals(expected.getDocCount(), actual.getDocCount()); for (String field : fields) { assertEquals(expected.getFieldCount(field), actual.getFieldCount(field));