You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@eagle.apache.org by ra...@apache.org on 2016/09/27 02:12:58 UTC

[1/2] incubator-eagle git commit: [FIX] change the required dedupFirstOccurence name

Repository: incubator-eagle
Updated Branches:
  refs/heads/master 2583a72e3 -> ad6a53490


[FIX] change the required dedupFirstOccurence name


Project: http://git-wip-us.apache.org/repos/asf/incubator-eagle/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-eagle/commit/2fcb2212
Tree: http://git-wip-us.apache.org/repos/asf/incubator-eagle/tree/2fcb2212
Diff: http://git-wip-us.apache.org/repos/asf/incubator-eagle/diff/2fcb2212

Branch: refs/heads/master
Commit: 2fcb22128b5361b6fa0632066c3f7ceb6cc58c0f
Parents: 2583a72
Author: Ralph, Su <su...@gmail.com>
Authored: Mon Sep 26 19:09:26 2016 -0700
Committer: Ralph, Su <su...@gmail.com>
Committed: Mon Sep 26 19:09:26 2016 -0700

----------------------------------------------------------------------
 .../engine/publisher/dedup/DedupCache.java      | 26 ++++++++------------
 .../publisher/dedup/DedupCacheStoreTest.java    | 15 ++++++-----
 .../engine/publisher/dedup/DedupCacheTest.java  |  2 +-
 .../dedup/DefaultDeduplicatorTest.java          | 13 +++++-----
 .../service/app/TestServiceTestAppWithZk.java   |  2 ++
 5 files changed, 26 insertions(+), 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/2fcb2212/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/publisher/dedup/DedupCache.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/publisher/dedup/DedupCache.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/publisher/dedup/DedupCache.java
index 473cbfc..51029c1 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/publisher/dedup/DedupCache.java
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/publisher/dedup/DedupCache.java
@@ -16,17 +16,9 @@
  */
 package org.apache.eagle.alert.engine.publisher.dedup;
 
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentLinkedDeque;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.TimeUnit;
-
+import com.google.common.base.Joiner;
+import com.google.common.base.Objects;
+import com.typesafe.config.Config;
 import org.apache.commons.lang.time.DateUtils;
 import org.apache.eagle.alert.engine.coordinator.StreamDefinition;
 import org.apache.eagle.alert.engine.model.AlertStreamEvent;
