Skip to content

Add doc_count to ParsedMatrixStats #24952

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
May 30, 2017
Merged

Add doc_count to ParsedMatrixStats #24952

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
10 changes: 9 additions & 1 deletion ...s/src/main/java/org/elasticsearch/search/aggregations/matrix/stats/ParsedMatrixStats.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,20 @@ public class ParsedMatrixStats extends ParsedAggregation implements MatrixStats
private final Map<String, Map<String, Double>> covariances = new HashMap<>();
private final Map<String, Map<String, Double>> 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
Expand Down Expand Up @@ -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()) {
Expand Down Expand Up @@ -148,6 +155,7 @@ private static <T> T checkedGet(final Map<String, T> 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;
Expand Down
3 changes: 1 addition & 2 deletions ...est/java/org/elasticsearch/search/aggregations/matrix/stats/InternalMatrixStatsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down