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

[ML] Fix timestamp comparison in scroll extractor cancellation logic 

Original commit: elastic/x-pack-elasticsearch@1b3f88adf0
This commit is contained in:
Dimitrios Athanasiou 2017-05-16 13:25:20 +01:00
parent 9f23c2c171
commit e047598ca9
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugin/src/main/java/org/elasticsearch/xpack/ml/datafeed/extractor/scroll/ScrollDataExtractor.java
View File

@ -152,7 +152,7 @@ class ScrollDataExtractor implements DataExtractor {
if (timestamp != null) {
if (timestampOnCancel == null) {
timestampOnCancel = timestamp;
} else if (timestamp != timestampOnCancel) {
} else if (timestamp.equals(timestampOnCancel) == false) {
hasNext = false;
clearScroll(scrollId);
break;

8
plugin/src/test/java/org/elasticsearch/xpack/ml/datafeed/extractor/scroll/ScrollDataExtractorTests.java
View File

@ -215,9 +215,9 @@ public class ScrollDataExtractorTests extends ESTestCase {
extractor.cancel();
SearchResponse response2 = createSearchResponse(
Arrays.asList(2000L, 3000L),
Arrays.asList("a3", "a4"),
Arrays.asList("b3", "b4")
Arrays.asList(2000L, 2000L, 3000L),
Arrays.asList("a3", "a4", "a5"),
Arrays.asList("b3", "b4", "b5")
);
extractor.setNextResponse(response2);
@ -225,7 +225,7 @@ public class ScrollDataExtractorTests extends ESTestCase {
assertThat(extractor.hasNext(), is(true));
stream = extractor.next();
assertThat(stream.isPresent(), is(true));
expectedStream = "{\"time\":2000,\"field_1\":\"a3\"}";
expectedStream = "{\"time\":2000,\"field_1\":\"a3\"} {\"time\":2000,\"field_1\":\"a4\"}";
assertThat(asString(stream.get()), equalTo(expectedStream));
assertThat(extractor.hasNext(), is(false));