Mercurial > hg > Database > Alice

changeset 639:8d9f35701fdb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix RecordTopology
author suruga
date Sat, 30 Dec 2017 20:25:19 +0900
parents 3e00000949aa
children f05a89484ec1
files src/main/java/alice/Annotation/AliceAnnotation.java src/main/java/alice/topology/manager/CreateTreeTopology.java src/main/java/alice/topology/manager/IncomingHosts.java src/main/java/alice/topology/manager/RecodeTopology.java src/main/java/alice/topology/manager/RecordTopology.java src/main/java/alice/topology/node/CreateConnectionList.java src/main/java/alice/topology/node/IncomingConnectionInfo.java
diffstat 7 files changed, 52 insertions(+), 62 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/alice/Annotation/AliceAnnotation.java	Sat Dec 30 16:31:07 2017 +0900
+++ b/src/main/java/alice/Annotation/AliceAnnotation.java	Sat Dec 30 20:25:19 2017 +0900
@@ -1,16 +1,6 @@
 package alice.Annotation;
 
 import alice.codesegment.CodeSegment;
-import alice.datasegment.CommandType;
-import alice.datasegment.Receiver;
-import com.sun.org.apache.bcel.internal.classfile.Code;
-
-import java.awt.*;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-
-import static javafx.scene.input.KeyCode.T;
 
 /**
  * Created by e125769 on 10/15/17.
--- a/src/main/java/alice/topology/manager/CreateTreeTopology.java	Sat Dec 30 16:31:07 2017 +0900
+++ b/src/main/java/alice/topology/manager/CreateTreeTopology.java	Sat Dec 30 20:25:19 2017 +0900
@@ -64,7 +64,7 @@
             ods.put(newHost.remoteAbsName, newHost);
 
             ods.put("nodeInfo", newHost);
-            new RecodeTopology();
+            new RecordTopology();
 
             // put own information parent
             newHost = new HostMessage(host.name, host.port, "child"+num, "parent");
@@ -73,7 +73,7 @@
 
             ods.put(newHost.remoteAbsName, newHost);
             ods.put("nodeInfo", newHost);
-            new RecodeTopology();
+            new RecordTopology();
 
         }
 
--- a/src/main/java/alice/topology/manager/IncomingHosts.java	Sat Dec 30 16:31:07 2017 +0900
+++ b/src/main/java/alice/topology/manager/IncomingHosts.java	Sat Dec 30 20:25:19 2017 +0900
@@ -58,7 +58,7 @@
 
             ods.put("nodeInfo", newHost);
             ods.put(nodeInfo.sourceNodeName, newHost);
-            new RecodeTopology();
+            new RecordTopology();
         }
 
         if (nodeNames.isEmpty()) {
--- a/src/main/java/alice/topology/manager/RecodeTopology.java	Sat Dec 30 16:31:07 2017 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-package alice.topology.manager;
-
-import java.util.HashMap;
-import java.util.LinkedList;
-
-import alice.codesegment.CodeSegment;
-import alice.datasegment.CommandType;
-import alice.datasegment.Receiver;
-import alice.topology.HostMessage;
-
-public class RecodeTopology extends CodeSegment {
-
-    private Receiver info = ids.create(CommandType.TAKE);  // NodeInfo
-    private Receiver info1 = ids.create(CommandType.TAKE); // HashMap
-
-    public RecodeTopology(){
-        info.setKey("nodeInfo");
-        info1.setKey("topology");
-    }
-
-    @Override
-    public void run() {
-        HostMessage hostInfo = info.asClass(HostMessage.class);
-        @SuppressWarnings("unchecked")
-        HashMap<String, LinkedList<HostMessage>> topology = info1.asClass(HashMap.class);
-        LinkedList<HostMessage> connections;
-        if (!topology.containsKey(hostInfo.remoteAbsName)) {
-            connections = new LinkedList<HostMessage>();
-        } else {
-            connections = topology.get(hostInfo.remoteAbsName);
-        }
-        connections.add(hostInfo);
-        topology.put(hostInfo.remoteAbsName, connections);
-// need debug option
-//        for (LinkedList<HostMessage> list :topology.values()){
-//            System.out.print(list.get(0).remoteAbsName+" : ");
-//            for (HostMessage host : list){
-//                System.out.print("[ "+host.absName+" "+host.name+" "+host.port+" "+host.connectionName+" "+host.reverseName+" "+host.remoteAbsName+" ]");
-//            }
-//            System.out.println();
-//        }
-        ods.update(info1.key, topology);
-    }
-
-}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/main/java/alice/topology/manager/RecordTopology.java	Sat Dec 30 20:25:19 2017 +0900
@@ -0,0 +1,45 @@
+package alice.topology.manager;
+
+import java.util.HashMap;
+import java.util.LinkedList;
+
+import alice.codesegment.CodeSegment;
+import alice.datasegment.CommandType;
+import alice.datasegment.Receiver;
+import alice.topology.HostMessage;
+
+public class RecordTopology extends CodeSegment {
+
+    private Receiver info = ids.create(CommandType.TAKE);  // NodeInfo
+    private Receiver info1 = ids.create(CommandType.TAKE); // HashMap
+
+    public RecordTopology(){
+        info.setKey("nodeInfo");
+        info1.setKey("topology");
+    }
+
+    @Override
+    public void run() {
+        HostMessage hostInfo = info.asClass(HostMessage.class);
+        @SuppressWarnings("unchecked")
+        HashMap<String, LinkedList<HostMessage>> topology = info1.asClass(HashMap.class);
+        LinkedList<HostMessage> connections;
+        if (!topology.containsKey(hostInfo.remoteAbsName)) {
+            connections = new LinkedList<HostMessage>();
+        } else {
+            connections = topology.get(hostInfo.remoteAbsName);
+        }
+        connections.add(hostInfo);
+        topology.put(hostInfo.remoteAbsName, connections);
+// need debug option
+//        for (LinkedList<HostMessage> list :topology.values()){
+//            System.out.print(list.get(0).remoteAbsName+" : ");
+//            for (HostMessage host : list){
+//                System.out.print("[ "+host.absName+" "+host.name+" "+host.port+" "+host.connectionName+" "+host.reverseName+" "+host.remoteAbsName+" ]");
+//            }
+//            System.out.println();
+//        }
+        ods.update(info1.key, topology);
+    }
+
+}
--- a/src/main/java/alice/topology/node/CreateConnectionList.java	Sat Dec 30 16:31:07 2017 +0900
+++ b/src/main/java/alice/topology/node/CreateConnectionList.java	Sat Dec 30 20:25:19 2017 +0900
@@ -18,10 +18,10 @@
     @Override
     public void run() {
         @SuppressWarnings("unchecked")
-        List<String> cList = info.asClass(List.class);
+        List<String> clist = info.asClass(List.class);
         String name = info1.asString();
-        cList.add(name);
-        ods.update(info.key, cList);
+        clist.add(name);
+        ods.update("_CLIST", clist);
 
     }
 
--- a/src/main/java/alice/topology/node/IncomingConnectionInfo.java	Sat Dec 30 16:31:07 2017 +0900
+++ b/src/main/java/alice/topology/node/IncomingConnectionInfo.java	Sat Dec 30 20:25:19 2017 +0900
@@ -39,7 +39,7 @@
         }
 
         IncomingConnectionInfo cs = new IncomingConnectionInfo(absName, count);
-        cs.hostInfo.setKey("manager", absName);
+        cs.hostInfo.setKey(absName);
     }
 
 }