Mercurial > hg > Members > nobuyasu > jungle-network

changeset 91:2c7b3f2b2ee1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed serverName field
author one
date Mon, 11 Nov 2013 19:22:47 +0900
parents eef737ab3b2c
children e95faa202b4f
files src/alice/jungle/core/NetworkDefaultJungle.java src/alice/jungle/datasegment/store/container/DefaultTreeOperationLogContainer.java src/alice/jungle/transaction/NetworkDefaultJungleTree.java src/alice/jungle/transaction/NetworkDefaultJungleTreeEditor.java src/alice/jungle/transaction/NetworkTransactionManager.java src/jungle/app/bbs/NetworkJungleBulletinBoard.java src/test/java/alice/jungle/DoubleJungleManager.java src/test/java/alice/jungle/log/example/TestCodeSegment.java
diffstat 8 files changed, 20 insertions(+), 45 deletions(-) [+]
line wrap: on
line diff
--- a/src/alice/jungle/core/NetworkDefaultJungle.java	Mon Nov 11 19:06:56 2013 +0900
+++ b/src/alice/jungle/core/NetworkDefaultJungle.java	Mon Nov 11 19:22:47 2013 +0900
@@ -22,15 +22,13 @@
 	private ConcurrentHashMap<String,JungleTree> trees;
 	private String uuid;
 	private TreeEditor editor;
-	private String serverName;
 	
-	public NetworkDefaultJungle(Journal _journal,String _uuid,TreeEditor _editor, String _serverName)
+	public NetworkDefaultJungle(Journal _journal,String _uuid,TreeEditor _editor)
 	{
 		journal = _journal;
 		trees = new ConcurrentHashMap<String,JungleTree>();
 		uuid = _uuid;
 		editor = _editor;
-		serverName = _serverName;
 	}
 
 	@Override
@@ -60,7 +58,7 @@
 		DefaultTreeNode root = new DefaultTreeNode();
 		ChangeSet set = new DefaultChangeSet(root.getAsNode(),null,list,uuid,_name, 0);
 		DefaultTreeContext<DefaultTreeNode> tc = new DefaultTreeContext<DefaultTreeNode>(root,set);
-		JungleTree newTree = new NetworkDefaultJungleTree<DefaultTreeNode>(_name, tc,uuid,journal.getWriter(),editor, serverName);
+		JungleTree newTree = new NetworkDefaultJungleTree<DefaultTreeNode>(_name, tc,uuid,journal.getWriter(),editor);
 		if(trees.putIfAbsent(_name,newTree) != null){
 			return null;
 		}
--- a/src/alice/jungle/datasegment/store/container/DefaultTreeOperationLogContainer.java	Mon Nov 11 19:06:56 2013 +0900
+++ b/src/alice/jungle/datasegment/store/container/DefaultTreeOperationLogContainer.java	Mon Nov 11 19:22:47 2013 +0900
@@ -26,7 +26,6 @@
 	String uuid;
 	String updaterName;
 	String revision;
-	int position;
 	long timestamp;
 
 	public DefaultTreeOperationLogContainer() {
@@ -35,7 +34,6 @@
 		uuid = "";
 		updaterName = "";
 		revision = "";
-		position = 0;
 		timestamp = Long.MAX_VALUE;
 	}
 	
@@ -71,14 +69,6 @@
 		return revision;
 	}
 
-	public void setPosition(int p) {
-		position = p;
-	}
-	
-	public int getPosition() {
-		return position;
-	}
-	
 	public void setTimeStamp(long t) {
 		timestamp = t;
 	}
--- a/src/alice/jungle/transaction/NetworkDefaultJungleTree.java	Mon Nov 11 19:06:56 2013 +0900
+++ b/src/alice/jungle/transaction/NetworkDefaultJungleTree.java	Mon Nov 11 19:22:47 2013 +0900
@@ -16,25 +16,23 @@
 	private final String treeName;
 	private final ChangeListWriter writer;
 	private final TreeEditor editor;
-	private final String serverName;
 	
