Mercurial > hg > Members > nobuyasu > jungle-network

changeset 97:11ad00323206

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed unnecessary files. Modified NetworkDefaultJungleTreeEditor
author one
date Tue, 19 Nov 2013 15:38:32 +0900
parents fcce7ca4adb9
children 9865ccfd0123
files .project pom.xml src/alice/jungle/transaction/NetworkDefaultJungleTreeEditor.java src/jungle/app/bbs/codesegment/ChildLogCheckCodeSegment.java src/jungle/app/bbs/codesegment/HashLogUpdateCodeSegment.java src/jungle/app/bbs/codesegment/LogUpdateCodeSegment.java src/jungle/app/bbs/codesegment/NullCodeSegmentForUpdate.java src/test/java/alice/codesegment/remote/StartClientCodeSegment.java
diffstat 8 files changed, 40 insertions(+), 145 deletions(-) [+]
line wrap: on
line diff
--- a/.project	Mon Nov 18 19:34:15 2013 +0900
+++ b/.project	Tue Nov 19 15:38:32 2013 +0900
@@ -1,20 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-  <name>jungle-network</name>
-  <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
-  <projects>
-    <project>jungle-core</project>
-  </projects>
-  <buildSpec>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-    </buildCommand>
-    <buildCommand>
-      <name>org.eclipse.m2e.core.maven2Builder</name>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>org.eclipse.m2e.core.maven2Nature</nature>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-  </natures>
-</projectDescription>
\ No newline at end of file
+	<name>jungle-network</name>
+	<comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
+	<projects>
+		<project>Alice</project>
+		<project>jungle-core</project>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
--- 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 @@
           <target>1.6</target>
         </configuration>
       </plugin>
+
     </plugins>
   </build>
   <properties>
@@ -74,7 +75,7 @@
       <artifactId>alice</artifactId>
       <version>0.1</version>
   	</dependency>
-  -->  	
+-->
   	<dependency>
   		<groupId>jungle</groupId>
   		<artifactId>jungle-core</artifactId>
--- 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<T extends TreeNode<T>> implements JungleTreeEditor {
 
@@ -83,15 +82,7 @@
 		TreeOperationLog newTreeOpLog = log.append(treeOperationLog);
 		
 		JungleTreeEditor newEditor = new NetworkDefaultJungleTreeEditor<T>(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<T> newTxManager = either.b();
 		JungleTreeEditor newTreeEditor = new NetworkDefaultJungleTreeEditor<T>(treeName, root,newTxManager,editor);
 		
@@ -179,10 +177,8 @@
 	
 	public void putDataSegment(String _uuid, String _treeName, String _updaterName, Iterable<TreeOperation> 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);
 	}
-
-	
 	
 }
--- 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<Error, JungleTreeEditor> 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);
-		}
-	}
-}
--- 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);
-	}
-}
--- 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<String> list = clist.asClass(List.class);
-		if (!hostName.equals((log.from))) {
+		if (!log.from.equals("local")) {
 			Either<Error, JungleTreeEditor> 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);
 	}
 }
--- 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() {
-		
-	}
-
-}
--- 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();
-	}	
-}