Mercurial > hg > Database > Christie
changeset 268:1f42a0903440
add test program
line wrap: on
line diff
--- a/build.gradle Wed Jan 29 18:50:14 2020 +0900 +++ b/build.gradle Fri Feb 14 01:30:28 2020 +0900 @@ -25,15 +25,18 @@ } jar { - exclude 'META-INF/*.RSA', 'META-INF/*.SF','META-INF/*.DSA' - manifest { - attributes 'Implementation-Title': 'Gradle Quickstart', 'Implementation-Version': version - attributes 'Multi-Release': 'true' // https://stackoverflow.com/questions/53049346/is-log4j2-compatible-with-java-11 + exclude 'META-INF/*.RSA', 'META-INF/*.SF','META-INF/*.DSA' + manifest { + attributes 'Implementation-Title': 'Gradle Quickstart', 'Implementation-Version': version + attributes 'Multi-Release': 'true' // https://stackoverflow.com/questions/53049346/is-log4j2-compatible-with-java-11 + //attributes 'Main-Class': 'christie.remoteTextEditor.StartRemotingTextEditor' + } + + from configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } + archiveName ='Chrisite.jar' } - from configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } - archiveName = 'Christie.jar' -} + task christieStartTopologyManager(type: Jar) { exclude 'META-INF/*.RSA', 'META-INF/*.SF','META-INF/*.DSA'
--- a/src/main/java/christie/remoteTextEditor/RemoteNodeStart.java Wed Jan 29 18:50:14 2020 +0900 +++ b/src/main/java/christie/remoteTextEditor/RemoteNodeStart.java Fri Feb 14 01:30:28 2020 +0900 @@ -10,6 +10,5 @@ StartTopologyNode startTopologyNode = new StartTopologyNode((TopologyNodeConfig) remoteNodeConfig, new CheckMyName()); - } }
--- a/src/main/java/christie/textEditor/NewTextEditor.java Wed Jan 29 18:50:14 2020 +0900 +++ b/src/main/java/christie/textEditor/NewTextEditor.java Fri Feb 14 01:30:28 2020 +0900 @@ -9,7 +9,6 @@ import javax.swing.text.StyleContext; import java.awt.*; -@org.msgpack.annotation.Message public class NewTextEditor extends JFrame { private static boolean canSend = false; TextFrame textFrame = new TextFrame();
--- a/src/main/java/christie/textEditor/TextFrame.java Wed Jan 29 18:50:14 2020 +0900 +++ b/src/main/java/christie/textEditor/TextFrame.java Fri Feb 14 01:30:28 2020 +0900 @@ -12,7 +12,6 @@ import javax.swing.text.Document; import javax.swing.text.StyleContext; -@org.msgpack.annotation.Message class TextFrame extends JInternalFrame { private JTextArea textArea;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/test/java/christie/example/HelloWorld/FinishHelloWorld.java.orig Fri Feb 14 01:30:28 2020 +0900 @@ -0,0 +1,41 @@ +<<<<<<< mine +package christie.example.HelloWorld; + +import christie.annotation.Take; +import christie.codegear.CodeGear; +import christie.codegear.CodeGearManager; + +public class FinishHelloWorld extends CodeGear { + @Take String hello; + @Take String world; + + @Override + protected void run(CodeGearManager cgm) { + cgm.getLocalDGM().finish(); + } +} +======= +package christie.example.HelloWorld; + +import christie.annotation.Peek; +import christie.annotation.Take; +import christie.codegear.CodeGear; +import christie.codegear.CodeGearManager; +import christie.topology.Message; +import christie.topology.node.TopologyNodeConfig; + +public class FinishHelloWorld extends CodeGear { + @Take + Message hello; + + + @Peek + TopologyNodeConfig topologyNodeConfig; + + + @Override + protected void run(CodeGearManager cgm) { + getDGM(topologyNodeConfig.getManagerKey()).put("FINISHMESSAGE", new Message()); + } +} +>>>>>>> theirs
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/test/java/christie/example/RemoteEditorTest/CheckName.java Fri Feb 14 01:30:28 2020 +0900 @@ -0,0 +1,25 @@ +package christie.example.RemoteEditorTest; + +import christie.annotation.Peek; +import christie.codegear.CodeGear; +import christie.codegear.CodeGearManager; +import christie.topology.TopologyDataGear; + +public class CheckName extends CodeGear { + @Peek + TopologyDataGear topoDG; + + protected void run(CodeGearManager cgm) { + if(topoDG.getNodeName().equals("node1") || topoDG.getNodeName().equals("node2")) { + cgm.setup(new ReceiveCommand()); + cgm.setup(new MakeBinal()); + int[] cmdOffsetList = new int[10]; + String[] cmdStringList = new String[10]; + getLocalDGM().put("cmdOffsetList", cmdOffsetList); + getLocalDGM().put("cmdStringList", cmdStringList); + }else if(topoDG.getNodeName().equals("node0")){ + cgm.setup(new CountMessage()); + put("msgCount" , 0); + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/test/java/christie/example/RemoteEditorTest/Command.java Fri Feb 14 01:30:28 2020 +0900 @@ -0,0 +1,20 @@ +package christie.example.RemoteEditorTest; + +import org.msgpack.annotation.Message; + +@Message +class Command { + public String string; + public int offset; + public int cmdNum; + public Command() {} + + +// delete用 + public Command(int offset,String string, int cmdNum){ + this.offset = offset; + this.string = string; + this.cmdNum = cmdNum; + } + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/test/java/christie/example/RemoteEditorTest/CountMessage.java Fri Feb 14 01:30:28 2020 +0900 @@ -0,0 +1,30 @@ +package christie.example.RemoteEditorTest; + +import christie.annotation.Take; +import christie.codegear.CodeGear; +import christie.codegear.CodeGearManager; +import christie.topology.Message; + + +public class CountMessage extends CodeGear { + @Take + Message msg; + + @Take + int msgCount; + + @Override + protected void run(CodeGearManager cgm) { + msgCount += 1; + if (msgCount == 2){ + System.out.println("message comp:" + msgCount ); + cgm.getDGM("node1").put("start", new Message()); + cgm.getDGM("node2").put("start", new Message()); + }else{ + System.out.println("message uncomp:" + msgCount ); + cgm.setup(new CountMessage()); + getLocalDGM().put("msgCount", msgCount); + + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/test/java/christie/example/RemoteEditorTest/DelibalyCommand.java Fri Feb 14 01:30:28 2020 +0900 @@ -0,0 +1,34 @@ +package christie.example.RemoteEditorTest; + +import christie.annotation.Peek; +import christie.annotation.Take; +import christie.codegear.CodeGear; +import christie.codegear.CodeGearManager; +import christie.remoteTextEditor.receiveCommand; +import christie.topology.Message; +import christie.topology.TopologyDataGear; + +public class DelibalyCommand extends CodeGear { + @Take + int makedCmdNum; + + @Peek + TopologyDataGear topoDG; + + @Take + Message start; + + @Override + protected void run(CodeGearManager cgm) { + System.out.println("first Command"); + if(topoDG.getNodeName().equals("node1")){ + Command cmd = new Command(2, "Z", makedCmdNum+1); + put("cmd", cmd); + cgm.getDGM("partner").put("cmd", cmd); + }else if(topoDG.getNodeName().equals("node2")){ + Command cmd = new Command(2, "X", makedCmdNum+1); + put("cmd", cmd); + cgm.getDGM("partner").put("cmd", cmd); + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/test/java/christie/example/RemoteEditorTest/MakeBinal.java Fri Feb 14 01:30:28 2020 +0900 @@ -0,0 +1,40 @@ +package christie.example.RemoteEditorTest; + +import christie.annotation.Peek; +import christie.annotation.Take; +import christie.codegear.CodeGear; +import christie.codegear.CodeGearManager; +import christie.topology.Message; +import christie.topology.TopologyDataGear; + +import java.util.ArrayDeque; +import java.util.Queue; + + +public class MakeBinal extends CodeGear { + @Peek + TopologyDataGear topoDG; + + + @Override + protected void run(CodeGearManager cgm) { + String binal[] = new String[5]; + binal[0] = "A"; + binal[1] = "B"; + binal[2] = "C"; + binal[3] = "D"; + + System.out.print(topoDG.getNodeName() + ":"); + for (int i = 0; i < binal.length; i++) { + System.out.print(binal[i]); + } + System.out.println(); + cgm.setup(new DelibalyCommand()); + getLocalDGM().put("list", binal); + getLocalDGM().put("cmdNum", 0); + getLocalDGM().put("makedCmdNum", 0); + + cgm.getDGM("server").put("msg", new Message()); + + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/test/java/christie/example/RemoteEditorTest/NodeConfig.java Fri Feb 14 01:30:28 2020 +0900 @@ -0,0 +1,18 @@ +package christie.example.RemoteEditorTest; + +import christie.topology.node.TopologyNodeConfig; + +public class NodeConfig extends TopologyNodeConfig { + + public NodeConfig(String[] args) { + super(args); + + + for (int j = 0; j < args.length; j++) { + if ("--totalNodeNum".equals(args[j])) { + + } + + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/test/java/christie/example/RemoteEditorTest/NodeStart.java Fri Feb 14 01:30:28 2020 +0900 @@ -0,0 +1,14 @@ +package christie.example.RemoteEditorTest; + +import christie.topology.node.StartTopologyNode; +import christie.topology.node.TopologyNodeConfig; + +public class NodeStart { + public static void main(String[] args){ + NodeConfig remoteNodeConfig = new NodeConfig(args); + + + StartTopologyNode startTopologyNode = new StartTopologyNode((TopologyNodeConfig) remoteNodeConfig, new CheckName()); + + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/test/java/christie/example/RemoteEditorTest/ReceiveCommand.java Fri Feb 14 01:30:28 2020 +0900 @@ -0,0 +1,53 @@ +package christie.example.RemoteEditorTest; + +import christie.annotation.Peek; +import christie.annotation.Take; +import christie.codegear.CodeGear; +import christie.codegear.CodeGearManager; +import christie.example.PrefixTree.ReceiveMessage; +import christie.topology.TopologyDataGear; + +import java.util.Queue; + +public class ReceiveCommand extends CodeGear { + @Take + Command cmd; + + @Take + int cmdNum; + + @Peek + String[] list; + + @Peek + TopologyDataGear topoDG; + + @Peek + String[] cmdStringList; + + @Peek + int[] cmdOffsetList; + + @Override + protected void run(CodeGearManager cgm) { + if(this.cmdNum == cmd.cmdNum-1) { + list[cmd.offset] = cmd.string; + System.out.print(topoDG.getNodeName() + ":"); + for (int i = 0; i < list.length; i++) { + System.out.print(list[i]); + } + System.out.print(" & cmdNum =" + cmd.cmdNum); + System.out.println(); + //本当はリストかスタックでやりたい. + cmdStringList[0] = cmd.string; + cmdOffsetList[0] = cmd.offset; + put("cmdNum", this.cmdNum + 1); + cgm.setup(new ReceiveCommand()); + }else{ + System.out.println(topoDG.getNodeName() + ":cmd Num unmach/cmdNum = " + cmdNum); + cgm.setup(new UnmachSolve()); + getLocalDGM().put("cmd", cmd); + getLocalDGM().put("cmdNum" ,cmdNum); + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/test/java/christie/example/RemoteEditorTest/StartArgoTest.java Fri Feb 14 01:30:28 2020 +0900 @@ -0,0 +1,32 @@ +package christie.example.RemoteEditorTest; +import christie.codegear.CodeGearManager; +import christie.codegear.StartCodeGear; +import christie.topology.manager.StartTopologyManager; +import christie.topology.manager.TopologyManagerConfig; + +public class StartArgoTest extends StartCodeGear { + + public StartArgoTest(CodeGearManager cgm) { + super(cgm); + } + + public static void main(String[] args){ + int TopologyManagerPort = 10000; + int TopologyNodePort = 10001; + + String[] managerArg = {"--localPort", String.valueOf(TopologyManagerPort), "--confFile", "scripts/Log/star.dot"}; + + TopologyManagerConfig topologyManagerConfig = new TopologyManagerConfig(managerArg); + new StartTopologyManager(topologyManagerConfig); + + + for (int i = 0; i <= 2; i++){ + String[] nodeArg = {"--managerPort", String.valueOf(TopologyManagerPort), + "--managerHost", "localhost", + "--localPort", String.valueOf(TopologyNodePort + i), + }; + + NodeStart.main(nodeArg); + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/test/java/christie/example/RemoteEditorTest/TwoReceiverSet.java Fri Feb 14 01:30:28 2020 +0900 @@ -0,0 +1,23 @@ +package christie.example.RemoteEditorTest; + +import christie.annotation.Peek; +import christie.codegear.CodeGear; +import christie.codegear.CodeGearManager; +import christie.topology.TopologyDataGear; +import org.msgpack.annotation.Message; + +public class TwoReceiverSet extends CodeGear { + + @Peek + TopologyDataGear topoDG; + + @Override + protected void run(CodeGearManager cgm) { + cgm.setup(new ReceiveCommand()); + if(topoDG.getNodeName().equals("node2")){ + // cgm.getDGM("server").put(msg, new Message()); + }else if(topoDG.getNodeName().equals("server")){ + //cgm.getDGM("node2").put(msg, new Message()); + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/test/java/christie/example/RemoteEditorTest/UnmachSolve.java Fri Feb 14 01:30:28 2020 +0900 @@ -0,0 +1,55 @@ +package christie.example.RemoteEditorTest; + +import christie.annotation.Peek; +import christie.annotation.Take; +import christie.codegear.CodeGear; +import christie.codegear.CodeGearManager; +import christie.topology.TopologyDataGear; + +import java.util.Queue; + +public class UnmachSolve extends CodeGear { + @Take + Command cmd; + + @Take + int cmdNum; + + @Peek + String[] cmdStringList; + + @Peek + String[] list; + + @Peek + int[] cmdOffsetList; + + @Peek + TopologyDataGear topoDG; + + @Override + protected void run(CodeGearManager cgm) { + System.out.println(topoDG.getNodeName() + "fix start"); + System.out.println(topoDG.getNodeName() + ":" + cmdOffsetList[0] + " for " + cmdStringList[0]); + + if (cmd.offset < cmdOffsetList[0]) { + int cmdOff = cmd.offset; + System.out.println(cmd.string + "insert for " + cmdOff); + } else if (cmd.offset > cmdOffsetList[0]) { + int cmdOff = cmd.offset - 1; + System.out.println(cmd.string + "insert for " + cmdOff); + } else if (cmd.offset == cmdOffsetList[0]) { + if(topoDG.getNodeName().equals("node2")){ + list[cmd.offset] = cmd.string; + } + System.out.print(topoDG.getNodeName() + ":"); + for (int i = 0; i < list.length; i++) { + System.out.print(list[i]); + } + System.out.print(" & cmdNum =" + cmd.cmdNum); + System.out.println(); + } + + + } +} \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/test/java/christie/example/RemoteTake/CreateRemoteTakeTest.java.orig Fri Feb 14 01:30:28 2020 +0900 @@ -0,0 +1,16 @@ +package christie.example.RemoteTake; + +import christie.annotation.Take; +import christie.codegear.CodeGear; +import christie.codegear.CodeGearManager; + +public class CreateRemoteTakeTest extends CodeGear { + @Take + RTCommand command; + + @Override + protected void run(CodeGearManager cgm) { + System.out.println(command); + cgm.getLocalDGM().put("finish","end"); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/test/java/christie/example/RemoteTake/StartRemoteTake.java.orig Fri Feb 14 01:30:28 2020 +0900 @@ -0,0 +1,25 @@ +package christie.example.RemoteTake; + +import christie.codegear.CodeGearManager; +import christie.codegear.StartCodeGear; + +public class StartRemoteTake extends StartCodeGear{ + + public StartRemoteTake(CodeGearManager cgm) { + super(cgm); + } + + public static void main(String args[]){ + CodeGearManager cgm = createCGM(10000); + new StartRemoteTake(cgm); + + + cgm.createRemoteDGM("remote", "localhost", 10001hg ); + cgm.setup(new CreateRemoteTakeTest()); + + + CodeGearManager cgm2 = createCGM(10001); + cgm2.createRemoteDGM("remote", "localhost", 10000); + cgm2.setup(new CreateRemoteTakeTest()); + } +}