@@ -35,9 +27,11 @@ import org.apache.eagle.alert.engine.publisher.impl.EventUniq;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Joiner;
-import com.google.common.base.Objects;
-import com.typesafe.config.Config;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.*;
 
 public class DedupCache {
 
@@ -46,8 +40,8 @@ public class DedupCache {
     private static final long CACHE_MAX_EXPIRE_TIME_IN_DAYS = 30;
     private static final long CACHE_MAX_EVENT_QUEUE_SIZE = 10;
 
-    private static final String DEDUP_COUNT = "dedupCount";
-    private static final String DEDUP_FIRST_OCCURRENCE = "dedupFirstOccurrence";
+    public static final String DEDUP_COUNT = "dedupCount";
+    public static final String DEDUP_FIRST_OCCURRENCE = "dedupFirstOccurrenceTime";
 
     private static final DedupEventsStoreType type = DedupEventsStoreType.Mongo;
 

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/2fcb2212/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/publisher/dedup/DedupCacheStoreTest.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/publisher/dedup/DedupCacheStoreTest.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/publisher/dedup/DedupCacheStoreTest.java
index c50b582..c830aca 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/publisher/dedup/DedupCacheStoreTest.java
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/publisher/dedup/DedupCacheStoreTest.java
@@ -16,11 +16,8 @@
  */
 package org.apache.eagle.alert.engine.publisher.dedup;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.ConcurrentLinkedDeque;
-
+import com.typesafe.config.Config;
+import com.typesafe.config.ConfigFactory;
 import org.apache.eagle.alert.engine.coordinator.PolicyDefinition;
 import org.apache.eagle.alert.engine.coordinator.StreamColumn;
 import org.apache.eagle.alert.engine.coordinator.StreamDefinition;
@@ -31,8 +28,10 @@ import org.apache.eagle.alert.engine.publisher.impl.EventUniq;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.typesafe.config.Config;
-import com.typesafe.config.ConfigFactory;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ConcurrentLinkedDeque;
 
 public class DedupCacheStoreTest extends MongoDependencyBaseTest {
 
@@ -109,7 +108,7 @@ public class DedupCacheStoreTest extends MongoDependencyBaseTest {
 		dedupCountColumn.setType(StreamColumn.Type.LONG);
 		
 		StreamColumn dedupFirstOccurrenceColumn = new StreamColumn();
-		dedupFirstOccurrenceColumn.setName("dedupFirstOccurrence");
+		dedupFirstOccurrenceColumn.setName(DedupCache.DEDUP_FIRST_OCCURRENCE);
 		dedupFirstOccurrenceColumn.setType(StreamColumn.Type.LONG);
 		
 		sd.setColumns(Arrays.asList(tsColumn, hostColumn, alertKeyColumn, stateColumn, dedupCountColumn, dedupFirstOccurrenceColumn));

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/2fcb2212/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/publisher/dedup/DedupCacheTest.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/publisher/dedup/DedupCacheTest.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/publisher/dedup/DedupCacheTest.java
index 6da6d4a..779abb0 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/publisher/dedup/DedupCacheTest.java
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/publisher/dedup/DedupCacheTest.java
@@ -114,7 +114,7 @@ public class DedupCacheTest {
 		dedupCountColumn.setType(StreamColumn.Type.LONG);
 		
 		StreamColumn dedupFirstOccurrenceColumn = new StreamColumn();
-		dedupFirstOccurrenceColumn.setName("dedupFirstOccurrence");
+		dedupFirstOccurrenceColumn.setName(DedupCache.DEDUP_FIRST_OCCURRENCE);
 		dedupFirstOccurrenceColumn.setType(StreamColumn.Type.LONG);
 		
 		sd.setColumns(Arrays.asList(tsColumn, hostColumn, alertKeyColumn, stateColumn, dedupCountColumn, dedupFirstOccurrenceColumn));

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/2fcb2212/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/publisher/dedup/DefaultDeduplicatorTest.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/publisher/dedup/DefaultDeduplicatorTest.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/publisher/dedup/DefaultDeduplicatorTest.java
index 1afb745..81ba35e 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/publisher/dedup/DefaultDeduplicatorTest.java
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/publisher/dedup/DefaultDeduplicatorTest.java
@@ -16,10 +16,8 @@
  */
 package org.apache.eagle.alert.engine.publisher.dedup;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
+import com.typesafe.config.Config;
+import com.typesafe.config.ConfigFactory;
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.eagle.alert.engine.coordinator.PolicyDefinition;
 import org.apache.eagle.alert.engine.coordinator.StreamColumn;
@@ -30,8 +28,9 @@ import org.apache.eagle.alert.engine.publisher.impl.DefaultDeduplicator;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.typesafe.config.Config;
-import com.typesafe.config.ConfigFactory;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 public class DefaultDeduplicatorTest extends MongoDependencyBaseTest {
 
@@ -194,7 +193,7 @@ public class DefaultDeduplicatorTest extends MongoDependencyBaseTest {
 		dedupCountColumn.setType(StreamColumn.Type.LONG);
 		
 		StreamColumn dedupFirstOccurrenceColumn = new StreamColumn();
-		dedupFirstOccurrenceColumn.setName("dedupFirstOccurrence");
+		dedupFirstOccurrenceColumn.setName(DedupCache.DEDUP_FIRST_OCCURRENCE);
 		dedupFirstOccurrenceColumn.setType(StreamColumn.Type.LONG);
 		
 		sd.setColumns(Arrays.asList(tsColumn, hostColumn, alertKeyColumn, stateColumn, dedupCountColumn, dedupFirstOccurrenceColumn));

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/2fcb2212/eagle-core/eagle-alert-parent/eagle-alert/alert-service/src/test/java/com/apache/eagle/service/app/TestServiceTestAppWithZk.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-service/src/test/java/com/apache/eagle/service/app/TestServiceTestAppWithZk.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-service/src/test/java/com/apache/eagle/service/app/TestServiceTestAppWithZk.java
index f194588..ef82ca6 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-service/src/test/java/com/apache/eagle/service/app/TestServiceTestAppWithZk.java
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-service/src/test/java/com/apache/eagle/service/app/TestServiceTestAppWithZk.java
@@ -23,6 +23,7 @@ import org.apache.eagle.alert.engine.coordinator.PolicyDefinition.Definition;
 import org.apache.eagle.alert.service.IMetadataServiceClient;
 import org.apache.eagle.alert.service.MetadataServiceClientImpl;
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -30,6 +31,7 @@ import java.util.Collections;
 import java.util.List;
 
 public class TestServiceTestAppWithZk extends AlertServiceTestBase {
+    @Ignore
     @Test
     public void testMain() throws Exception {
         System.setProperty("coordinator.zkConfig.zkQuorum", "localhost:" + getBindZkPort());


[2/2] incubator-eagle git commit: [FIX] update joiner from storm to google library

Posted by ra...@apache.org.
[FIX] update joiner from storm to google library


Project: http://git-wip-us.apache.org/repos/asf/incubator-eagle/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-eagle/commit/ad6a5349
Tree: http://git-wip-us.apache.org/repos/asf/incubator-eagle/tree/ad6a5349
Diff: http://git-wip-us.apache.org/repos/asf/incubator-eagle/diff/ad6a5349

Branch: refs/heads/master
Commit: ad6a53490fcf3cf725c1cf4b842b7db0ca40716d
Parents: 2fcb221
Author: Xiancheng Li <xi...@ebay.com>
Authored: Tue Sep 27 09:52:30 2016 +0800
Committer: Ralph, Su <su...@gmail.com>
Committed: Mon Sep 26 19:12:39 2016 -0700

----------------------------------------------------------------------
 .../evaluator/nodata/NoDataPolicyTimeBatchHandler.java  | 12 +++++++++---
 .../eagle/alert/engine/publisher/impl/EventUniq.java    |  3 ++-
 2 files changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/ad6a5349/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/evaluator/nodata/NoDataPolicyTimeBatchHandler.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/evaluator/nodata/NoDataPolicyTimeBatchHandler.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/evaluator/nodata/NoDataPolicyTimeBatchHandler.java
index e2c70a4..b1e32bd 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/evaluator/nodata/NoDataPolicyTimeBatchHandler.java
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/evaluator/nodata/NoDataPolicyTimeBatchHandler.java
@@ -16,6 +16,14 @@
  */
 package org.apache.eagle.alert.engine.evaluator.nodata;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.eagle.alert.engine.Collector;
 import org.apache.eagle.alert.engine.coordinator.PolicyDefinition;
 import org.apache.eagle.alert.engine.coordinator.StreamDefinition;
@@ -24,13 +32,11 @@ import org.apache.eagle.alert.engine.evaluator.PolicyStreamHandler;
 import org.apache.eagle.alert.engine.model.AlertStreamEvent;
 import org.apache.eagle.alert.engine.model.StreamEvent;
 import org.apache.eagle.alert.utils.TimePeriodUtils;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.storm.guava.base.Joiner;
 import org.joda.time.Period;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.*;
+import com.google.common.base.Joiner;
 
 public class NoDataPolicyTimeBatchHandler implements PolicyStreamHandler {
 

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/ad6a5349/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/publisher/impl/EventUniq.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/publisher/impl/EventUniq.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/publisher/impl/EventUniq.java
index 2a71411..511abcd 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/publisher/impl/EventUniq.java
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/java/org/apache/eagle/alert/engine/publisher/impl/EventUniq.java
@@ -21,7 +21,8 @@
 package org.apache.eagle.alert.engine.publisher.impl;
 
 import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.apache.storm.guava.base.Joiner;
+
+import com.google.common.base.Joiner;
 
 import java.util.HashMap;