[incubator-iotdb] branch cluster updated: allow user to config virtual nodes

[dope]

This is an automated email from the ASF dual-hosted git repository.

dope pushed a commit to branch cluster
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git


The following commit(s) were added to refs/heads/cluster by this push:
     new c3bb0b6  allow user to config virtual nodes
c3bb0b6 is described below

commit c3bb0b67ecd84709471fe494edc7f6713f2d3dcb
Author: XuYi <xuyith...@126.com>
AuthorDate: Tue Mar 26 16:04:48 2019 +0800

    allow user to config virtual nodes
---
 .../org/apache/iotdb/cluster/config/ClusterConfig.java    | 10 ++++++++++
 .../main/java/org/apache/iotdb/cluster/utils/Router.java  |  2 +-
 .../java/org/apache/iotdb/cluster/utils/RouterTest.java   | 15 ++++++++++++++-
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git 
a/cluster/src/main/java/org/apache/iotdb/cluster/config/ClusterConfig.java 
b/cluster/src/main/java/org/apache/iotdb/cluster/config/ClusterConfig.java
index 5c2d009..6b55743 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/config/ClusterConfig.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/config/ClusterConfig.java
@@ -56,6 +56,8 @@ public class ClusterConfig {
   // Maximum allowed delay hours
   private int delayHours = 24;
 
+  private int numOfVirtulaNodes = 2;
+
   public ClusterConfig() {
     // empty constructor
   }
@@ -147,4 +149,12 @@ public class ClusterConfig {
   public void setDelayHours(int delayHours) {
     this.delayHours = delayHours;
   }
+
+  public int getNumOfVirtulaNodes(){
+    return numOfVirtulaNodes;
+  }
+
+  public void setNumOfVirtulaNodes(int numOfVirtulaNodes){
+    this.numOfVirtulaNodes = numOfVirtulaNodes;
+  }
 }
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/utils/Router.java 
b/cluster/src/main/java/org/apache/iotdb/cluster/utils/Router.java
index 82b7f4f..dae2f97 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/utils/Router.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/utils/Router.java
@@ -16,7 +16,6 @@ public class Router {
 
   // Replication number
   private int replicator;
-  private final int numOfVirtulaNodes = 2;
   private HashFunction hashFunction = new MD5Hash();
   private final SortedMap<Integer, PhysicalNode> physicalRing = new 
TreeMap<>();
   private final SortedMap<Integer, VirtualNode> virtualRing = new TreeMap<>();
@@ -47,6 +46,7 @@ public class Router {
     String[] ipList = config.getNodes();
     this.replicator = config.getReplication();
     int port = config.getPort();
+    int numOfVirtulaNodes = config.getNumOfVirtulaNodes();
     for (String ip : ipList) {
       PhysicalNode node = new PhysicalNode(ip, port);
       addNode(node, numOfVirtulaNodes);
diff --git 
a/cluster/src/test/java/org/apache/iotdb/cluster/utils/RouterTest.java 
b/cluster/src/test/java/org/apache/iotdb/cluster/utils/RouterTest.java
index f98fa8e..43b53b6 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/utils/RouterTest.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/utils/RouterTest.java
@@ -14,6 +14,7 @@ public class RouterTest {
   String[] ipListOld;
   int portOld;
   int replicatorOld;
+  int numOfVirtulaNodesOld;
   HashFunction function = new MD5Hash();
 
   @Before
@@ -21,6 +22,7 @@ public class RouterTest {
     ipListOld = config.getNodes();
     portOld = config.getPort();
     replicatorOld = config.getReplication();
+    numOfVirtulaNodesOld = config.getNumOfVirtulaNodes();
   }
 
   @After
@@ -28,6 +30,7 @@ public class RouterTest {
     config.setNodes(ipListOld);
     config.setPort(portOld);
     config.setReplication(replicatorOld);
+    config.setNumOfVirtulaNodes(numOfVirtulaNodesOld);
   }
 
   @Test
@@ -36,10 +39,11 @@ public class RouterTest {
         "192.168.130.5",};
     int port = 7777;
     int replicator = 3;
+    int numOfVirtulaNodes = 2;
     config.setNodes(ipList);
     config.setPort(port);
     config.setReplication(replicator);
-
+    config.setNumOfVirtulaNodes(numOfVirtulaNodes);
     Router router = Router.getInstance();
     router.init();
 //    router.showPhysicalRing();
@@ -76,9 +80,12 @@ public class RouterTest {
     String[] ipList = {"192.168.130.1", "192.168.130.2", "192.168.130.3"};
     int port = 7777;
     int replicator = 3;
+    int numOfVirtulaNodes = 2;
+
     config.setNodes(ipList);
     config.setPort(port);
     config.setReplication(replicator);
+    config.setNumOfVirtulaNodes(numOfVirtulaNodes);
 
     Router router = Router.getInstance();
     router.init();
@@ -118,9 +125,12 @@ public class RouterTest {
         "192.168.130.5",};
     int port = 7777;
     int replicator = 3;
+    int numOfVirtulaNodes = 2;
+
     config.setNodes(ipList);
     config.setPort(port);
     config.setReplication(replicator);
+    config.setNumOfVirtulaNodes(numOfVirtulaNodes);
 
     Router router = Router.getInstance();
     router.init();
@@ -163,9 +173,12 @@ public class RouterTest {
     String[] ipList = {"192.168.130.1", "192.168.130.2", "192.168.130.3"};
     int port = 7777;
     int replicator = 3;
+    int numOfVirtulaNodes = 2;
+
     config.setNodes(ipList);
     config.setPort(port);
     config.setReplication(replicator);
+    config.setNumOfVirtulaNodes(numOfVirtulaNodes);
 
     Router router = Router.getInstance();
     router.init();