Skip to content
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

Treat PostDataActionResponse.DataCounts.bucketCount as incremental rather than absolute (total). #44803

Merged
merged 1 commit into from
Jul 25, 2019
+18 −17
Merged

Treat PostDataActionResponse.DataCounts.bucketCount as incremental rather than absolute (total). #44803

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
4 changes: 2 additions & 2 deletions ...ugin/core/src/main/java/org/elasticsearch/xpack/core/ml/datafeed/DatafeedTimingStats.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@ public void incrementTotalSearchTimeMs(double searchTimeMs) {
this.totalSearchTimeMs += searchTimeMs;
}

public void setBucketCount(long bucketCount) {
this.bucketCount = bucketCount;
public void incrementBucketCount(long bucketCount) {
this.bucketCount += bucketCount;
}

@Override
Expand Down
8 changes: 4 additions & 4 deletions ...core/src/test/java/org/elasticsearch/xpack/core/ml/datafeed/DatafeedTimingStatsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,9 @@ public void testIncrementTotalSearchTimeMs() {
assertThat(stats.getAvgSearchTimePerBucketMs(), equalTo(30.0));
}

public void testSetBucketCount() {
public void testIncrementBucketCount() {
DatafeedTimingStats stats = new DatafeedTimingStats(JOB_ID, 5, 10, 100.0);
stats.setBucketCount(20);
stats.incrementBucketCount(10);
assertThat(stats.getJobId(), equalTo(JOB_ID));
assertThat(stats.getSearchCount(), equalTo(5L));
assertThat(stats.getBucketCount(), equalTo(20L));
Expand All @@ -141,7 +141,7 @@ public void testAvgSearchTimePerBucketIsCalculatedProperlyAfterUpdates() {
assertThat(stats.getTotalSearchTimeMs(), equalTo(100.0));
assertThat(stats.getAvgSearchTimePerBucketMs(), equalTo(10.0));

stats.setBucketCount(20);
stats.incrementBucketCount(10);
assertThat(stats.getBucketCount(), equalTo(20L));
assertThat(stats.getTotalSearchTimeMs(), equalTo(100.0));
assertThat(stats.getAvgSearchTimePerBucketMs(), equalTo(5.0));
Expand All @@ -151,7 +151,7 @@ public void testAvgSearchTimePerBucketIsCalculatedProperlyAfterUpdates() {
assertThat(stats.getTotalSearchTimeMs(), equalTo(300.0));
assertThat(stats.getAvgSearchTimePerBucketMs(), equalTo(15.0));

stats.setBucketCount(25);
stats.incrementBucketCount(5);
assertThat(stats.getBucketCount(), equalTo(25L));
assertThat(stats.getTotalSearchTimeMs(), equalTo(300.0));
assertThat(stats.getAvgSearchTimePerBucketMs(), equalTo(12.0));
Expand Down
2 changes: 1 addition & 1 deletion ...gin/ml/src/main/java/org/elasticsearch/xpack/ml/datafeed/DatafeedTimingStatsReporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public void reportDataCounts(DataCounts dataCounts) {
if (dataCounts == null) {
return;
}
currentTimingStats.setBucketCount(dataCounts.getBucketCount());
currentTimingStats.incrementBucketCount(dataCounts.getBucketCount());
flushIfDifferSignificantly();
}

Expand Down
2 changes: 1 addition & 1 deletion ...main/java/org/elasticsearch/xpack/ml/job/process/autodetect/AutodetectProcessManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ public void persistJob(JobTask jobTask, Consumer<Exception> handler) {
* @param input Data input stream
* @param xContentType the {@link XContentType} of the input
* @param params Data processing parameters
* @param handler Delegate error or datacount results (Count of records, fields, bytes, etc written)
* @param handler Delegate error or datacount results (Count of records, fields, bytes, etc written as a result of this call)
*/
public void processData(JobTask jobTask, AnalysisRegistry analysisRegistry, InputStream input,
XContentType xContentType, DataLoadParams params, BiConsumer<DataCounts, Exception> handler) {
Expand Down
19 changes: 10 additions & 9 deletions ...l/src/test/java/org/elasticsearch/xpack/ml/datafeed/DatafeedTimingStatsReporterTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,22 +94,17 @@ public void testReportDataCounts_Null() {
}

public void testReportDataCounts() {
DataCounts dataCounts = new DataCounts(JOB_ID);
dataCounts.incrementBucketCount(20);
DatafeedTimingStatsReporter timingStatsReporter =
new DatafeedTimingStatsReporter(new DatafeedTimingStats(JOB_ID, 3, dataCounts.getBucketCount(), 10000.0), jobResultsPersister);
new DatafeedTimingStatsReporter(new DatafeedTimingStats(JOB_ID, 3, 20, 10000.0), jobResultsPersister);
assertThat(timingStatsReporter.getCurrentTimingStats(), equalTo(new DatafeedTimingStats(JOB_ID, 3, 20, 10000.0)));

dataCounts.incrementBucketCount(1);
timingStatsReporter.reportDataCounts(dataCounts);
timingStatsReporter.reportDataCounts(createDataCountsWithBucketCount(1));
assertThat(timingStatsReporter.getCurrentTimingStats(), equalTo(new DatafeedTimingStats(JOB_ID, 3, 21, 10000.0)));

dataCounts.incrementBucketCount(1);
timingStatsReporter.reportDataCounts(dataCounts);
timingStatsReporter.reportDataCounts(createDataCountsWithBucketCount(1));
assertThat(timingStatsReporter.getCurrentTimingStats(), equalTo(new DatafeedTimingStats(JOB_ID, 3, 22, 10000.0)));

dataCounts.incrementBucketCount(1);
timingStatsReporter.reportDataCounts(dataCounts);
timingStatsReporter.reportDataCounts(createDataCountsWithBucketCount(1));
assertThat(timingStatsReporter.getCurrentTimingStats(), equalTo(new DatafeedTimingStats(JOB_ID, 3, 23, 10000.0)));

InOrder inOrder = inOrder(jobResultsPersister);
Expand All @@ -118,6 +113,12 @@ public void testReportDataCounts() {
verifyNoMoreInteractions(jobResultsPersister);
}

private static DataCounts createDataCountsWithBucketCount(long bucketCount) {
DataCounts dataCounts = new DataCounts(JOB_ID);
dataCounts.incrementBucketCount(bucketCount);
return dataCounts;
}

public void testTimingStatsDifferSignificantly() {
assertThat(
DatafeedTimingStatsReporter.differSignificantly(
Expand Down