This is an automated email from the ASF dual-hosted git repository.
akshayrai09 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
The following commit(s) were added to refs/heads/master by this push:
new d2a3d84 [TE] Fix for delayed anomalies due to watermark bug (#3984)
d2a3d84 is described below
commit d2a3d84850386cd82d6a712a9be3ed5eb7146875
Author: Akshay Rai <akshayra...@gmail.com>
AuthorDate: Tue Mar 19 16:00:44 2019 -0700
[TE] Fix for delayed anomalies due to watermark bug (#3984)
---
.../apache/pinot/thirdeye/detection/DetectionUtils.java | 4 ++--
.../thirdeye/detection/algorithm/MergeWrapperTest.java | 14 +++++++-------
.../detection/wrapper/ChildKeepingMergeWrapperTest.java | 12 ++++++------
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git
a/thirdeye/thirdeye-pinot/src/main/java/org/apache/pinot/thirdeye/detection/DetectionUtils.java
b/thirdeye/thirdeye-pinot/src/main/java/org/apache/pinot/thirdeye/detection/DetectionUtils.java
index 50e4a98..f2ca286 100644
---
a/thirdeye/thirdeye-pinot/src/main/java/org/apache/pinot/thirdeye/detection/DetectionUtils.java
+++
b/thirdeye/thirdeye-pinot/src/main/java/org/apache/pinot/thirdeye/detection/DetectionUtils.java
@@ -168,10 +168,10 @@ public class DetectionUtils {
* @return the last time stamp
*/
public static long consolidateNestedLastTimeStamps(Collection<Long>
nestedLastTimeStamps){
- if(nestedLastTimeStamps.isEmpty() || nestedLastTimeStamps.contains(-1L)){
+ if(nestedLastTimeStamps.isEmpty()){
return -1L;
}
- return Collections.min(nestedLastTimeStamps);
+ return Collections.max(nestedLastTimeStamps);
}
/**
diff --git
a/thirdeye/thirdeye-pinot/src/test/java/org/apache/pinot/thirdeye/detection/algorithm/MergeWrapperTest.java
b/thirdeye/thirdeye-pinot/src/test/java/org/apache/pinot/thirdeye/detection/algorithm/MergeWrapperTest.java
index a32e76f..1f679a0 100644
---
a/thirdeye/thirdeye-pinot/src/test/java/org/apache/pinot/thirdeye/detection/algorithm/MergeWrapperTest.java
+++
b/thirdeye/thirdeye-pinot/src/test/java/org/apache/pinot/thirdeye/detection/algorithm/MergeWrapperTest.java
@@ -116,7 +116,7 @@ public class MergeWrapperTest {
DetectionPipelineResult output = this.wrapper.run();
Assert.assertEquals(output.getAnomalies().size(), 5);
- Assert.assertEquals(output.getLastTimestamp(), 2900);
+ Assert.assertEquals(output.getLastTimestamp(), 3000);
}
@Test
@@ -127,7 +127,7 @@ public class MergeWrapperTest {
DetectionPipelineResult output = this.wrapper.run();
Assert.assertEquals(output.getAnomalies().size(), 3);
- Assert.assertEquals(output.getLastTimestamp(), 2900);
+ Assert.assertEquals(output.getLastTimestamp(), 3000);
Assert.assertTrue(output.getAnomalies().contains(makeAnomaly(0, 1250)));
Assert.assertTrue(output.getAnomalies().contains(makeAnomaly(1500, 2000)));
Assert.assertTrue(output.getAnomalies().contains(makeAnomaly(2200, 2800)));
@@ -142,7 +142,7 @@ public class MergeWrapperTest {
DetectionPipelineResult output = this.wrapper.run();
Assert.assertEquals(output.getAnomalies().size(), 3);
- Assert.assertEquals(output.getLastTimestamp(), 2900);
+ Assert.assertEquals(output.getLastTimestamp(), 3000);
Assert.assertTrue(output.getAnomalies().contains(makeAnomaly(0, 1250)));
Assert.assertTrue(output.getAnomalies().contains(makeAnomaly(1500, 2300)));
Assert.assertTrue(output.getAnomalies().contains(makeAnomaly(2400, 2800)));
@@ -168,7 +168,7 @@ public class MergeWrapperTest {
DetectionPipelineResult output = this.wrapper.run();
Assert.assertEquals(output.getAnomalies().size(), 4);
- Assert.assertEquals(output.getLastTimestamp(), 2900);
+ Assert.assertEquals(output.getLastTimestamp(), 3700);
Assert.assertTrue(output.getAnomalies().contains(makeAnomaly(0, 1250)));
Assert.assertTrue(output.getAnomalies().contains(makeAnomaly(1500, 2300)));
Assert.assertTrue(output.getAnomalies().contains(makeAnomaly(2400, 3650)));
@@ -195,7 +195,7 @@ public class MergeWrapperTest {
DetectionPipelineResult output = this.wrapper.run();
Assert.assertEquals(output.getAnomalies().size(), 4);
- Assert.assertEquals(output.getLastTimestamp(), 2900);
+ Assert.assertEquals(output.getLastTimestamp(), 3700);
Assert.assertTrue(output.getAnomalies().contains(makeAnomaly(0, 1250)));
Assert.assertTrue(output.getAnomalies().contains(makeAnomaly(1500, 2300)));
Assert.assertTrue(output.getAnomalies().contains(makeAnomaly(2400, 3650)));
@@ -221,7 +221,7 @@ public class MergeWrapperTest {
DetectionPipelineResult output = this.wrapper.run();
Assert.assertEquals(output.getAnomalies().size(), 8);
- Assert.assertEquals(output.getLastTimestamp(), 2900);
+ Assert.assertEquals(output.getLastTimestamp(), 3700);
Assert.assertTrue(output.getAnomalies().contains(makeAnomaly(0, 500)));
Assert.assertTrue(output.getAnomalies().contains(makeAnomaly(500, 1000)));
Assert.assertTrue(output.getAnomalies().contains(makeAnomaly(1100, 1250)));
@@ -288,7 +288,7 @@ public class MergeWrapperTest {
DetectionPipelineResult output = this.wrapper.run();
Assert.assertEquals(output.getAnomalies().size(), 6);
- Assert.assertEquals(output.getLastTimestamp(), 2900);
+ Assert.assertEquals(output.getLastTimestamp(), 3000);
Assert.assertTrue(output.getAnomalies().contains(makeAnomaly(0, 1250)));
Assert.assertTrue(output.getAnomalies().contains(makeAnomaly(1500, 2300)));
Assert.assertTrue(output.getAnomalies().contains(makeAnomaly(2400, 2800)));
diff --git
a/thirdeye/thirdeye-pinot/src/test/java/org/apache/pinot/thirdeye/detection/wrapper/ChildKeepingMergeWrapperTest.java
b/thirdeye/thirdeye-pinot/src/test/java/org/apache/pinot/thirdeye/detection/wrapper/ChildKeepingMergeWrapperTest.java
index 17e912f..92a6918 100644
---
a/thirdeye/thirdeye-pinot/src/test/java/org/apache/pinot/thirdeye/detection/wrapper/ChildKeepingMergeWrapperTest.java
+++
b/thirdeye/thirdeye-pinot/src/test/java/org/apache/pinot/thirdeye/detection/wrapper/ChildKeepingMergeWrapperTest.java
@@ -112,7 +112,7 @@ public class ChildKeepingMergeWrapperTest {
DetectionPipelineResult output = this.wrapper.run();
Assert.assertEquals(output.getAnomalies().size(), 5);
- Assert.assertEquals(output.getLastTimestamp(), 2900);
+ Assert.assertEquals(output.getLastTimestamp(), 3000);
}
@Test
@@ -123,7 +123,7 @@ public class ChildKeepingMergeWrapperTest {
DetectionPipelineResult output = this.wrapper.run();
Assert.assertEquals(output.getAnomalies().size(), 3);
- Assert.assertEquals(output.getLastTimestamp(), 2900);
+ Assert.assertEquals(output.getLastTimestamp(), 3000);
Assert.assertTrue(output.getAnomalies().contains(makeAnomaly(0, 1250,
ImmutableSet.of(makeAnomaly(1150, 1250), makeAnomaly(0, 1000),
makeAnomaly(1100, 1200)))));
Assert.assertTrue(output.getAnomalies().contains(makeAnomaly(1500, 2000)));
Assert.assertTrue(output.getAnomalies().contains(makeAnomaly(2200, 2800,
ImmutableSet.of(makeAnomaly(2200, 2300), makeAnomaly(2400, 2800)))));
@@ -138,7 +138,7 @@ public class ChildKeepingMergeWrapperTest {
DetectionPipelineResult output = this.wrapper.run();
Assert.assertEquals(output.getAnomalies().size(), 3);
- Assert.assertEquals(output.getLastTimestamp(), 2900);
+ Assert.assertEquals(output.getLastTimestamp(), 3000);
Assert.assertTrue(output.getAnomalies().contains(makeAnomaly(0, 1250,
ImmutableSet.of(makeAnomaly(1150, 1250), makeAnomaly(0, 1000),
makeAnomaly(1100, 1200)))));
Assert.assertTrue(output.getAnomalies().contains(makeAnomaly(1500, 2300,
ImmutableSet.of(makeAnomaly(2200, 2300), makeAnomaly(1500, 2000)))));
Assert.assertTrue(output.getAnomalies().contains(makeAnomaly(2400, 2800)));
@@ -164,7 +164,7 @@ public class ChildKeepingMergeWrapperTest {
DetectionPipelineResult output = this.wrapper.run();
Assert.assertEquals(output.getAnomalies().size(), 4);
- Assert.assertEquals(output.getLastTimestamp(), 2900);
+ Assert.assertEquals(output.getLastTimestamp(), 3700);
Assert.assertTrue(output.getAnomalies().contains(makeAnomaly(0, 1250,
ImmutableSet.of(makeAnomaly(1150, 1250), makeAnomaly(0, 1000),
makeAnomaly(1100, 1200)))));
Assert.assertTrue(output.getAnomalies().contains(makeAnomaly(1500, 2300,
ImmutableSet.of(makeAnomaly(2200, 2300), makeAnomaly(1500, 2000)))));
Assert.assertTrue(output.getAnomalies().contains(makeAnomaly(2400, 2800)));
@@ -191,7 +191,7 @@ public class ChildKeepingMergeWrapperTest {
DetectionPipelineResult output = this.wrapper.run();
Assert.assertEquals(output.getAnomalies().size(), 4);
- Assert.assertEquals(output.getLastTimestamp(), 2900);
+ Assert.assertEquals(output.getLastTimestamp(), 3700);
Assert.assertTrue(output.getAnomalies().contains(makeAnomaly(0, 1250,
ImmutableSet.of(makeAnomaly(1150, 1250), makeAnomaly(0, 1000),
makeAnomaly(1100, 1200)))));
Assert.assertTrue(output.getAnomalies().contains(makeAnomaly(1500, 2300,
ImmutableSet.of(makeAnomaly(2200, 2300), makeAnomaly(1500, 2000)))));
Assert.assertTrue(output.getAnomalies().contains(makeAnomaly(2400, 2800)));
@@ -253,7 +253,7 @@ public class ChildKeepingMergeWrapperTest {
DetectionPipelineResult output = this.wrapper.run();
Assert.assertEquals(output.getAnomalies().size(), 6);
- Assert.assertEquals(output.getLastTimestamp(), 2900);
+ Assert.assertEquals(output.getLastTimestamp(), 3000);
Assert.assertTrue(output.getAnomalies().contains(makeAnomaly(0, 1250,
ImmutableSet.of(makeAnomaly(1150, 1250), makeAnomaly(1100, 1200),
makeAnomaly(0, 1000)))));
Assert.assertTrue(output.getAnomalies().contains(makeAnomaly(1500, 2300,
ImmutableSet.of(makeAnomaly(1500, 2000), makeAnomaly(2200, 2300)))));
Assert.assertTrue(output.getAnomalies().contains(makeAnomaly(2400, 2800)));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org
