Merge branch 'feature/collector' into feature/3.0

* feature/collector:
  modify worker num value

skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/WorkerConfig.java

@@ -48,27 +48,27 @@ public class WorkerConfig extends ClusterConfig {
     public static class WorkerNum {
         public static class Node {
             public static class NodeDayAgg {
-                public static int Size = 1024;
+                public static int Value = 10;
             }
 
             public static class NodeHourAgg {
-                public static int Size = 1024;
+                public static int Value = 10;
             }
 
             public static class NodeMinuteAgg {
-                public static int Size = 1024;
+                public static int Value = 10;
             }
 
             public static class NodeMappingDayAgg {
-                public static int Size = 1024;
+                public static int Value = 10;
             }
 
             public static class NodeMappingHourAgg {
-                public static int Size = 1024;
+                public static int Value = 10;
             }
 
             public static class NodeMappingMinuteAgg {
-                public static int Size = 1024;
+                public static int Value = 10;
             }
         }
     }
@@ -173,6 +173,5 @@ public class WorkerConfig extends ClusterConfig {
         public static class DAGNodeRefAnalysis {
             public static int Size = 1024;
         }
-
     }
 }

skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompAgg.java

@@ -44,7 +44,7 @@ public class NodeCompAgg extends AbstractClusterWorker {
 
         @Override
         public int workerNum() {
-            return WorkerConfig.WorkerNum.Node.NodeDayAgg.Size;
+            return WorkerConfig.WorkerNum.Node.NodeDayAgg.Value;
         }
     }
 

skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingDayAgg.java

@@ -44,7 +44,7 @@ public class NodeMappingDayAgg extends AbstractClusterWorker {
 
         @Override
         public int workerNum() {
-            return WorkerConfig.WorkerNum.Node.NodeMappingDayAgg.Size;
+            return WorkerConfig.WorkerNum.Node.NodeMappingDayAgg.Value;
         }
     }
 

skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingHourAgg.java

@@ -44,7 +44,7 @@ public class NodeMappingHourAgg extends AbstractClusterWorker {
 
         @Override
         public int workerNum() {
-            return WorkerConfig.WorkerNum.Node.NodeMappingHourAgg.Size;
+            return WorkerConfig.WorkerNum.Node.NodeMappingHourAgg.Value;
         }
     }
 

skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingMinuteAgg.java

@@ -44,7 +44,7 @@ public class NodeMappingMinuteAgg extends AbstractClusterWorker {
 
         @Override
         public int workerNum() {
-            return WorkerConfig.WorkerNum.Node.NodeMappingMinuteAgg.Size;
+            return WorkerConfig.WorkerNum.Node.NodeMappingMinuteAgg.Value;
         }
     }
 

skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingDayAggTestCase.java

@@ -61,7 +61,7 @@ public class NodeMappingDayAggTestCase {
         Assert.assertEquals(NodeMappingDayAgg.class.getSimpleName(), NodeMappingDayAgg.Factory.INSTANCE.workerInstance(null).getClass().getSimpleName());
 
         int testSize = 10;
-        WorkerConfig.WorkerNum.Node.NodeMappingDayAgg.Size = testSize;
+        WorkerConfig.WorkerNum.Node.NodeMappingDayAgg.Value = testSize;
         Assert.assertEquals(testSize, NodeMappingDayAgg.Factory.INSTANCE.workerNum());
     }
 

skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingHourAggTestCase.java

@@ -61,7 +61,7 @@ public class NodeMappingHourAggTestCase {
         Assert.assertEquals(NodeMappingHourAgg.class.getSimpleName(), NodeMappingHourAgg.Factory.INSTANCE.workerInstance(null).getClass().getSimpleName());
 
         int testSize = 10;
-        WorkerConfig.WorkerNum.Node.NodeMappingHourAgg.Size = testSize;
+        WorkerConfig.WorkerNum.Node.NodeMappingHourAgg.Value = testSize;
         Assert.assertEquals(testSize, NodeMappingHourAgg.Factory.INSTANCE.workerNum());
     }
 

skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingMinuteAggTestCase.java

@@ -61,7 +61,7 @@ public class NodeMappingMinuteAggTestCase {
         Assert.assertEquals(NodeMappingMinuteAgg.class.getSimpleName(), NodeMappingMinuteAgg.Factory.INSTANCE.workerInstance(null).getClass().getSimpleName());
 
         int testSize = 10;
-        WorkerConfig.WorkerNum.Node.NodeMappingMinuteAgg.Size = testSize;
+        WorkerConfig.WorkerNum.Node.NodeMappingMinuteAgg.Value = testSize;
         Assert.assertEquals(testSize, NodeMappingMinuteAgg.Factory.INSTANCE.workerNum());
     }