# HG changeset patch
# User one
# Date 1385415790 -32400
# Node ID f9e29a52efd3fece70a75640c9c9e284cf84e115
# Parent 03bf62bb699e08824141986a8c4860025d23efa2
Move some files
diff -r 03bf62bb699e -r f9e29a52efd3 .classpath
--- a/.classpath Mon Nov 25 18:13:03 2013 +0900
+++ b/.classpath Tue Nov 26 06:43:10 2013 +0900
@@ -1,9 +1,10 @@
-
+
+
-
+
@@ -44,7 +45,7 @@
+
-
diff -r 03bf62bb699e -r f9e29a52efd3 .project
--- a/.project Mon Nov 25 18:13:03 2013 +0900
+++ b/.project Tue Nov 26 06:43:10 2013 +0900
@@ -1,25 +1,20 @@
- 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
-
-
+ 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
diff -r 03bf62bb699e -r f9e29a52efd3 pom.xml
--- a/pom.xml Mon Nov 25 18:13:03 2013 +0900
+++ b/pom.xml Tue Nov 26 06:43:10 2013 +0900
@@ -4,7 +4,8 @@
jungle-network
0.0.2-SNAPSHOT
- src
+ src/main/java
+ src/test/java
maven-compiler-plugin
@@ -46,11 +47,12 @@
UTF-8
-
- junit
- junit
- 3.8.1
-
+
+ junit
+ junit
+ 4.7
+ test
+
org.mortbay.jetty
jetty
diff -r 03bf62bb699e -r f9e29a52efd3 src/alice/jungle/core/NetworkDefaultJungle.java
--- a/src/alice/jungle/core/NetworkDefaultJungle.java Mon Nov 25 18:13:03 2013 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-package alice.jungle.core;
-
-import java.util.Iterator;
-import java.util.concurrent.ConcurrentHashMap;
-
-import alice.jungle.transaction.NetworkDefaultJungleTree;
-
-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.persistent.ChangeList;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.persistent.Journal;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.ChangeSet;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.TreeEditor;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.operations.TreeOperation;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.transaction.DefaultChangeSet;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.transaction.DefaultTreeContext;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.transaction.DefaultTreeNode;
-import fj.data.List;
-
-public class NetworkDefaultJungle implements Jungle {
- private Journal journal;
- private ConcurrentHashMap trees;
- private String uuid;
- private TreeEditor editor;
-
- public NetworkDefaultJungle(Journal _journal,String _uuid,TreeEditor _editor)
- {
- journal = _journal;
- trees = new ConcurrentHashMap();
- uuid = _uuid;
- editor = _editor;
- }
-
- @Override
- public JungleTree getTreeByName(String _name)
- {
- return trees.get(_name);
- }
-
- @Override
- public JungleTree createNewTree(final String _name)
- {
- ChangeList list = new ChangeList(){
- @Override
- public Iterator iterator() {
- List nil = List.nil();
- return nil.iterator();
- }
- @Override
- public String uuid() {
- return uuid;
- }
- @Override
- public String getTreeName() {
- return _name;
- }
- };
- DefaultTreeNode root = new DefaultTreeNode();
- ChangeSet set = new DefaultChangeSet(root.getAsNode(),null,list,uuid,_name, 0);
- DefaultTreeContext tc = new DefaultTreeContext(root,set);
- JungleTree newTree = new NetworkDefaultJungleTree(_name, tc,uuid,journal.getWriter(),editor);
- if(trees.putIfAbsent(_name,newTree) != null){
- return null;
- }
- return newTree;
- }
-}
diff -r 03bf62bb699e -r f9e29a52efd3 src/alice/jungle/datasegment/HashSetDataSegment.java
--- a/src/alice/jungle/datasegment/HashSetDataSegment.java Mon Nov 25 18:13:03 2013 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-package alice.jungle.datasegment;
-
-import java.util.HashSet;
-
-import org.msgpack.annotation.Message;
-
-@Message
-public class HashSetDataSegment {
- public HashSet hash = new HashSet();
- public HashSetDataSegment() {}
-}
diff -r 03bf62bb699e -r f9e29a52efd3 src/alice/jungle/datasegment/store/container/DefaultNodeOperationContainer.java
--- a/src/alice/jungle/datasegment/store/container/DefaultNodeOperationContainer.java Mon Nov 25 18:13:03 2013 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-package alice.jungle.datasegment.store.container;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.Command;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.operations.AppendChildAtOperation;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.operations.DeleteAttributeOperation;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.operations.DeleteChildAtOperation;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.operations.NodeOperation;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.operations.PutAttributeOperation;
-
-import org.msgpack.MessagePack;
-import org.msgpack.annotation.Message;
-import org.msgpack.template.OrdinalEnumTemplate;
-import org.msgpack.type.Value;
-
-import alice.codesegment.SingletonMessage;
-
-@Message
-public class DefaultNodeOperationContainer {
-
- public int pos;
- public String key;
- public Value value;
- public Value commandValue;
-
- public static void main(String[] args) throws IOException {
- String key = "hoge";
- ByteBuffer b = ByteBuffer.wrap("messagepack value".getBytes());
- PutAttributeOperation op = new PutAttributeOperation(key, b);
- DefaultNodeOperationContainer container = new DefaultNodeOperationContainer();
- container.unconvert(op);
- NodeOperation convertedOp = container.convert();
- System.out.println("pos : "+convertedOp.getPosition());
- System.out.println("Command : "+convertedOp.getCommand());
- System.out.println("key : "+convertedOp.getKey());
- System.out.println("value : "+new String(convertedOp.getValue().array()));
-
- }
-
- public DefaultNodeOperationContainer() {
-
- }
-
- public void unconvert(NodeOperation op) throws IOException {
-// MessagePack msgpack = new MessagePack();
- MessagePack msgpack = SingletonMessage.getInstance();
- pos = op.getPosition();
- key = op.getKey();
- value = null;
- if (op.getValue() != null) {
- ByteBuffer b = op.getValue();
- byte[] bytes = b.array();
- Value v = msgpack.unconvert(bytes);
- value = v;
- }
- Command c = op.getCommand();
- msgpack.register(Command.class, new OrdinalEnumTemplate(Command.class));
- Value cValue = msgpack.unconvert(c);
- commandValue = cValue;
- }
-
- public NodeOperation convert() throws IOException{
-// MessagePack msgpack = new MessagePack();
- MessagePack msgpack = SingletonMessage.getInstance();
- msgpack.register(Command.class, new OrdinalEnumTemplate(Command.class));
- Command c = msgpack.convert(commandValue, Command.class);
- ByteBuffer b = null;
- if (value != null) {
- b = ByteBuffer.wrap(msgpack.convert(value, byte[].class));
- }
- if (c == Command.PUT_ATTRIBUTE) {
- return new PutAttributeOperation(key, b);
- } else if (c == Command.APPEND_CHILD) {
- return new AppendChildAtOperation(pos);
- } else if (c == Command.DELETE_CHILD) {
- return new DeleteChildAtOperation(pos);
- } else if (c == Command.DELETE_ATTRIBUTE){
- return new DeleteAttributeOperation(key);
- }
- return null;
- }
-
-}
diff -r 03bf62bb699e -r f9e29a52efd3 src/alice/jungle/datasegment/store/container/DefaultNodePathContainer.java
--- a/src/alice/jungle/datasegment/store/container/DefaultNodePathContainer.java Mon Nov 25 18:13:03 2013 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-package alice.jungle.datasegment.store.container;
-
-import java.io.IOException;
-import java.util.LinkedList;
-import java.util.List;
-
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.NodePath;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.DefaultNodePath;
-
-import org.msgpack.MessagePack;
-import org.msgpack.annotation.Message;
-import org.msgpack.template.IntegerTemplate;
-import org.msgpack.template.ListTemplate;
-import org.msgpack.type.Value;
-
-@Message
-public class DefaultNodePathContainer {
-
- public Value pathValue;
-
- public static void main(String[] args) throws IOException {
- DefaultNodePath p = new DefaultNodePath();
- p = p.add(1).add(2).add(3);
- DefaultNodePathContainer pathContainer = new DefaultNodePathContainer();
- pathContainer.unconvert(p);
- NodePath convertedPath = pathContainer.convert();
- for (int i : convertedPath) {
- System.out.println(i);
- }
- }
-
- public DefaultNodePathContainer() {
-
- }
-
- public void unconvert(NodePath path) throws IOException {
- MessagePack msgpack = new MessagePack();
- List list = new LinkedList();
- for(Integer i : path) {
- list.add(i);
- }
- /* Remove first Element(-1). */
- list.remove(0);
- Value v = msgpack.unconvert(list);
- pathValue = v;
- }
-
- public DefaultNodePath convert() throws IOException {
- MessagePack msgpack = new MessagePack();
- msgpack.register(List.class, new ListTemplate(IntegerTemplate.getInstance()));
- List convertedList = (List)msgpack.convert(pathValue, List.class);
- DefaultNodePath path = new DefaultNodePath();
- for (int i: convertedList) {
- path = path.add(i);
- }
- return path;
- }
-}
diff -r 03bf62bb699e -r f9e29a52efd3 src/alice/jungle/datasegment/store/container/DefaultTreeOperationContainer.java
--- a/src/alice/jungle/datasegment/store/container/DefaultTreeOperationContainer.java Mon Nov 25 18:13:03 2013 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,100 +0,0 @@
-package alice.jungle.datasegment.store.container;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-
-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.operations.DefaultTreeOperation;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.operations.NodeOperation;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.operations.PutAttributeOperation;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.operations.TreeOperation;
-
-import org.msgpack.MessagePack;
-import org.msgpack.annotation.Message;
-import org.msgpack.type.Value;
-
-import alice.codesegment.SingletonMessage;
-
-@Message
-public class DefaultTreeOperationContainer {
-
- Value pathValue;
- Value opValue;
-
- public static void main(String[] args) throws IOException {
- String key = "hoge";
- ByteBuffer b = ByteBuffer.wrap("messagepack value".getBytes());
- PutAttributeOperation op = new PutAttributeOperation(key, b);
-
- DefaultNodePath p = new DefaultNodePath();
- p = p.add(1).add(2).add(3);
- DefaultTreeOperation treeOp = new DefaultTreeOperation(p, op);
-
- DefaultTreeOperationContainer treeOperationContainer = new DefaultTreeOperationContainer();
- treeOperationContainer.unconvert(treeOp);
-
- TreeOperation treeOperation = treeOperationContainer.convert();
- NodePath nodePath = treeOperation.getNodePath();
- NodeOperation nodeOp = treeOperation.getNodeOperation();
- Command c = nodeOp.getCommand();
- String str = "";
- switch (c) {
- case PUT_ATTRIBUTE:
- String k = nodeOp.getKey();
- ByteBuffer value = nodeOp.getValue();
- if (value.limit() < 100) {
- str = String.format("key:%s,value:%s", k,
- new String(value.array()));
- } else {
- str = String.format("key:%s,value:%d", k, value.limit());
- }
- break;
- case DELETE_ATTRIBUTE:
- str = String.format("key:%s", nodeOp.getKey());
- break;
- case APPEND_CHILD:
- str = String.format("pos:%d", nodeOp.getPosition());
- break;
- case DELETE_CHILD:
- str = String.format("pos:%d", nodeOp.getPosition());
- break;
- }
- System.out.println(String.format("[%s:%s:%s]", c, nodePath, str));
- for (int i: nodePath ) {
- System.out.println(i);
- }
- }
-
- public DefaultTreeOperationContainer() {
-
- }
-
- public void unconvert(DefaultTreeOperation _op) throws IOException {
- NodeOperation nodeOp = _op.getNodeOperation();
- NodePath nodePath = _op.getNodePath();
- DefaultNodeOperationContainer opContainer = new DefaultNodeOperationContainer();
- opContainer.unconvert(nodeOp);
- DefaultNodePathContainer pathContainer = new DefaultNodePathContainer();
- pathContainer.unconvert(nodePath);
- unconvert(opContainer, pathContainer);
- }
-
- public void unconvert(DefaultNodeOperationContainer _op,
- DefaultNodePathContainer _path) throws IOException {
-// MessagePack msgpack = new MessagePack();
- MessagePack msgpack = SingletonMessage.getInstance();
- pathValue = msgpack.unconvert(_path);
- opValue = msgpack.unconvert(_op);
- }
-
- public TreeOperation convert() throws IOException {
-// MessagePack msgpack = new MessagePack();
- MessagePack msgpack = SingletonMessage.getInstance();
- DefaultNodePathContainer pathContainer = msgpack.convert(pathValue, DefaultNodePathContainer.class);
- DefaultNodeOperationContainer opContainer = msgpack.convert(opValue, DefaultNodeOperationContainer.class);
- return new DefaultTreeOperation(pathContainer.convert(), opContainer.convert());
- }
-
-}
diff -r 03bf62bb699e -r f9e29a52efd3 src/alice/jungle/datasegment/store/container/DefaultTreeOperationLogContainer.java
--- a/src/alice/jungle/datasegment/store/container/DefaultTreeOperationLogContainer.java Mon Nov 25 18:13:03 2013 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,114 +0,0 @@
-package alice.jungle.datasegment.store.container;
-
-import java.io.IOException;
-import java.util.LinkedList;
-import java.util.List;
-
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.NodePath;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.logger.DefaultTreeOperationLog;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.operations.DefaultTreeOperation;
-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 org.msgpack.MessagePack;
-import org.msgpack.annotation.Message;
-import org.msgpack.template.ListTemplate;
-import org.msgpack.template.ValueTemplate;
-import org.msgpack.type.Value;
-
-import alice.codesegment.SingletonMessage;
-
-@Message
-public class DefaultTreeOperationLogContainer {
-
- Value logValue;
- String treeName;
- String uuid;
- String updaterName;
- String revision;
- long timestamp;
-
- public DefaultTreeOperationLogContainer() {
- logValue = null;
- treeName = "";
- uuid = "";
- updaterName = "";
- revision = "";
- timestamp = Long.MAX_VALUE;
- }
-
- public void setTreeName(String _treeName) {
- treeName = _treeName;
- }
-
- public String getTreeName() {
- return treeName;
- }
-
- public void setUUID(String _uuid) {
- uuid = _uuid;
- }
-
- public String getUUID() {
- return uuid;
- }
-
- public void setUpdaterName(String _updaterName) {
- updaterName = _updaterName;
- }
-
- public String getServerName() {
- return updaterName;
- }
-
- public void setRevision(String _revision) {
- revision = _revision;
- }
-
- public String getRevision() {
- return revision;
- }
-
- public void setTimeStamp(long t) {
- timestamp = t;
- }
-
- public long getTimeStamp() {
- return timestamp;
- }
-
- public void unconvert(Iterable _log) throws IOException {
- MessagePack msgpack = SingletonMessage.getInstance();
- List list = new LinkedList();
- for(TreeOperation op : _log) {
- NodeOperation nOp = op.getNodeOperation();
- NodePath nodePath = op.getNodePath();
- DefaultTreeOperation treeOp = new DefaultTreeOperation(nodePath, nOp);
- DefaultTreeOperationContainer container = new DefaultTreeOperationContainer();
- container.unconvert(treeOp);
- Value v = msgpack.unconvert(container);
- list.add(v);
- }
- Value listValue = msgpack.unconvert(list);
- logValue = listValue;
- }
-
- public DefaultTreeOperationLog convert() throws IOException {
- MessagePack msgpack = SingletonMessage.getInstance();
- msgpack.register(List.class, new ListTemplate(ValueTemplate.getInstance()));
- List listValue = msgpack.convert(logValue, List.class);
- List logList = new LinkedList();
- for(Value v: listValue) {
- DefaultTreeOperationContainer container = msgpack.convert(v, DefaultTreeOperationContainer.class);
- logList.add(container.convert());
- }
- DefaultTreeOperationLog log = new DefaultTreeOperationLog(logList, logList.size());
- return log;
- }
-
- public String getHashLogString() {
- return treeName + revision + updaterName;
- }
-
-
-}
diff -r 03bf62bb699e -r f9e29a52efd3 src/alice/jungle/datasegment/store/transformer/NetworkAppendChildAt.java
--- a/src/alice/jungle/datasegment/store/transformer/NetworkAppendChildAt.java Mon Nov 25 18:13:03 2013 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-package alice.jungle.datasegment.store.transformer;
-
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.trasnformer.EditableNode;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.trasnformer.NodeEditor;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.DefaultEither;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Either;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Error;
-
-import org.msgpack.annotation.Message;
-
-
-/*
- * This code same AppendChildAt.
- */
-
-@Message
-public class NetworkAppendChildAt implements NodeEditor {
-
- private final int pos;
-
- public NetworkAppendChildAt(int _pos) {
- pos = _pos;
- }
-
- @Override
- public > Either edit(T _e) {
- Either either = _e.getChildren().addNewChildAt(pos);
- if(either.isA()){
- // error
- return either;
- }
- return DefaultEither.newB(either.b());
- }
-
-}
diff -r 03bf62bb699e -r f9e29a52efd3 src/alice/jungle/operations/NetworkAppendChildAtOperation.java
--- a/src/alice/jungle/operations/NetworkAppendChildAtOperation.java Mon Nov 25 18:13:03 2013 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-package alice.jungle.operations;
-
-import java.nio.ByteBuffer;
-
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.Command;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.operations.NodeOperation;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.trasnformer.EditableNode;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Either;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Error;
-
-import org.msgpack.annotation.Message;
-
-import alice.jungle.datasegment.store.transformer.NetworkAppendChildAt;
-
-
-@Message
-public class NetworkAppendChildAtOperation implements NodeOperation {
-
- /* MessagePack cannot handle final.*/
- // private final int pos;
- private int pos;
-
- /* Position -1 represent root position. */
- public NetworkAppendChildAtOperation() { pos = -2; }
-
- public NetworkAppendChildAtOperation(int _pos) {
- pos = _pos;
- }
-
- @Override
- public Command getCommand() {
- return Command.APPEND_CHILD;
- }
-
- @Override
- public > Either invoke(T _target) {
- NetworkAppendChildAt appendChildAt = new NetworkAppendChildAt(pos);
- return appendChildAt.edit(_target);
- }
-
- @Override
- public int getPosition() {
- return pos;
- }
-
- @Override
- public String getKey() {
- return null;
- }
-
- @Override
- public ByteBuffer getValue() {
- return null;
- }
-}
diff -r 03bf62bb699e -r f9e29a52efd3 src/alice/jungle/operations/NetworkDeleteAttributeOperation.java
--- a/src/alice/jungle/operations/NetworkDeleteAttributeOperation.java Mon Nov 25 18:13:03 2013 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-package alice.jungle.operations;
-
-import java.nio.ByteBuffer;
-
-import org.msgpack.annotation.Message;
-
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.Command;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.operations.NodeOperation;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.trasnformer.DeleteAttribute;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.trasnformer.EditableNode;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Either;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Error;
-
-@Message
-public class NetworkDeleteAttributeOperation implements NodeOperation
-{
- /* MessagePack cannot handle final.*/
- //private final String key;
- private String key;
-
- public NetworkDeleteAttributeOperation()
- {
- key = null;
- }
-
- public NetworkDeleteAttributeOperation(String _key)
- {
- key = _key;
- }
-
- @Override
- public Command getCommand()
- {
- return Command.DELETE_ATTRIBUTE;
- }
-
- @Override
- public > Either invoke(T _target)
- {
- DeleteAttribute deleteAttribute = new DeleteAttribute(key);
- return deleteAttribute.edit(_target);
- }
-
- @Override
- public int getPosition()
- {
- return -1;
- }
-
- @Override
- public String getKey()
- {
- return key;
- }
-
- @Override
- public ByteBuffer getValue()
- {
- return null;
- }
-}
diff -r 03bf62bb699e -r f9e29a52efd3 src/alice/jungle/operations/NetworkDeleteChildAtOperation.java
--- a/src/alice/jungle/operations/NetworkDeleteChildAtOperation.java Mon Nov 25 18:13:03 2013 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-package alice.jungle.operations;
-
-import java.nio.ByteBuffer;
-
-import org.msgpack.annotation.Message;
-
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.Command;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.operations.NodeOperation;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.trasnformer.DeleteChildAt;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.trasnformer.EditableNode;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Either;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Error;
-
-@Message
-public class NetworkDeleteChildAtOperation implements NodeOperation
-{
- /* MessagePack cannot handle final.*/
- //private final int pos;
- private int pos;
-
-
- /* Position -1 represent root position. */
- public NetworkDeleteChildAtOperation(int _pos)
- {
- pos = _pos;
- }
-
- @Override
- public Command getCommand()
- {
- return Command.DELETE_CHILD;
- }
-
- @Override
- public > Either invoke(T _target)
- {
- DeleteChildAt deleteChildAt = new DeleteChildAt(pos);
- return deleteChildAt.edit(_target);
- }
-
- @Override
- public int getPosition()
- {
- return pos;
- }
-
- @Override
- public String getKey()
- {
- return null;
- }
-
- @Override
- public ByteBuffer getValue()
- {
- return null;
- }
-}
diff -r 03bf62bb699e -r f9e29a52efd3 src/alice/jungle/operations/NetworkNodeOperation.java
--- a/src/alice/jungle/operations/NetworkNodeOperation.java Mon Nov 25 18:13:03 2013 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,114 +0,0 @@
-package alice.jungle.operations;
-
-import java.nio.ByteBuffer;
-
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.Command;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.operations.NodeOperation;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.trasnformer.DeleteAttribute;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.trasnformer.DeleteChildAt;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.trasnformer.EditableNode;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.trasnformer.PutAttribute;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Either;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Error;
-
-import org.msgpack.annotation.Message;
-
-import alice.jungle.datasegment.store.transformer.NetworkAppendChildAt;
-
-@Message
-public class NetworkNodeOperation implements NodeOperation{
-
- public int pos;
- public String key;
- public ByteBuffer value;
- public int commandType;
-
- public final static int NUM_PUT_ATTRIBUTE = 1;
- public final static int NUM_APPEND_CHILD = 2;
- public final static int NUM_DELETE_CHILD = 3;
- public final static int NUM_DELETE_ATTRIBUTE = 4;
-
- public NetworkNodeOperation() {
- pos = -2;
- key = null;
- value = null;
- commandType = 0;
- }
-
- public NetworkNodeOperation(NodeOperation _op) {
- pos = _op.getPosition();
- key = _op.getKey();
- value = _op.getValue();
- commandType = getCommandType(_op.getCommand());
- }
-
- public static int getCommandType(Command c) {
- switch(c) {
- case PUT_ATTRIBUTE:
- return NUM_PUT_ATTRIBUTE;
- case APPEND_CHILD:
- return NUM_APPEND_CHILD;
- case DELETE_CHILD:
- return NUM_DELETE_CHILD;
- case DELETE_ATTRIBUTE:
- return NUM_DELETE_ATTRIBUTE;
- default:
- break;
- }
- return 0;
- }
-
- public static Command getCommand(int num) {
- switch(num) {
- case NUM_PUT_ATTRIBUTE:
- return Command.PUT_ATTRIBUTE;
- case NUM_APPEND_CHILD:
- return Command.APPEND_CHILD;
- case NUM_DELETE_CHILD:
- return Command.DELETE_CHILD;
- case NUM_DELETE_ATTRIBUTE:
- return Command.DELETE_ATTRIBUTE;
- default:
- break;
- }
- return null;
- }
-
- public Command getCommand() {
- return getCommand(commandType);
- }
-
- public int getPosition() {
- return pos;
- }
-
- public String getKey() {
- return key;
- }
-
- public ByteBuffer getValue() {
- return value;
- }
-
- @Override
- public > Either invoke(T _target) {
- switch(getCommand(commandType)) {
- case PUT_ATTRIBUTE:
- PutAttribute putAttribute = new PutAttribute(key,value);
- return putAttribute.edit(_target);
- case APPEND_CHILD:
- NetworkAppendChildAt appendChildAt = new NetworkAppendChildAt(pos);
- return appendChildAt.edit(_target);
- case DELETE_CHILD:
- DeleteChildAt deleteChildAt = new DeleteChildAt(pos);
- return deleteChildAt.edit(_target);
- case DELETE_ATTRIBUTE:
- DeleteAttribute deleteAttribute = new DeleteAttribute(key);
- return deleteAttribute.edit(_target);
- default:
- break;
- }
- return null;
- }
-
-}
diff -r 03bf62bb699e -r f9e29a52efd3 src/alice/jungle/operations/NetworkNodePath.java
--- a/src/alice/jungle/operations/NetworkNodePath.java Mon Nov 25 18:13:03 2013 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-package alice.jungle.operations;
-
-import java.util.Iterator;
-import java.util.LinkedList;
-
-import org.msgpack.annotation.Message;
-
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.NodePath;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Pair;
-
-@Message
-public class NetworkNodePath implements NodePath
-{
- LinkedList path;
-
- public NetworkNodePath() {
- path = new LinkedList();
- path.add(-1);
- }
-
- public NetworkNodePath(NodePath _p) {
- path = new LinkedList();
- for(Integer pos: _p) {
- path.add(pos);
- }
- }
-
- private NetworkNodePath(LinkedList _path) {
- path = _path;
- }
-
- @Override
- public Iterator iterator() {
- return path.iterator();
- }
-
- @Override
- public NetworkNodePath add(int _pos) {
- LinkedList newPath = copyPath();
- newPath.add(_pos);
- return new NetworkNodePath(newPath);
- }
-
- @Override
- public Pair pop() {
- LinkedList cPath = copyPath();
- int e = cPath.getFirst();
- cPath.remove();
- return new Pair(e, new NetworkNodePath(cPath));
- }
-
- @Override
- public int size() {
- return path.size();
- }
-
- private LinkedList copyPath() {
- LinkedList newPath = new LinkedList();
- for (Integer i : path) {
- newPath.add(i);
- }
- return newPath;
- }
-
- @Override
- public String toString() {
- return path.toString();
- }
-
-}
diff -r 03bf62bb699e -r f9e29a52efd3 src/alice/jungle/operations/NetworkPutAttributeOperation.java
--- a/src/alice/jungle/operations/NetworkPutAttributeOperation.java Mon Nov 25 18:13:03 2013 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-package alice.jungle.operations;
-
-import java.nio.ByteBuffer;
-
-import org.msgpack.annotation.Message;
-
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.Command;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.operations.NodeOperation;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.trasnformer.EditableNode;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.trasnformer.PutAttribute;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Either;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Error;
-@Message
-public class NetworkPutAttributeOperation implements NodeOperation
-{
-
-/* MessagePack cannot handle final.
- *
- * private final String key;
- * private final ByteBuffer value;
- */
- private String key;
- private ByteBuffer value;
-
- public NetworkPutAttributeOperation()
- {
- key = null;
- value = null;
- }
-
- public NetworkPutAttributeOperation(String _key,ByteBuffer _value)
- {
- key = _key;
- value = _value;
- }
-
- @Override
- public Command getCommand()
- {
- return Command.PUT_ATTRIBUTE;
- }
-
- @Override
- public > Either invoke(T _target)
- {
- PutAttribute putAttribute = new PutAttribute(key,value);
- return putAttribute.edit(_target);
- }
-
- @Override
- public int getPosition()
- {
- return -1;
- }
-
- @Override
- public String getKey()
- {
- return key;
- }
-
- @Override
- public ByteBuffer getValue()
- {
- return value;
- }
-}
diff -r 03bf62bb699e -r f9e29a52efd3 src/alice/jungle/operations/NetworkTreeOperation.java
--- a/src/alice/jungle/operations/NetworkTreeOperation.java Mon Nov 25 18:13:03 2013 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-package alice.jungle.operations;
-
-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.operations.AppendChildAtOperation;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.operations.DeleteAttributeOperation;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.operations.DeleteChildAtOperation;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.operations.NodeOperation;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.operations.PutAttributeOperation;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.operations.TreeOperation;
-
-import org.msgpack.annotation.Message;
-
-@Message
-public class NetworkTreeOperation implements TreeOperation {
-
- public NetworkNodePath path;
- public NetworkNodeOperation operation;
-
- public NetworkTreeOperation() {
- path = null;
- operation = null;
- }
-
- public NetworkTreeOperation(TreeOperation treeOp) {
- path = new NetworkNodePath(treeOp.getNodePath());
- operation = new NetworkNodeOperation(treeOp.getNodeOperation());
- }
-
- public NetworkTreeOperation(NodePath _p, NodeOperation _op) {
- path = new NetworkNodePath(_p);
- operation = new NetworkNodeOperation(_op);
- }
-
- public NetworkTreeOperation(NetworkNodePath _p, NodeOperation _op) {
- path = _p;
- operation = new NetworkNodeOperation(_op);
- }
-
- public NetworkTreeOperation(NodePath _p, NetworkNodeOperation _op) {
- path = new NetworkNodePath(_p);
- operation = _op;
- }
-
- public NetworkTreeOperation(NetworkNodePath _p, NetworkNodeOperation _op) {
- path = _p;
- operation = _op;
- }
-
- @Override
- public NodePath getNodePath() {
- return path;
- }
-
- @Override
- public NodeOperation getNodeOperation() {
- Command c = operation.getCommand();
- switch(c) {
- case PUT_ATTRIBUTE:
- return new PutAttributeOperation(operation.getKey(), operation.getValue());
- case APPEND_CHILD:
- return new AppendChildAtOperation(operation.getPosition());
- case DELETE_CHILD:
- return new DeleteChildAtOperation(operation.getPosition());
- case DELETE_ATTRIBUTE:
- return new DeleteAttributeOperation(operation.getKey());
- default:
- break;
- }
- return null;
- }
-
-}
diff -r 03bf62bb699e -r f9e29a52efd3 src/alice/jungle/operations/NetworkTreeOperationLog.java
--- a/src/alice/jungle/operations/NetworkTreeOperationLog.java Mon Nov 25 18:13:03 2013 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +0,0 @@
-package alice.jungle.operations;
-
-import java.util.Date;
-import java.util.Iterator;
-import java.util.LinkedList;
-
-import org.msgpack.annotation.Message;
-
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.NodePath;
-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;
-
-@Message
-public class NetworkTreeOperationLog implements TreeOperationLog
-{
- public LinkedList list;
- public int size;
- String uuid;
- String treeName;
- long timestamp;
-
- public NetworkTreeOperationLog() {
- list = new LinkedList();
- size = 0;
- treeName = "";
- timestamp = new Date().getTime();
- }
-
- public NetworkTreeOperationLog(String _uuid, String _treeName, Iterable _list)
- {
- this(_uuid, _treeName, _list, new Date().getTime());
- }
-
- public NetworkTreeOperationLog(String _uuid, String _treeName, Iterable _list, long _timestamp)
- {
- uuid = _uuid;
- treeName = _treeName;
- list = new LinkedList();
- timestamp = _timestamp;
- for(TreeOperation op: _list) {
- NetworkTreeOperation nOp = new NetworkTreeOperation(op);
- list.add(nOp);
- }
- size = list.size();
- }
-
- public NetworkTreeOperationLog(Iterable _list)
- {
- this("", "", _list);
- }
-
-
- @Override
- public Iterator iterator() {
- LinkedList opList = new LinkedList();
- for(NetworkTreeOperation op : list) {
- opList.add(op);
- }
- return opList.iterator();
- }
-
- @Override
- public NetworkTreeOperationLog add(NodePath _p, NodeOperation _op)
- {
- NetworkTreeOperation op = new NetworkTreeOperation(_p, _op);
- list.add(op);
- return this;
- }
-
- @Override
- public NetworkTreeOperationLog append(TreeOperationLog _log)
- {
- for (TreeOperation o : _log) {
- NetworkTreeOperation op = new NetworkTreeOperation(o);
- list.add(op);
- }
- return this;
- }
-
- @Override
- public int length()
- {
- return size;
- }
-
- public String getUUID() {
- return uuid;
- }
-
- public String getTreeName() {
- return treeName;
- }
-
- public long getTimeStamp() {
- return timestamp;
- }
-
- public void setTimeStamp(long _timestamp) {
- timestamp = _timestamp;
- }
-
-}
diff -r 03bf62bb699e -r f9e29a52efd3 src/alice/jungle/persistence/AliceJournal.java
--- a/src/alice/jungle/persistence/AliceJournal.java Mon Nov 25 18:13:03 2013 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-package alice.jungle.persistence;
-
-import java.nio.ByteBuffer;
-
-import alice.jungle.datasegment.store.container.DefaultNodeOperationContainer;
-import alice.jungle.datasegment.store.container.DefaultTreeOperationContainer;
-
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.persistent.ChangeList;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.persistent.ChangeListReader;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.persistent.ChangeListWriter;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.persistent.Journal;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.persistent.Result;
-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.operations.NodeOperation;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.operations.TreeOperation;
-
-public class AliceJournal implements Journal {
-
- private static final AliceChangeListWriter ALICE_WRITER = new AliceChangeListWriter();
- private static final AliceChangeListReader ALICE_READER = new AliceChangeListReader();
- @Override
- public ChangeListReader getReader() {
- return ALICE_READER;
- }
- @Override
- public ChangeListWriter getWriter() {
- return ALICE_WRITER;
- }
-
- private static class AliceChangeListWriter implements ChangeListWriter
- {
- @Override
- public Result write(ChangeList _operations)
- {
- /*
- for(TreeOperation op : _operations){
- NodePath p = op.getNodePath();
- NodeOperation nodeOp = op.getNodeOperation();
- Command c = nodeOp.getCommand();
- String args = "";
- switch(c){
- case PUT_ATTRIBUTE:
- String key = nodeOp.getKey();
- ByteBuffer value = nodeOp.getValue();
- if(value.limit() < 100){
- args = String.format("key:%s,value:%s",key,new String(value.array()));
- }else{
- args = String.format("key:%s,value:%d",key,value.limit());
- }
- break;
- case DELETE_ATTRIBUTE:
- args = String.format("key:%s",nodeOp.getKey());
- break;
- case APPEND_CHILD:
- args = String.format("pos:%d",nodeOp.getPosition());
- break;
- case DELETE_CHILD:
- args = String.format("pos:%d",nodeOp.getPosition());
- break;
- }
- System.out.println(String.format("[%s:%s:%s]",c,p,args));
- }
- */
- return Result.SUCCESS;
- }
- }
-
- private static class AliceChangeListReader implements ChangeListReader
- {
- @Override
- public ChangeListReader newReader()
- {
- return this;
- }
-
- @Override
- public ChangeList read()
- {
- return null;
- }
- }
-
-
-}
diff -r 03bf62bb699e -r f9e29a52efd3 src/alice/jungle/persistence/JungleUpdater.java
--- a/src/alice/jungle/persistence/JungleUpdater.java Mon Nov 25 18:13:03 2013 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-package alice.jungle.persistence;
-
-import java.nio.ByteBuffer;
-
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.JungleTreeEditor;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.Command;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.DefaultNodePath;
-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.util.Either;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Error;
-
-public class JungleUpdater {
-
- public JungleUpdater() {
-
- }
-
- public static Either edit(JungleTreeEditor _editor ,TreeOperationLog _log) {
- JungleTreeEditor editor = _editor;
- Either either = null;
- for (TreeOperation op : _log) {
- either = _edit(editor, op);
- if(either.isA()) {
- return either;
- }
- editor = either.b();
- }
- return either;
- }
-
- private static Either _edit(JungleTreeEditor editor,
- TreeOperation op) {
- DefaultNodePath path = new DefaultNodePath();
- NodeOperation nodeOp = op.getNodeOperation();
- int pos = nodeOp.getPosition();
- Command c = nodeOp.getCommand();
- String key = "";
- switch (c) {
- case PUT_ATTRIBUTE:
- key = nodeOp.getKey();
- ByteBuffer value = nodeOp.getValue();
- return editor.putAttribute(path, key, value);
- case DELETE_ATTRIBUTE:
- key = nodeOp.getKey();
- return editor.deleteAttribute(path, key);
- case APPEND_CHILD:
- return editor.addNewChildAt(path, pos);
- case DELETE_CHILD:
- return editor.deleteChildAt(path, 0);
- }
- return null;
- }
-
-
-
-}
diff -r 03bf62bb699e -r f9e29a52efd3 src/alice/jungle/persistence/PersistentChangeList.java
--- a/src/alice/jungle/persistence/PersistentChangeList.java Mon Nov 25 18:13:03 2013 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-package alice.jungle.persistence;
-
-import java.util.Iterator;
-
-import alice.jungle.operations.NetworkTreeOperationLog;
-
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.persistent.ChangeList;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.ChangeSet;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.logger.TreeOperationLog;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.operations.TreeOperation;
-
-public class PersistentChangeList implements ChangeList {
-
- public NetworkTreeOperationLog log;
- public String treeName;
- public String uuid;
-
- public PersistentChangeList(String _uuid, String _treeName, TreeOperationLog _log) {
- uuid = _uuid;
- treeName = _treeName;
- log = new NetworkTreeOperationLog(_log);
- }
-
- public PersistentChangeList(NetworkTreeOperationLog _log) {
- log = _log;
- treeName = _log.getTreeName();
- uuid = _log.getUUID();
- }
-
- public PersistentChangeList(ChangeSet cs) {
- treeName = cs.getTreeName();
- uuid = cs.uuid();
- log = new NetworkTreeOperationLog(cs.getChangeList());
- }
-
- @Override
- public Iterator iterator() {
- return log.iterator();
- }
-
- public NetworkTreeOperationLog getTreeOperationLog() {
- return log;
- }
-
- public String getTreeName() {
- return treeName;
- }
-
- public String uuid() {
- return uuid;
- }
-
-
-}
diff -r 03bf62bb699e -r f9e29a52efd3 src/alice/jungle/persistence/PersistentChangeListReader.java
--- a/src/alice/jungle/persistence/PersistentChangeListReader.java Mon Nov 25 18:13:03 2013 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-package alice.jungle.persistence;
-
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.msgpack.MessagePack;
-
-import alice.jungle.operations.NetworkTreeOperationLog;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.persistent.ChangeList;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.persistent.ChangeListReader;
-
-public class PersistentChangeListReader implements ChangeListReader {
-
- private static InputStream in;
- MessagePack msgpack = PersistentJournal.getMessagePack();
-
- public PersistentChangeListReader() {
- in = null;
- }
-
- public PersistentChangeListReader(InputStream _in) {
- in = _in;
- }
-
- @Override
- public ChangeListReader newReader()
- {
- return new PersistentChangeListReader();
- }
-
- @Override
- public ChangeList read()
- {
- try {
- final NetworkTreeOperationLog readLog = msgpack.read(in, NetworkTreeOperationLog.class);
- PersistentChangeList cl = new PersistentChangeList(readLog);
- return cl;
- } catch (EOFException e){
-
- } catch (IOException e) {
- }
- return null;
- }
-}
diff -r 03bf62bb699e -r f9e29a52efd3 src/alice/jungle/persistence/PersistentChangeListWriter.java
--- a/src/alice/jungle/persistence/PersistentChangeListWriter.java Mon Nov 25 18:13:03 2013 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-package alice.jungle.persistence;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.msgpack.MessagePack;
-
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.persistent.ChangeList;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.persistent.ChangeListWriter;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.persistent.Result;
-import alice.jungle.operations.NetworkTreeOperationLog;
-
-public class PersistentChangeListWriter implements ChangeListWriter {
-
- MessagePack msgpack = PersistentJournal.getMessagePack();
- OutputStream out;
-
- public PersistentChangeListWriter(OutputStream _out) {
- out = _out;
- }
-
- @Override
- public Result write(ChangeList cs)
- {
- NetworkTreeOperationLog log = new NetworkTreeOperationLog(cs.uuid(), cs.getTreeName(), cs);
- try {
- msgpack.write(out, log);
- out.flush();
- return Result.SUCCESS;
- } catch (IOException e) {
- }
- return null;
- }
-}
diff -r 03bf62bb699e -r f9e29a52efd3 src/alice/jungle/persistence/PersistentChangeSet.java
--- a/src/alice/jungle/persistence/PersistentChangeSet.java Mon Nov 25 18:13:03 2013 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-package alice.jungle.persistence;
-
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.core.Node;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.persistent.ChangeList;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.ChangeSet;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.operations.TreeOperation;
-
-public class PersistentChangeSet implements ChangeSet
-{
- private final Node root;
- private final ChangeSet previous;
- private final ChangeList changeList;
- private final String uuid;
- private final long revision;
- private final String treeName;
-
- public PersistentChangeSet(Node _node,ChangeSet _prev,ChangeList _log,String _uuid, String _treeName, long _revision)
- {
- root = _node;
- previous = _prev;
- changeList = _log;
- uuid = _uuid;
- revision = _revision;
- treeName = _treeName;
- }
-
- @Override
- public Node getRoot()
- {
- return root;
- }
-
- @Override
- public ChangeSet prev()
- {
- return previous;
- }
-
- @Override
- public ChangeList getChangeList()
- {
- return changeList;
- }
-
- @Override
- public String uuid()
- {
- return uuid;
- }
-
- @Override
- public long revision()
- {
- return revision;
- }
-
- @Override
- public Iterable getOperations()
- {
- return changeList;
- }
-
- public String getTreeName() {
- return treeName;
- }
-
-}
diff -r 03bf62bb699e -r f9e29a52efd3 src/alice/jungle/persistence/PersistentJournal.java
--- a/src/alice/jungle/persistence/PersistentJournal.java Mon Nov 25 18:13:03 2013 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-package alice.jungle.persistence;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.msgpack.MessagePack;
-
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.persistent.ChangeListReader;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.persistent.ChangeListWriter;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.persistent.Journal;
-
-public class PersistentJournal implements Journal {
-
- private static ChangeListWriter WRITER;
- private static ChangeListReader READER;
- private static MessagePack msgpack;
- private static OutputStream out = null;
- private static InputStream in = null;
-
- public PersistentJournal() {
- msgpack = new MessagePack();
- }
-
- public PersistentJournal(File file) throws FileNotFoundException {
- out = new FileOutputStream(file);
- in = new FileInputStream(file);
- WRITER = new PersistentChangeListWriter(out);
- READER = new PersistentChangeListReader(in);
- msgpack = new MessagePack();
- }
-
- @Override
- public ChangeListReader getReader() {
- return READER;
- }
-
- @Override
- public ChangeListWriter getWriter() {
- return WRITER;
- }
-
- public void setOutputFile(File file) throws FileNotFoundException {
- out = new FileOutputStream(file);
- WRITER = new PersistentChangeListWriter(out);
- }
-
- public void setInputFile(File file) throws FileNotFoundException {
- in = new FileInputStream(file);
- READER = new PersistentChangeListReader(in);
- }
-
- public void close() throws IOException {
- out.close();
- in.close();
- }
-
- public void setOutputStream(OutputStream _out) {
- out = _out;
- }
-
- public OutputStream getOutputStream() {
- return out;
- }
-
- public void setInputStream(InputStream _in) {
- in = _in;
- }
-
- public InputStream getInputStream() {
- return in;
- }
-
- public static MessagePack getMessagePack() {
- return msgpack;
- }
-
-}
diff -r 03bf62bb699e -r f9e29a52efd3 src/alice/jungle/persistence/PersistentJungle.java
--- a/src/alice/jungle/persistence/PersistentJungle.java Mon Nov 25 18:13:03 2013 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-package alice.jungle.persistence;
-
-import java.util.Iterator;
-import java.util.concurrent.ConcurrentHashMap;
-
-import fj.data.List;
-
-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.persistent.ChangeList;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.ChangeSet;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.TreeEditor;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.operations.TreeOperation;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.transaction.DefaultTreeContext;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.transaction.DefaultTreeNode;
-
-public class PersistentJungle implements Jungle {
- private PersistentJournal journal;
- private ConcurrentHashMap trees;
- final private String uuid;
- private TreeEditor editor;
-
- public PersistentJungle(PersistentJournal _journal,String _uuid,TreeEditor _editor)
- {
- journal = _journal;
- trees = new ConcurrentHashMap();
- uuid = _uuid;
- editor = _editor;
- }
-
- @Override
- public JungleTree getTreeByName(String _name)
- {
- return trees.get(_name);
- }
-
- @Override
- public JungleTree createNewTree(final String _name)
- {
- ChangeList list = new ChangeList(){
- @Override
- public Iterator iterator() {
- List nil = List.nil();
- return nil.iterator();
- }
- @Override
- public String uuid() {
- return uuid;
- }
- @Override
- public String getTreeName() {
- return _name;
- }
- };
- DefaultTreeNode root = new DefaultTreeNode();
- ChangeSet set = new PersistentChangeSet(root.getAsNode(),null,list,uuid,_name,0);
- DefaultTreeContext tc = new DefaultTreeContext(root,set);
- JungleTree newTree = new PersistentJungleTree(_name, tc,uuid, journal.getWriter(),editor);
- if(trees.putIfAbsent(_name,newTree) != null){
- return null;
- }
- return newTree;
- }
-
-}
diff -r 03bf62bb699e -r f9e29a52efd3 src/alice/jungle/persistence/PersistentJungleTree.java
--- a/src/alice/jungle/persistence/PersistentJungleTree.java Mon Nov 25 18:13:03 2013 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-package alice.jungle.persistence;
-
-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.persistent.ChangeListWriter;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.ChangeSet;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.TreeEditor;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.TreeNode;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.transaction.AtomicReservableReference;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.transaction.DefaultJungleTreeEditor;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.transaction.TreeContext;
-
-public class PersistentJungleTree > implements JungleTree {
- private final AtomicReservableReference> repository;
- private final String uuid;
- private final String treeName;
- private final ChangeListWriter writer;
- private final TreeEditor editor;
-
- public PersistentJungleTree(String _treeName, TreeContext _tc,String _uuid, ChangeListWriter _writer,TreeEditor _editor)
- {
- treeName = _treeName;
- repository = new AtomicReservableReference>(_tc);
- uuid = _uuid;
- writer = _writer;
- editor = _editor;
- }
-
- @Override
- public JungleTreeEditor getTreeEditor()
- {
- TreeContext tc = repository.get();
- PersistentTransactionManager txManager = new PersistentTransactionManager(treeName, writer,tc,repository,uuid);
- T root = tc.getTreeNode();
- return new DefaultJungleTreeEditor(root,txManager,editor);
- }
-
- @Override
- public Node getRootNode()
- {
- TreeContext tc = repository.get();
- ChangeSet cs = tc.getChangeSet();
- return cs.getRoot();
- }
-
- @Override
- public JungleTreeEditor getLocalTreeEditor() {
- return getTreeEditor();
- }
-
-
-}
diff -r 03bf62bb699e -r f9e29a52efd3 src/alice/jungle/persistence/PersistentTransactionManager.java
--- a/src/alice/jungle/persistence/PersistentTransactionManager.java Mon Nov 25 18:13:03 2013 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-package alice.jungle.persistence;
-
-import java.util.Iterator;
-
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.core.Node;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.persistent.ChangeListWriter;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.persistent.Result;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.ChangeSet;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.TreeNode;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.logger.TreeOperationLog;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.transaction.AtomicReservableReference;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.transaction.DefaultTreeContext;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.transaction.TransactionManager;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.transaction.TreeContext;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.transaction.AtomicReservableReference.Reservation;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.DefaultEither;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.DefaultError;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Either;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Error;
-
-public class PersistentTransactionManager> implements TransactionManager {
- private final AtomicReservableReference> repository;
- private final TreeContext tip;
- private final ChangeListWriter writer;
- private final String uuid;
- private final String treeName;
-
- public PersistentTransactionManager(String _treeName, ChangeListWriter _writer,TreeContext _tip,
- AtomicReservableReference> _repository,String _uuid)
- {
- repository = _repository;
- tip = _tip;
- writer = _writer;
- uuid = _uuid;
- treeName = _treeName;
- }
-
- @Override
- public Either> commit(T _newRoot,final TreeOperationLog _log) {
- ChangeSet cs = tip.getChangeSet();
- long currentRevision = cs.revision();
- long nextRevision = currentRevision + 1;
-
- PersistentChangeList list = new PersistentChangeList(uuid, treeName, _log);
- Node root = _newRoot.getAsNode();
- PersistentChangeSet newCs = new PersistentChangeSet(root, cs, list, uuid, treeName, nextRevision);
- DefaultTreeContext newContext = new DefaultTreeContext(_newRoot,newCs);
-
- @SuppressWarnings("rawtypes")
- Reservation reservation = repository.makeReservation(tip, newContext);
- if(reservation == null) {
- return DefaultEither.newA((Error)new DefaultError());
- }
- Result r = writer.write(list);
- if(r != Result.SUCCESS) {
- return DefaultEither.newA((Error)new DefaultError());
- }
- reservation.confirm();
- TransactionManager txManager = new PersistentTransactionManager(treeName, writer, newContext, repository, uuid);
- return DefaultEither.newB(txManager);
- }
-
- @Override
- public long getRevision()
- {
- ChangeSet cs = tip.getChangeSet();
- return cs.revision();
- }
-
- @Override
- public String getUUID() {
- return uuid;
- }
-
-
-
-}
diff -r 03bf62bb699e -r f9e29a52efd3 src/alice/jungle/remote/RemoteConfig.java
--- a/src/alice/jungle/remote/RemoteConfig.java Mon Nov 25 18:13:03 2013 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-package alice.jungle.remote;
-import alice.topology.node.TopologyNodeConfig;
-
-
-public class RemoteConfig extends TopologyNodeConfig {
-
- public int bbsPort = 8080;
-
- public RemoteConfig(String[] args) {
- super(args);
- for (int i = 0; i< args.length; i++) {
- if ("-bbsPort".equals(args[i])) {
- bbsPort = Integer.parseInt(args[++i]);
- } else if("-bp".equals(args[i])) {
- bbsPort = Integer.parseInt(args[++i]);
- }
- }
- }
-}
diff -r 03bf62bb699e -r f9e29a52efd3 src/alice/jungle/transaction/NetworkDefaultJungleTree.java
--- a/src/alice/jungle/transaction/NetworkDefaultJungleTree.java Mon Nov 25 18:13:03 2013 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-package alice.jungle.transaction;
-
-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.persistent.ChangeListWriter;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.ChangeSet;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.TreeEditor;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.TreeNode;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.transaction.AtomicReservableReference;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.transaction.TreeContext;
-
-public class NetworkDefaultJungleTree> implements JungleTree {
- private final AtomicReservableReference> repository;
- private final String uuid;
- private final String treeName;
- private final ChangeListWriter writer;
- private final TreeEditor editor;
-
- public NetworkDefaultJungleTree(String _treeName, TreeContext _tc,String _uuid,ChangeListWriter _writer,TreeEditor _editor)
- {
- treeName = _treeName;
- repository = new AtomicReservableReference>(_tc);
- uuid = _uuid;
- writer = _writer;
- editor = _editor;
- }
-
- @Override
- public JungleTreeEditor getTreeEditor()
- {
- TreeContext tc = repository.get();
- NetworkTransactionManager txManager = new NetworkTransactionManager(treeName, writer,tc,repository,uuid);
- T root = tc.getTreeNode();
- return new NetworkDefaultJungleTreeEditor(treeName, root,txManager,editor);
- }
-
- @Override
- public JungleTreeEditor getLocalTreeEditor()
- {
- TreeContext tc = repository.get();
- NetworkTransactionManager txManager = new NetworkTransactionManager(treeName, writer,tc,repository,uuid);
- T root = tc.getTreeNode();
- return NetworkDefaultJungleTreeEditor.NewLocalJungleTreeEditor(treeName,root,txManager, editor);
- }
-
- @Override
- public Node getRootNode()
- {
- TreeContext tc = repository.get();
- ChangeSet cs = tc.getChangeSet();
- return cs.getRoot();
- }
-
-
-}
diff -r 03bf62bb699e -r f9e29a52efd3 src/alice/jungle/transaction/NetworkDefaultJungleTreeEditor.java
--- a/src/alice/jungle/transaction/NetworkDefaultJungleTreeEditor.java Mon Nov 25 18:13:03 2013 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,194 +0,0 @@
-package alice.jungle.transaction;
-
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-
-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;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.NodePath;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.TreeEditor;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.TreeNode;
-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.LoggingNodeHook;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.logger.OperationLog;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.logger.TreeOperationLog;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.operations.DefaultTreeOperation;
-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.store.trasnformer.AppendChildAt;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.trasnformer.DeleteAttribute;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.trasnformer.DeleteChildAt;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.trasnformer.NodeEditor;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.trasnformer.PutAttribute;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.transaction.TransactionManager;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.DefaultEither;
-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.NullCodeSegment;
-
-public class NetworkDefaultJungleTreeEditor> implements JungleTreeEditor {
-
- private final TransactionManager txManager;
- private final T root;
- private final TreeEditor editor;
- private final String treeName;
- private final TreeOperationLog log;
- private boolean exportLog;
-
- public NetworkDefaultJungleTreeEditor(String _treeName, T _root,TransactionManager _txManager,TreeEditor _editor)
- {
- this(_treeName, _root,_txManager,_editor,new DefaultTreeOperationLog());
- }
-
- public NetworkDefaultJungleTreeEditor(String _treeName, T _root,TransactionManager _txManager,TreeEditor _editor, TreeOperationLog _log)
- {
- treeName = _treeName;
- root = _root;
- txManager = _txManager;
- editor = _editor;
- log = _log;
- exportLog = true;
- }
-
- public static > NetworkDefaultJungleTreeEditor NewLocalJungleTreeEditor(String _treeName, T1 _root,TransactionManager _txManager,TreeEditor _editor) {
- NetworkDefaultJungleTreeEditor treeEditor = new NetworkDefaultJungleTreeEditor(_treeName, _root,_txManager,_editor,new DefaultTreeOperationLog());
- treeEditor.exportLog = false;
- return treeEditor;
- }
-
- public static > NetworkDefaultJungleTreeEditor NewLocalJungleTreeEditor(String _treeName, T1 _root,TransactionManager _txManager,TreeEditor _editor, TreeOperationLog _log) {
- NetworkDefaultJungleTreeEditor treeEditor = new NetworkDefaultJungleTreeEditor(_treeName, _root,_txManager,_editor,_log);
- treeEditor.exportLog = false;
- return treeEditor;
- }
-
- private Either _edit(final NodePath _path,NodeEditor _e)
- {
- LoggingNodeHook hook = new LoggingNodeHook(_e);
- Either either = editor.edit(root,_path,hook);
- if(either.isA()){
- return DefaultEither.newA(either.a());
- }
-
- T newNode = either.b();
- OperationLog newLog = hook.getLog();
-
- IterableConverter.Converter converter = new IterableConverter.Converter(){
- @Override
- public TreeOperation conv(NodeOperation _b){
- return new DefaultTreeOperation(_path,_b);
- }
- };
-
- Iterable iterable = new IterableConverter(newLog,converter);
- DefaultTreeOperationLog treeOperationLog = new DefaultTreeOperationLog(iterable,newLog.length());
- TreeOperationLog newTreeOpLog = log.append(treeOperationLog);
-
- JungleTreeEditor newEditor;
- if(exportLog) {
- newEditor = new NetworkDefaultJungleTreeEditor(treeName, newNode,txManager,editor,newTreeOpLog);
- } else {
- newEditor = NetworkDefaultJungleTreeEditor.NewLocalJungleTreeEditor(treeName, newNode, txManager, editor, newTreeOpLog);
- }
- return DefaultEither.newB(newEditor);
- }
-
- @Override
- public Either addNewChildAt(NodePath _path, int _pos)
- {
- AppendChildAt appendChildAt = new AppendChildAt(_pos);
- return _edit(_path,appendChildAt);
- }
-
- @Override
- public Either deleteChildAt(NodePath _path, int _pos)
- {
- DeleteChildAt deleteChildAt = new DeleteChildAt(_pos);
- return _edit(_path,deleteChildAt);
- }
-
- @Override
- public Either putAttribute(NodePath _path,String _key,ByteBuffer _value)
- {
- PutAttribute putAttribute = new PutAttribute(_key,_value);
- return _edit(_path,putAttribute);
- }
-
- @Override
- public Either deleteAttribute(NodePath _path, String _key)
- {
- DeleteAttribute deleteAttribute = new DeleteAttribute(_key);
- return _edit(_path,deleteAttribute);
- }
-
- @Override
- public Either edit(NodePath _path,NodeEditor _editor)
- {
- return _edit(_path,_editor);
- }
-
- @Override
- public Either success()
- {
- Either> either = txManager.commit(root,log);
- 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);
-
- return DefaultEither.newB(newTreeEditor);
- }
-
- @Override
- public String getID()
- {
- return txManager.getUUID();
- }
-
- @Override
- public String getRevision()
- {
- return Long.toString(txManager.getRevision());
- }
-
- @Override
- public Node getRoot()
- {
- return root.getAsNode();
- }
-
- public String getTreeName() {
- return treeName;
- }
-
- public TreeOperationLog getTreeOperationLog() {
- return log;
- }
-
- public void putTreeOperationLog(Iterable newLog) throws IOException {
- String uuid = getID();
- String treeName = getTreeName();
- String updaterName = getID();
- String revision = getRevision();
- putDataSegment(uuid, treeName, updaterName, newLog, revision);
- }
-
- public void putDataSegment(String _uuid, String _treeName, String _updaterName, Iterable newLog, String nextRevision) throws IOException {
- NetworkTreeOperationLog netLog = new NetworkTreeOperationLog(_uuid, _treeName,newLog);
- NullCodeSegment cs = new NullCodeSegment();
- cs.ods.put("log", netLog);
- cs.execute(); /* Do nothing CodeSegment */
- }
-}
diff -r 03bf62bb699e -r f9e29a52efd3 src/alice/jungle/transaction/NetworkTransactionManager.java
--- a/src/alice/jungle/transaction/NetworkTransactionManager.java Mon Nov 25 18:13:03 2013 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,94 +0,0 @@
-package alice.jungle.transaction;
-
-import java.util.Iterator;
-
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.core.Node;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.persistent.ChangeList;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.persistent.ChangeListWriter;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.persistent.Result;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.ChangeSet;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.TreeNode;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.logger.TreeOperationLog;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.operations.TreeOperation;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.transaction.AtomicReservableReference;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.transaction.AtomicReservableReference.Reservation;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.transaction.DefaultChangeSet;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.transaction.DefaultTreeContext;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.transaction.TransactionManager;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.transaction.TreeContext;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.DefaultEither;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.DefaultError;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Either;
-import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Error;
-
-public class NetworkTransactionManager> implements TransactionManager
-{
-
- private final AtomicReservableReference> repository;
- private final TreeContext tip;
- private final ChangeListWriter writer;
- private final String uuid;
- private final String treeName;
-
- public NetworkTransactionManager(String _treeName, ChangeListWriter _writer,TreeContext _tip,
- AtomicReservableReference> _repository,String _uuid)
- {
- repository = _repository;
- tip = _tip;
- writer = _writer;
- uuid = _uuid;
- treeName = _treeName;
- }
-
- @Override
- public Either> commit(T _newRoot,final TreeOperationLog _log) {
- ChangeSet cs = tip.getChangeSet();
- long currentRevision = cs.revision();
- long nextRevision = currentRevision + 1;
-
- ChangeList list = new ChangeList() {
- @Override
- public Iterator iterator(){
- return _log.iterator();
- }
- @Override
- public String uuid() {
- return uuid;
- }
- @Override
- public String getTreeName() {
- return treeName;
- }
- };
-
- Node root = _newRoot.getAsNode();
- DefaultChangeSet newCs = new DefaultChangeSet(root, cs, list, uuid, treeName, nextRevision);
- DefaultTreeContext newContext = new DefaultTreeContext(_newRoot,newCs);
-
- @SuppressWarnings("rawtypes")
- Reservation reservation = repository.makeReservation(tip, newContext);
- if(reservation == null) {
- return DefaultEither.newA((Error)new DefaultError());
- }
- Result r = writer.write(list);
- if(r != Result.SUCCESS) {
- return DefaultEither.newA((Error)new DefaultError());
- }
- reservation.confirm();
- TransactionManager txManager = new NetworkTransactionManager(treeName, writer, newContext, repository, uuid);
- return DefaultEither.newB(txManager);
- }
-
- @Override
- public long getRevision()
- {
- ChangeSet cs = tip.getChangeSet();
- return cs.revision();
- }
-
- @Override
- public String getUUID() {
- return uuid;
- }
-
-}
diff -r 03bf62bb699e -r f9e29a52efd3 src/jungle/app/bbs/BoardMessage.java
--- a/src/jungle/app/bbs/BoardMessage.java Mon Nov 25 18:13:03 2013 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-package jungle.app.bbs;
-
-public interface BoardMessage
-{
- public String getUUID();
- public String getAuthor();
- public String getMessage();
-}
diff -r 03bf62bb699e -r f9e29a52efd3 src/jungle/app/bbs/BulletinBoard.java
--- a/src/jungle/app/bbs/BulletinBoard.java Mon Nov 25 18:13:03 2013 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-package jungle.app.bbs;
-
-public interface BulletinBoard
-{
- public Iterable getBoards();
- public void createBoards(String _name,String _author,String _initMessage,String _editKey);
- public void createBoardMessage(String _board,String _author,String _message,String _editKey);
- public void editMessage(String _board,String _uuid,String _author,String _message,String _editKey);
-
- public Iterable getMessages(String _boardName);
-}
diff -r 03bf62bb699e -r f9e29a52efd3 src/jungle/app/bbs/CassandraBulletinBoard.java
--- a/src/jungle/app/bbs/CassandraBulletinBoard.java Mon Nov 25 18:13:03 2013 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,192 +0,0 @@
-package jungle.app.bbs;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.UUID;
-
-import org.apache.cassandra.locator.SimpleStrategy;
-
-import me.prettyprint.cassandra.serializers.StringSerializer;
-import me.prettyprint.cassandra.serializers.UUIDSerializer;
-import me.prettyprint.cassandra.service.CassandraHost;
-import me.prettyprint.cassandra.service.template.SuperCfResult;
-import me.prettyprint.cassandra.service.template.SuperCfUpdater;
-import me.prettyprint.cassandra.service.template.ThriftSuperCfTemplate;
-import me.prettyprint.cassandra.utils.TimeUUIDUtils;
-import me.prettyprint.hector.api.Cluster;
-import me.prettyprint.hector.api.Keyspace;
-import me.prettyprint.hector.api.beans.HSuperColumn;
-import me.prettyprint.hector.api.beans.OrderedSuperRows;
-import me.prettyprint.hector.api.beans.SuperRow;
-import me.prettyprint.hector.api.beans.SuperSlice;
-import me.prettyprint.hector.api.ddl.ColumnFamilyDefinition;
-import me.prettyprint.hector.api.ddl.ColumnType;
-import me.prettyprint.hector.api.ddl.ComparatorType;
-import me.prettyprint.hector.api.ddl.KeyspaceDefinition;
-import me.prettyprint.hector.api.factory.HFactory;
-import me.prettyprint.hector.api.query.QueryResult;
-import me.prettyprint.hector.api.query.RangeSuperSlicesQuery;
-import me.prettyprint.hector.api.query.SuperSliceQuery;
-
-public class CassandraBulletinBoard implements BulletinBoard
-{
- private final String address;
- private final String clusterName;
- private final Cluster cluster;
- private final String keyspace;
-
- private static final String COLUMN_FAMILY_BOARD = "boards";
-
- public CassandraBulletinBoard(String _clusterName,String _address,String _keyspaceName)
- {
- address = _address;
- clusterName = _clusterName;
- keyspace = _keyspaceName;
- cluster = HFactory.getOrCreateCluster(clusterName,address);
-
- initialize();
- }
-
- private void initialize()
- {
- if(cluster.describeKeyspace(keyspace) == null){
- KeyspaceDefinition keyspaceDefinition = HFactory.createKeyspaceDefinition(keyspace,
- SimpleStrategy.class.getName(),1,Collections. emptyList());
- cluster.addKeyspace(keyspaceDefinition,false);
- ColumnFamilyDefinition columnFamilyDefinition = HFactory.createColumnFamilyDefinition(keyspace,COLUMN_FAMILY_BOARD,ComparatorType.UUIDTYPE);
- columnFamilyDefinition.setColumnType(ColumnType.SUPER);
- cluster.addColumnFamily(columnFamilyDefinition);
- }
- }
-
- public Iterable getBoards()
- {
- Keyspace ksp = HFactory.createKeyspace(keyspace, cluster);
- RangeSuperSlicesQuery query = HFactory.createRangeSuperSlicesQuery(ksp,StringSerializer.get(),
- UUIDSerializer.get(),StringSerializer.get(),StringSerializer.get());
- query.setColumnFamily(COLUMN_FAMILY_BOARD).setKeys(null,null).setRange(null,null,false,0);
-
- QueryResult> result = query.execute();
- OrderedSuperRows rows = result.get();
- List> list = rows.getList();
-
- IterableConverter.Converter> converter
- = new IterableConverter.Converter>(){
- public String conv(SuperRow _b) {
- return _b.getKey();
- }
- };
-
- return new IterableConverter>(list,converter);
- }
-
- private static final String COLUMN_MESSAGE_AUTHOR = "author";
- private static final String COLUMN_MESSAGE_BODY = "message";
- private static final String COLUMN_MESSAGE_EDIT_KEY = "edit";
-
- public void createBoardMessage(UUID _time,String _name,String _author,String _message,String _editKey)
- {
- Keyspace ksp = HFactory.createKeyspace(keyspace,cluster);
- ThriftSuperCfTemplate template =
- new ThriftSuperCfTemplate(ksp,COLUMN_FAMILY_BOARD,StringSerializer.get(),
- UUIDSerializer.get(),StringSerializer.get());
-
- SuperCfUpdater updater = template.createUpdater(_name,_time);
- updater.setString(COLUMN_MESSAGE_AUTHOR,_author);
- updater.setString(COLUMN_MESSAGE_BODY,_message);
- updater.setString(COLUMN_MESSAGE_EDIT_KEY,_editKey);
-
- template.update(updater);
- }
-
- public void createBoards(String _name,String _author,String _initMessage,String _editKey)
- {
- UUID time = TimeUUIDUtils.getTimeUUID(0);
- createBoardMessage(time,_name,_author,_initMessage,_editKey);
- }
-
- public Iterable getMessages(String _boardName)
- {
- Keyspace ksp = HFactory.createKeyspace(keyspace,cluster);
- SuperSliceQuery query = HFactory.createSuperSliceQuery(ksp, StringSerializer.get(), UUIDSerializer.get(), StringSerializer.get(), StringSerializer.get());
-
- UUID start = TimeUUIDUtils.getTimeUUID(0);
- query.setKey(_boardName).setColumnFamily(COLUMN_FAMILY_BOARD).setRange(start,null,false,100);
-
- QueryResult> result = query.execute();
- SuperSlice ss = result.get();
- List> list = ss.getSuperColumns();
-
- IterableConverter.Converter> converter =
- new IterableConverter.Converter>(){
- public BoardMessage conv(HSuperColumn _b){
- UUID uuid = _b.getName();
- String author = _b.getSubColumnByName(COLUMN_MESSAGE_AUTHOR).getValue();
- String message = _b.getSubColumnByName(COLUMN_MESSAGE_BODY).getValue();
- BoardMessageImpl bm = new BoardMessageImpl(author,message,uuid.toString());
- return bm;
- }
- };
-
-
- return new IterableConverter>(list,converter);
- }
-
- private static class BoardMessageImpl implements BoardMessage
- {
- private final String author;
- private final String message;
- private final String uuid;
-
- public BoardMessageImpl(String _author,String _message,String _uuid)
- {
- author = _author;
- message = _message;
- uuid = _uuid;
- }
-
- public String getAuthor()
- {
- return author;
- }
-
- public String getMessage()
- {
- return message;
- }
-
- public String getUUID()
- {
- return uuid;
- }
- }
-
- public void createBoardMessage(String _board, String _author, String _message,String _editKey)
- {
- UUID time = TimeUUIDUtils.getUniqueTimeUUIDinMillis();
- createBoardMessage(time,_board,_author,_message,_editKey);
- }
-
- public void editMessage(String _board,String _uuid,String _author,String _message,String _editKey)
- {
- Keyspace ksp = HFactory.createKeyspace(keyspace, cluster);
- UUID time = UUID.fromString(_uuid);
- ThriftSuperCfTemplate template =
- new ThriftSuperCfTemplate(ksp,COLUMN_FAMILY_BOARD,StringSerializer.get(),
- UUIDSerializer.get(),StringSerializer.get());
-
- SuperCfResult result = template.querySuperColumn(_board,time);
- String editKey = result.getString(COLUMN_MESSAGE_EDIT_KEY);
- if(!editKey.equals(editKey)){
- return;
- }
-
- SuperCfUpdater updater = template.createUpdater(_board,time);
- updater.setString(COLUMN_MESSAGE_AUTHOR,_author);
- updater.setString(COLUMN_MESSAGE_BODY,_message);
- updater.setString(COLUMN_MESSAGE_EDIT_KEY,_editKey);
-
- template.update(updater);
- }
-
-}
diff -r 03bf62bb699e -r f9e29a52efd3 src/jungle/app/bbs/CreateBoardMessageServlet.java
--- a/src/jungle/app/bbs/CreateBoardMessageServlet.java Mon Nov 25 18:13:03 2013 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-package jungle.app.bbs;
-
-import java.io.PrintWriter;
-
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-public class CreateBoardMessageServlet extends HttpServlet
-{
- private final BulletinBoard bbs;
- private static final String PARAM_BOARD_NAME = "bname";
- private static final String PARAM_BOARD_AUTHOR = "author";
- private static final String PARAM_BOARD_MESSAGE= "msg";
- private static final String PARAM_BOARD_EDITKEY = "key";
-
- private static final long serialVersionUID = 1L;
-
- public CreateBoardMessageServlet(BulletinBoard _bbs)
- {
- bbs = _bbs;
- }
-
- @Override
- public void doPost(HttpServletRequest _req,HttpServletResponse _res)
- {
- String boardName = _req.getParameter(PARAM_BOARD_NAME);
- String author = _req.getParameter(PARAM_BOARD_AUTHOR);
- String msg = _req.getParameter(PARAM_BOARD_MESSAGE);
- String key = _req.getParameter(PARAM_BOARD_EDITKEY);
-
- try{
- bbs.createBoardMessage(boardName,author,msg,key);
- PrintWriter pw = _res.getWriter();
- pw.write("successfully written");
- }catch(Exception _e){
- _res.setStatus(500);
- }
- }
-}
diff -r 03bf62bb699e -r f9e29a52efd3 src/jungle/app/bbs/CreateBoardServlet.java
--- a/src/jungle/app/bbs/CreateBoardServlet.java Mon Nov 25 18:13:03 2013 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-package jungle.app.bbs;
-
-import java.io.PrintWriter;
-
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-public class CreateBoardServlet extends HttpServlet
-{
- private final BulletinBoard bbs;
- private static final String PARAM_BOARD_NAME = "bname";
- private static final String PARAM_BOARD_AUTHOR = "author";
- private static final String PARAM_BOARD_INITMESSAGE= "msg";
- private static final String PARAM_BOARD_EDITKEY = "key";
-
- private static final long serialVersionUID = 1L;
-
- public CreateBoardServlet(BulletinBoard _bbs)
- {
- bbs = _bbs;
- }
-
- public void doPost(HttpServletRequest _req,HttpServletResponse _res)
- {
- String boardName = _req.getParameter(PARAM_BOARD_NAME);
- String author = _req.getParameter(PARAM_BOARD_AUTHOR);
- String msg = _req.getParameter(PARAM_BOARD_INITMESSAGE);
- String key = _req.getParameter(PARAM_BOARD_EDITKEY);
-
- try{
- bbs.createBoards(boardName,author,msg,key);
- PrintWriter pw = _res.getWriter();
- pw.write("successfully written");
- }catch(Exception _e){
- _res.setStatus(500);
- }
- }
-}
diff -r 03bf62bb699e -r f9e29a52efd3 src/jungle/app/bbs/DistributeApp.java
--- a/src/jungle/app/bbs/DistributeApp.java Mon Nov 25 18:13:03 2013 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-package jungle.app.bbs;
-
-
-import jungle.app.bbs.codesegment.StartBBSCodeSegment;
-
-
-import alice.jungle.remote.RemoteConfig;
-import alice.topology.node.TopologyNode;
-
-
-public class DistributeApp
-{
- public static void main( String[] args ) throws Exception
- {
- RemoteConfig conf = new RemoteConfig(args);
- new TopologyNode(conf, new StartBBSCodeSegment(conf.bbsPort));
- }
-}
diff -r 03bf62bb699e -r f9e29a52efd3 src/jungle/app/bbs/EditMessageServlet.java
--- a/src/jungle/app/bbs/EditMessageServlet.java Mon Nov 25 18:13:03 2013 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-package jungle.app.bbs;
-
-import java.io.PrintWriter;
-
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-public class EditMessageServlet extends HttpServlet
-{
- private final BulletinBoard bbs;
- private static final String PARAM_BOARD_NAME = "bname";
- private static final String PARAM_BOARD_MSGID = "uuid";
- private static final String PARAM_BOARD_AUTHOR = "author";
- private static final String PARAM_BOARD_MESSAGE= "msg";
- private static final String PARAM_BOARD_EDITKEY = "key";
-
- private static final long serialVersionUID = 1L;
-
- public EditMessageServlet(BulletinBoard _bbs)
- {
- bbs = _bbs;
- }
-
- public void doGet(HttpServletRequest _req,HttpServletResponse _res)
- {
- String bname = _req.getParameter(PARAM_BOARD_NAME);
- String uuid = _req.getParameter(PARAM_BOARD_MSGID);
-
-
- try{
- PrintWriter pw = _res.getWriter();
- pw.write("edit message
");
- pw.write("