# HG changeset patch
# User one
# Date 1384843112 -32400
# Node ID 11ad00323206daea178b600ec40100f75889c92a
# Parent fcce7ca4adb91dfd6d12b6c20dc5b41f72161861
Removed unnecessary files. Modified NetworkDefaultJungleTreeEditor
diff -r fcce7ca4adb9 -r 11ad00323206 .project
--- a/.project Mon Nov 18 19:34:15 2013 +0900
+++ b/.project Tue Nov 19 15:38:32 2013 +0900
@@ -1,20 +1,25 @@
- jungle-network
- NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.
-
- jungle-core
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
- org.eclipse.m2e.core.maven2Builder
-
-
-
- org.eclipse.m2e.core.maven2Nature
- org.eclipse.jdt.core.javanature
-
-
\ No newline at end of file
+ jungle-network
+ NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.
+
+ Alice
+ jungle-core
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ org.eclipse.m2e.core.maven2Builder
+
+
+
+
+
+ org.eclipse.m2e.core.maven2Nature
+ org.eclipse.jdt.core.javanature
+
+
diff -r fcce7ca4adb9 -r 11ad00323206 pom.xml
--- a/pom.xml Mon Nov 18 19:34:15 2013 +0900
+++ b/pom.xml Tue Nov 19 15:38:32 2013 +0900
@@ -14,6 +14,7 @@
1.6
+
@@ -74,7 +75,7 @@
alice
0.1
- -->
+-->
jungle
jungle-core
diff -r fcce7ca4adb9 -r 11ad00323206 src/alice/jungle/transaction/NetworkDefaultJungleTreeEditor.java
--- a/src/alice/jungle/transaction/NetworkDefaultJungleTreeEditor.java Mon Nov 18 19:34:15 2013 +0900
+++ b/src/alice/jungle/transaction/NetworkDefaultJungleTreeEditor.java Tue Nov 19 15:38:32 2013 +0900
@@ -4,7 +4,6 @@
import java.io.IOException;
import java.nio.ByteBuffer;
-import alice.jungle.datasegment.store.container.DefaultTreeOperationLogContainer;
import alice.jungle.operations.NetworkTreeOperationLog;
import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.JungleTreeEditor;
import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.core.Node;
@@ -28,7 +27,7 @@
import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Either;
import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Error;
import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.IterableConverter;
-import jungle.app.bbs.codesegment.HashLogUpdateCodeSegment;
+import jungle.app.bbs.codesegment.NullCodeSegment;
public class NetworkDefaultJungleTreeEditor> implements JungleTreeEditor {
@@ -83,15 +82,7 @@
TreeOperationLog newTreeOpLog = log.append(treeOperationLog);
JungleTreeEditor newEditor = new NetworkDefaultJungleTreeEditor(treeName, newNode,txManager,editor,newTreeOpLog);
- if(exportLog) {
- try {
- putTreeOperationLog(newTreeOpLog);
- } catch (IOException e) {
- return DefaultEither.newA(either.a());
- }
- }
-
-
+
return DefaultEither.newB(newEditor);
}
@@ -136,7 +127,14 @@
if(either.isA()){
return DefaultEither.newA(either.a());
}
-
+ if(exportLog) {
+ try {
+ putTreeOperationLog(log);
+ } catch (IOException e) {
+ return DefaultEither.newA(either.a());
+ }
+ }
+
TransactionManager newTxManager = either.b();
JungleTreeEditor newTreeEditor = new NetworkDefaultJungleTreeEditor(treeName, root,newTxManager,editor);
@@ -179,10 +177,8 @@
public void putDataSegment(String _uuid, String _treeName, String _updaterName, Iterable newLog, String nextRevision) throws IOException {
NetworkTreeOperationLog netLog = new NetworkTreeOperationLog(_uuid, _treeName,newLog);
- HashLogUpdateCodeSegment cs = new HashLogUpdateCodeSegment();
+ NullCodeSegment cs = new NullCodeSegment();
cs.ods.put("log", netLog);
}
-
-
}
diff -r fcce7ca4adb9 -r 11ad00323206 src/jungle/app/bbs/codesegment/ChildLogCheckCodeSegment.java
--- a/src/jungle/app/bbs/codesegment/ChildLogCheckCodeSegment.java Mon Nov 18 19:34:15 2013 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-package jungle.app.bbs.codesegment;
-
-
-
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.JungleTreeEditor;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Either;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Error;
-import jungle.app.bbs.JungleManager;
-import alice.codesegment.CodeSegment;
-import alice.datasegment.CommandType;
-import alice.datasegment.Receiver;
-import alice.jungle.datasegment.HashSetDataSegment;
-import alice.jungle.datasegment.store.container.DefaultTreeOperationLogContainer;
-
-public class ChildLogCheckCodeSegment extends CodeSegment {
-
- Receiver host = ids.create(CommandType.PEEK);
- Receiver childLog = ids.create(CommandType.TAKE);
- Receiver hashLog = ids.create(CommandType.PEEK);
-
- public ChildLogCheckCodeSegment() {
- host.setKey("host");
- childLog.setKey("local","childLog");
- hashLog.setKey("hashLog");
- }
-
- public ChildLogCheckCodeSegment(int index) {
- host.setKey("host");
- childLog.setKey("local","childLog", index);
- hashLog.setKey("hashLog");
- }
-
- public void run() {
- int index = childLog.index;
- String hostName = host.asString();
- DefaultTreeOperationLogContainer container = childLog.asClass(DefaultTreeOperationLogContainer.class);
- HashSetDataSegment ds = hashLog.asClass(HashSetDataSegment.class);
- if(ds.hash.contains(container.getHashLogString())) {
- ods.update("hashLog", ds);
- new LogUpdateCodeSegment(index);
- return;
- }
- Either either = JungleManager.update(container);
- if(either.isA()) {
- throw new IllegalStateException();
- }
- ds.hash.add(container.getHashLogString());
- ods.update("hashLog", ds);
- ods.put("log", container);
- new ChildLogCheckCodeSegment(index);
- if(!hostName.equals("node0")) {
- ods.put("parent", "childLog", container);
- }
- }
-}
diff -r fcce7ca4adb9 -r 11ad00323206 src/jungle/app/bbs/codesegment/HashLogUpdateCodeSegment.java
--- a/src/jungle/app/bbs/codesegment/HashLogUpdateCodeSegment.java Mon Nov 18 19:34:15 2013 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-package jungle.app.bbs.codesegment;
-
-import alice.codesegment.CodeSegment;
-import alice.datasegment.CommandType;
-import alice.datasegment.Receiver;
-import alice.jungle.datasegment.HashSetDataSegment;
-
-public class HashLogUpdateCodeSegment extends CodeSegment {
-
- Receiver hashLog = ids.create(CommandType.PEEK);
- Receiver logString = ids.create(CommandType.TAKE);
-
- public HashLogUpdateCodeSegment() {
- hashLog.setKey("hashLog");
- logString.setKey("logString");
- }
-
- public void run() {
- HashSetDataSegment ds = hashLog.asClass(HashSetDataSegment.class);
- String str = logString.asString();
- ds.hash.add(str);
- ods.put("hashLog", ds);
- }
-}
diff -r fcce7ca4adb9 -r 11ad00323206 src/jungle/app/bbs/codesegment/LogUpdateCodeSegment.java
--- a/src/jungle/app/bbs/codesegment/LogUpdateCodeSegment.java Mon Nov 18 19:34:15 2013 +0900
+++ b/src/jungle/app/bbs/codesegment/LogUpdateCodeSegment.java Tue Nov 19 15:38:32 2013 +0900
@@ -16,39 +16,36 @@
public class LogUpdateCodeSegment extends CodeSegment {
Receiver log = ids.create(CommandType.PEEK);
- Receiver host = ids.create(CommandType.PEEK);
Receiver clist = ids.create(CommandType.PEEK);
public LogUpdateCodeSegment() {
log.setKey("log");
- host.setKey("host");
clist.setKey("_CLIST");;
}
public LogUpdateCodeSegment(int index) {
log.setKey("log", index);
- host.setKey("host");
clist.setKey("_CLIST");;
}
public void run() {
int index = log.index;
NetworkTreeOperationLog netLog = log.asClass(NetworkTreeOperationLog.class);
- String hostName = host.asString();
@SuppressWarnings("unchecked")
List list = clist.asClass(List.class);
- if (!hostName.equals((log.from))) {
+ if (!log.from.equals("local")) {
Either either = JungleManager.update(netLog);
if(either.isA()) {
+ /* Should throw after new LogUpdateCodeSegment */
throw new IllegalStateException();
}
}
for (String node : list) {
if (!node.equals(log.from)) {
- ods.update(node, log.key, log.getVal());
+ ods.put(node, log.key, log.getVal());
}
}
- new LogUpdateCodeSegment(index);
+ new LogUpdateCodeSegment(index+1);
}
}
diff -r fcce7ca4adb9 -r 11ad00323206 src/jungle/app/bbs/codesegment/NullCodeSegmentForUpdate.java
--- a/src/jungle/app/bbs/codesegment/NullCodeSegmentForUpdate.java Mon Nov 18 19:34:15 2013 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-package jungle.app.bbs.codesegment;
-
-import alice.codesegment.CodeSegment;
-
-public class NullCodeSegmentForUpdate extends CodeSegment{
-
- public void run() {
-
- }
-
-}
diff -r fcce7ca4adb9 -r 11ad00323206 src/test/java/alice/codesegment/remote/StartClientCodeSegment.java
--- a/src/test/java/alice/codesegment/remote/StartClientCodeSegment.java Mon Nov 18 19:34:15 2013 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-package test.java.alice.codesegment.remote;
-
-import alice.datasegment.DataSegment;
-import alice.test.codesegment.remote.TestRemoteConfig;
-
-public class StartClientCodeSegment {
-
- static public void main(String[] args) {
- System.out.println("--StartClientCodeSegment--");
- TestRemoteConfig conf = new TestRemoteConfig(args);
- DataSegment.connect("remote", "", conf.hostname, conf.connectPort);
- new ClientFirstSetKey().execute();
- }
-}