You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pinot.apache.org by ji...@apache.org on 2019/03/11 22:37:03 UTC
[incubator-pinot] branch master updated: [TE] detection - default
merger gap (#3953)
This is an automated email from the ASF dual-hosted git repository.
jihao 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 f8036b3 [TE] detection - default merger gap (#3953)
f8036b3 is described below
commit f8036b39e193f57fe6aa407d515b2b52eeaef3b0
Author: Jihao Zhang <ji...@linkedin.com>
AuthorDate: Mon Mar 11 15:36:57 2019 -0700
[TE] detection - default merger gap (#3953)
---
.../org/apache/pinot/thirdeye/detection/algorithm/MergeWrapper.java | 3 ++-
.../apache/pinot/thirdeye/detection/algorithm/MergeWrapperTest.java | 1 +
.../pinot/thirdeye/detection/wrapper/ChildKeepingMergeWrapperTest.java | 2 ++
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/thirdeye/thirdeye-pinot/src/main/java/org/apache/pinot/thirdeye/detection/algorithm/MergeWrapper.java b/thirdeye/thirdeye-pinot/src/main/java/org/apache/pinot/thirdeye/detection/algorithm/MergeWrapper.java
index 01ca092..d8019c7 100644
--- a/thirdeye/thirdeye-pinot/src/main/java/org/apache/pinot/thirdeye/detection/algorithm/MergeWrapper.java
+++ b/thirdeye/thirdeye-pinot/src/main/java/org/apache/pinot/thirdeye/detection/algorithm/MergeWrapper.java
@@ -30,6 +30,7 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
+import java.util.concurrent.TimeUnit;
import org.apache.commons.collections.MapUtils;
import org.apache.pinot.thirdeye.common.dimension.DimensionMap;
import org.apache.pinot.thirdeye.datalayer.dto.DetectionConfigDTO;
@@ -84,7 +85,7 @@ public class MergeWrapper extends DetectionPipeline {
public MergeWrapper(DataProvider provider, DetectionConfigDTO config, long startTime, long endTime) {
super(provider, config, startTime, endTime);
- this.maxGap = MapUtils.getLongValue(config.getProperties(), "maxGap", 0);
+ this.maxGap = MapUtils.getLongValue(config.getProperties(), "maxGap", TimeUnit.HOURS.toMillis(2));
this.maxDuration = MapUtils.getLongValue(config.getProperties(), "maxDuration", Long.MAX_VALUE);
Preconditions.checkArgument(this.maxDuration > 0, "Max duration must be a positive number.");
this.slice = new AnomalySlice().withStart(startTime).withEnd(endTime);
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 f8c3357..a32e76f 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
@@ -111,6 +111,7 @@ public class MergeWrapperTest {
@Test
public void testMergerPassthru() throws Exception {
+ this.config.getProperties().put(PROP_MAX_GAP, 0);
this.wrapper = new MergeWrapper(this.provider, this.config, 1000, 3000);
DetectionPipelineResult output = this.wrapper.run();
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 c9f44b4..17e912f 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
@@ -17,6 +17,7 @@
package org.apache.pinot.thirdeye.detection.wrapper;
import com.google.common.collect.ImmutableSet;
+import java.util.concurrent.TimeUnit;
import org.apache.pinot.thirdeye.datalayer.dto.DetectionConfigDTO;
import org.apache.pinot.thirdeye.detection.DataProvider;
import org.apache.pinot.thirdeye.detection.DetectionPipelineResult;
@@ -106,6 +107,7 @@ public class ChildKeepingMergeWrapperTest {
@Test
public void testMergerPassthru() throws Exception {
+ this.config.getProperties().put(PROP_MAX_GAP, 0);
this.wrapper = new ChildKeepingMergeWrapper(this.provider, this.config, 1000, 3000);
DetectionPipelineResult output = this.wrapper.run();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org