-	public NetworkDefaultJungleTree(String _treeName, TreeContext<T> _tc,String _uuid,ChangeListWriter _writer,TreeEditor _editor, String _serverName)
+	public NetworkDefaultJungleTree(String _treeName, TreeContext<T> _tc,String _uuid,ChangeListWriter _writer,TreeEditor _editor)
 	{
 		treeName = _treeName;
 		repository = new AtomicReservableReference<TreeContext<T>>(_tc);
 		uuid = _uuid;
 		writer = _writer;
 		editor = _editor;
-		serverName = _serverName;
 	}
 
 	@Override
 	public JungleTreeEditor getTreeEditor()
 	{
 		TreeContext<T> tc = repository.get();
-		NetworkTransactionManager<T> txManager = new NetworkTransactionManager<T>(treeName, writer,tc,repository,uuid, serverName);
+		NetworkTransactionManager<T> txManager = new NetworkTransactionManager<T>(treeName, writer,tc,repository,uuid);
 		T root = tc.getTreeNode();
-		return new NetworkDefaultJungleTreeEditor<T>(serverName, treeName, root,txManager,editor);
+		return new NetworkDefaultJungleTreeEditor<T>(uuid, treeName, root,txManager,editor);
 	}
 
 	@Override
--- a/src/alice/jungle/transaction/NetworkDefaultJungleTreeEditor.java	Mon Nov 11 19:06:56 2013 +0900
+++ b/src/alice/jungle/transaction/NetworkDefaultJungleTreeEditor.java	Mon Nov 11 19:22:47 2013 +0900
@@ -33,16 +33,16 @@
 	private final String treeName;
 	private final TreeEditor editor;
 	private final TreeOperationLog log;
-	private final String updaterName;
+	private final String uuid;
 
-	public NetworkDefaultJungleTreeEditor(String _updaterName, String _treeName, T _root,TransactionManager<T> _txManager,TreeEditor _editor)
+	public NetworkDefaultJungleTreeEditor(String _uuid, String _treeName, T _root,TransactionManager<T> _txManager,TreeEditor _editor)
 	{
-		this(_updaterName, _treeName, _root,_txManager,_editor,new DefaultTreeOperationLog());
+		this(_uuid, _treeName, _root,_txManager,_editor,new DefaultTreeOperationLog());
 	}
 	
-	public NetworkDefaultJungleTreeEditor(String _updaterName, String _treeName, T _root,TransactionManager<T> _txManager,TreeEditor _editor, TreeOperationLog _log)
+	public NetworkDefaultJungleTreeEditor(String _uuid, String _treeName, T _root,TransactionManager<T> _txManager,TreeEditor _editor, TreeOperationLog _log)
 	{
-		updaterName = _updaterName;
+		uuid = _uuid;
 		treeName = _treeName;
 		root = _root;
 		txManager = _txManager;
@@ -72,7 +72,7 @@
 		DefaultTreeOperationLog treeOperationLog = new DefaultTreeOperationLog(iterable,newLog.length());
 		TreeOperationLog newTreeOpLog = log.append(treeOperationLog);
 		
-		JungleTreeEditor newEditor = new NetworkDefaultJungleTreeEditor<T>(updaterName, treeName, newNode,txManager,editor,newTreeOpLog);
+		JungleTreeEditor newEditor = new NetworkDefaultJungleTreeEditor<T>(uuid, treeName, newNode,txManager,editor,newTreeOpLog);
 		return DefaultEither.newB(newEditor);
 	}
 	
@@ -119,7 +119,7 @@
 		}
 		
 		TransactionManager<T> newTxManager = either.b();
-		JungleTreeEditor newTreeEditor = new NetworkDefaultJungleTreeEditor<T>(updaterName, treeName, root,newTxManager,editor);
+		JungleTreeEditor newTreeEditor = new NetworkDefaultJungleTreeEditor<T>(uuid, treeName, root,newTxManager,editor);
 		
 		return DefaultEither.newB(newTreeEditor);
 	}
@@ -151,7 +151,7 @@
 	}
 	
 	public String getUpdaterName() {
-		return updaterName;
+		return uuid;
 	}
 	
 }
--- a/src/alice/jungle/transaction/NetworkTransactionManager.java	Mon Nov 11 19:06:56 2013 +0900
+++ b/src/alice/jungle/transaction/NetworkTransactionManager.java	Mon Nov 11 19:22:47 2013 +0900
@@ -29,17 +29,15 @@
 	private final ChangeListWriter writer;
 	private final String uuid;	
 	private final String treeName;	
