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 e397731 [TE] Propagate diagnostics and evaluations from
AnoamlyFilterWrapper (#4315)
e397731 is described below
commit e397731832f16c71010aefa71e65d3036e98918b
Author: Akshay Rai <akshayra...@gmail.com>
AuthorDate: Fri Jun 14 11:15:55 2019 -0700
[TE] Propagate diagnostics and evaluations from AnoamlyFilterWrapper (#4315)
---
.../pinot/thirdeye/detection/wrapper/AnomalyFilterWrapper.java | 10 ++++++++--
.../thirdeye/detection/yaml/translator/ConfigTranslator.java | 1 -
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git
a/thirdeye/thirdeye-pinot/src/main/java/org/apache/pinot/thirdeye/detection/wrapper/AnomalyFilterWrapper.java
b/thirdeye/thirdeye-pinot/src/main/java/org/apache/pinot/thirdeye/detection/wrapper/AnomalyFilterWrapper.java
index b624772..5cc517b 100644
---
a/thirdeye/thirdeye-pinot/src/main/java/org/apache/pinot/thirdeye/detection/wrapper/AnomalyFilterWrapper.java
+++
b/thirdeye/thirdeye-pinot/src/main/java/org/apache/pinot/thirdeye/detection/wrapper/AnomalyFilterWrapper.java
@@ -21,9 +21,11 @@ package org.apache.pinot.thirdeye.detection.wrapper;
import com.google.common.base.Preconditions;
import com.google.common.collect.Collections2;
+import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
import org.apache.pinot.thirdeye.datalayer.dto.DetectionConfigDTO;
+import org.apache.pinot.thirdeye.datalayer.dto.EvaluationDTO;
import org.apache.pinot.thirdeye.datalayer.dto.MergedAnomalyResultDTO;
import org.apache.pinot.thirdeye.detection.ConfigUtils;
import org.apache.pinot.thirdeye.detection.DataProvider;
@@ -33,7 +35,6 @@ import org.apache.pinot.thirdeye.detection.DetectionUtils;
import org.apache.pinot.thirdeye.detection.PredictionResult;
import org.apache.pinot.thirdeye.detection.spi.components.AnomalyFilter;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -75,6 +76,8 @@ public class AnomalyFilterWrapper extends DetectionPipeline {
public final DetectionPipelineResult run() throws Exception {
List<MergedAnomalyResultDTO> candidates = new ArrayList<>();
List<PredictionResult> predictionResults = new ArrayList<>();
+ Map<String, Object> diagnostics = new HashMap<>();
+ List<EvaluationDTO> evaluations = new ArrayList<>();
Set<Long> lastTimeStamps = new HashSet<>();
for (Map<String, Object> properties : this.nestedProperties) {
@@ -94,6 +97,8 @@ public class AnomalyFilterWrapper extends DetectionPipeline {
DetectionPipelineResult intermediate = pipeline.run();
lastTimeStamps.add(intermediate.getLastTimestamp());
+ diagnostics.putAll(intermediate.getDiagnostics());
+ evaluations.addAll(intermediate.getEvaluations());
predictionResults.addAll(intermediate.getPredictions());
candidates.addAll(intermediate.getAnomalies());
}
@@ -101,6 +106,7 @@ public class AnomalyFilterWrapper extends DetectionPipeline
{
Collection<MergedAnomalyResultDTO> anomalies =
Collections2.filter(candidates, mergedAnomaly -> mergedAnomaly != null
&& !mergedAnomaly.isChild() && anomalyFilter.isQualified(mergedAnomaly));
- return new DetectionPipelineResult(new ArrayList<>(anomalies),
DetectionUtils.consolidateNestedLastTimeStamps(lastTimeStamps),
predictionResults);
+ return new DetectionPipelineResult(new ArrayList<>(anomalies),
DetectionUtils.consolidateNestedLastTimeStamps(lastTimeStamps),
+ predictionResults, evaluations).setDiagnostics(diagnostics);
}
}
diff --git
a/thirdeye/thirdeye-pinot/src/main/java/org/apache/pinot/thirdeye/detection/yaml/translator/ConfigTranslator.java
b/thirdeye/thirdeye-pinot/src/main/java/org/apache/pinot/thirdeye/detection/yaml/translator/ConfigTranslator.java
index b006009..a0f71c9 100644
---
a/thirdeye/thirdeye-pinot/src/main/java/org/apache/pinot/thirdeye/detection/yaml/translator/ConfigTranslator.java
+++
b/thirdeye/thirdeye-pinot/src/main/java/org/apache/pinot/thirdeye/detection/yaml/translator/ConfigTranslator.java
@@ -23,7 +23,6 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.pinot.thirdeye.datalayer.dto.AbstractDTO;
import org.apache.pinot.thirdeye.detection.ConfigUtils;
-import org.apache.pinot.thirdeye.detection.DataProvider;
import org.apache.pinot.thirdeye.detection.validators.ConfigValidator;
import org.yaml.snakeyaml.Yaml;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org