-	private final String serverName;
 	
 	public NetworkTransactionManager(String _treeName, ChangeListWriter _writer,TreeContext<T> _tip,
-			AtomicReservableReference<TreeContext<T>> _repository,String _uuid, String _serverName)
+			AtomicReservableReference<TreeContext<T>> _repository,String _uuid)
 	{
 		repository = _repository;
 		tip = _tip;
 		writer = _writer;
 		uuid = _uuid;
 		treeName = _treeName;
-		serverName = _serverName;
 	}
 	
 	@Override
@@ -77,7 +75,7 @@
 			return DefaultEither.newA((Error)new DefaultError());
 		}
 		reservation.confirm();
-		TransactionManager<T> txManager = new NetworkTransactionManager<T>(treeName, writer, newContext, repository, uuid, serverName);
+		TransactionManager<T> txManager = new NetworkTransactionManager<T>(treeName, writer, newContext, repository, uuid);
 		return DefaultEither.newB(txManager);
 	}
 
--- a/src/jungle/app/bbs/NetworkJungleBulletinBoard.java	Mon Nov 11 19:06:56 2013 +0900
+++ b/src/jungle/app/bbs/NetworkJungleBulletinBoard.java	Mon Nov 11 19:22:47 2013 +0900
@@ -31,9 +31,9 @@
 {
 	private final Jungle jungle;
 	
-	public NetworkJungleBulletinBoard(String _serverName)
+	public NetworkJungleBulletinBoard(String _uuid)
 	{
-		jungle = new NetworkDefaultJungle(new AliceJournal(),"hoge",new DefaultTreeEditor(new DefaultTraverser()), _serverName);	
+		jungle = new NetworkDefaultJungle(new AliceJournal(), _uuid,new DefaultTreeEditor(new DefaultTraverser()));	
 		jungle.createNewTree("boards");
 		JungleManager.setJungle(jungle);
 	}
--- a/src/test/java/alice/jungle/DoubleJungleManager.java	Mon Nov 11 19:06:56 2013 +0900
+++ b/src/test/java/alice/jungle/DoubleJungleManager.java	Mon Nov 11 19:22:47 2013 +0900
@@ -20,8 +20,8 @@
 
 public class DoubleJungleManager {
 
-	static Jungle jungle1 = new NetworkDefaultJungle(null, "hoge", new DefaultTreeEditor(new DefaultTraverser()), "");
-	static Jungle jungle2 = new NetworkDefaultJungle(null, "hoge", new DefaultTreeEditor(new DefaultTraverser()), "");
+	static Jungle jungle1 = new NetworkDefaultJungle(null, "hoge", new DefaultTreeEditor(new DefaultTraverser()));
+	static Jungle jungle2 = new NetworkDefaultJungle(null, "hoge", new DefaultTreeEditor(new DefaultTraverser()));
 	
 	
 	public DoubleJungleManager() {
--- a/src/test/java/alice/jungle/log/example/TestCodeSegment.java	Mon Nov 11 19:06:56 2013 +0900
+++ b/src/test/java/alice/jungle/log/example/TestCodeSegment.java	Mon Nov 11 19:22:47 2013 +0900
@@ -3,36 +3,27 @@
 import java.io.IOException;
 import java.nio.ByteBuffer;
 
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.DefaultJungle;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.Jungle;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.JungleTree;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.JungleTreeEditor;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.core.Node;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.Command;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.NodePath;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.DefaultNodePath;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.DefaultTreeEditor;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.logger.DefaultTreeOperationLog;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.logger.TreeOperationLog;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.operations.NodeOperation;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.operations.TreeOperation;
 import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.traverser.DefaultTraverser;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Either;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Error;
 import alice.codesegment.CodeSegment;
 import alice.datasegment.CommandType;
 import alice.datasegment.Receiver;
 import alice.jungle.core.NetworkDefaultJungle;
 import alice.jungle.datasegment.store.container.DefaultTreeOperationLogContainer;
 import alice.jungle.transaction.NetworkDefaultJungleTreeEditor;
-import alice.test.topology.aquarium.FishPoint;
 
-import org.msgpack.MessagePack;
 import org.msgpack.type.Value;
 
 public class TestCodeSegment extends CodeSegment {
 	
-	static Jungle jungle = new NetworkDefaultJungle(null,"hoge",new DefaultTreeEditor(new DefaultTraverser()), "serverName");
+	static Jungle jungle = new NetworkDefaultJungle(null,"hoge",new DefaultTreeEditor(new DefaultTraverser()));
 	
 	// create input datasegment arg1
 	Receiver arg1 = ids.create(CommandType.PEEK);