changeset 53:f47a02368099

implemented timestamp in DefaultTreeOperationLogContainer
author one
date Sun, 14 Jul 2013 16:13:37 +0900
parents 61b2de3f7730
children 3d78d438f97b
files src/alice/jungle/datasegment/store/operations/DefaultTreeOperationLogContainer.java src/jungle/test/bbs/codesegment/ChildLogCheckCodeSegment.java src/jungle/test/bbs/codesegment/StartBBSCodeSegment.java src/jungle/test/codesegment/persistence/AliceJournal.java
diffstat 4 files changed, 19 insertions(+), 66 deletions(-) [+]
line wrap: on
line diff
--- a/src/alice/jungle/datasegment/store/operations/DefaultTreeOperationLogContainer.java	Sat Jul 13 17:10:14 2013 +0900
+++ b/src/alice/jungle/datasegment/store/operations/DefaultTreeOperationLogContainer.java	Sun Jul 14 16:13:37 2013 +0900
@@ -2,6 +2,7 @@
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
+import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -25,75 +26,19 @@
 public class DefaultTreeOperationLogContainer {
 
 	Value logValue;
-	String treeName = "";
-	String uuid = "";
-	String updaterName = "";
-	String revision = "";
-	
-	public static void main(String[] args) throws IOException {
-		String key = "hoge";
-		ByteBuffer b = ByteBuffer.wrap("messagepack value".getBytes());
-		PutAttributeOperation putOp = new PutAttributeOperation(key, b);
-		DefaultNodePath nodePath = new DefaultNodePath();
-		nodePath = nodePath.add(1).add(2).add(3);
-		TreeOperation op = new DefaultTreeOperation(nodePath, putOp);
-		List<TreeOperation> list = new LinkedList<TreeOperation>();
-		list.add(op);
-		list.add(op);
-		list.add(op);
-		DefaultTreeOperationLog log = new DefaultTreeOperationLog(list, list.size());
-		
-		DefaultTreeOperationLogContainer logContainer = new DefaultTreeOperationLogContainer();
-		logContainer.unconvert(log);
-		logContainer.setUUID("uuid");
-		logContainer.setTreeName("treeName");
+	String treeName;
+	String uuid;
+	String updaterName;
+	String revision;
+	long timestamp;
 
-		MessagePack msgpack = new MessagePack();
-		Value logContainerValue = msgpack.unconvert(logContainer);
-		DefaultTreeOperationLogContainer convertedLogContainer = msgpack.convert(logContainerValue,
-																	DefaultTreeOperationLogContainer.class);
-		
-		TreeOperationLog convertedLog = convertedLogContainer.convert();
-		System.out.println("uuid = "+ convertedLogContainer.getUUID());
-		System.out.println("treeName = "+ convertedLogContainer.getTreeName());
-		for (TreeOperation treeOp : convertedLog) {
-			NodePath path = treeOp.getNodePath();
-			NodeOperation nodeOp = treeOp.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, path, str));
-			for (int i: path ) {
-				System.out.println(i);
-			}
-			
-		}
-	}
-	
 	public DefaultTreeOperationLogContainer() {
 		logValue = null;
 		treeName = "";
 		uuid = "";
+		updaterName = "";
+		revision = "";
+		timestamp = new Date().getTime();
 	}
 	
 	public void setTreeName(String _treeName) {
@@ -127,6 +72,14 @@
 	public String getRevision() {
 		return revision;
 	}
+
+	public void setTimeStamp(long t) {
+		timestamp = t;
+	}
+	
+	public long getTimeStamp() {
+		return timestamp;
+	}
 	
 	public void unconvert(Iterable<TreeOperation> _log) throws IOException {
 		MessagePack msgpack = new MessagePack();
--- a/src/jungle/test/bbs/codesegment/ChildLogCheckCodeSegment.java	Sat Jul 13 17:10:14 2013 +0900
+++ b/src/jungle/test/bbs/codesegment/ChildLogCheckCodeSegment.java	Sun Jul 14 16:13:37 2013 +0900
@@ -57,7 +57,6 @@
 		HashSetDataSegment ds = hashLog.asClass(HashSetDataSegment.class);
 		ds.hash.add(container.getHashLogString());
 		ods.update("hashLog", ds);
-		System.out.println("ods.put log container");
 		ods.put("log", container);
 		new ChildLogCheckCodeSegment();
 		if(!hostName.equals("node0")) {
--- a/src/jungle/test/bbs/codesegment/StartBBSCodeSegment.java	Sat Jul 13 17:10:14 2013 +0900
+++ b/src/jungle/test/bbs/codesegment/StartBBSCodeSegment.java	Sun Jul 14 16:13:37 2013 +0900
@@ -9,7 +9,6 @@
 import jungle.test.bbs.CreateBoardMessageServlet;
 import jungle.test.bbs.CreateBoardServlet;
 import jungle.test.bbs.EditMessageServlet;
-import jungle.test.bbs.JungleManager;
 import jungle.test.bbs.NetworkJungleBulletinBoard;
 import jungle.test.bbs.ShowBoardMessageServlet;
 import jungle.test.bbs.ShowBoardsServlet;
--- a/src/jungle/test/codesegment/persistence/AliceJournal.java	Sat Jul 13 17:10:14 2013 +0900
+++ b/src/jungle/test/codesegment/persistence/AliceJournal.java	Sun Jul 14 16:13:37 2013 +0900
@@ -33,6 +33,7 @@
 		@Override
 		public Result write(ChangeList _operations)
 		{
+			/*
 			for(TreeOperation op : _operations){
 				NodePath p = op.getNodePath();
 				NodeOperation nodeOp = op.getNodeOperation();
@@ -60,6 +61,7 @@
 				}
 				System.out.println(String.format("[%s:%s:%s]",c,p,args));
 			}
+			*/
 			return Result.SUCCESS;
 		}
 	}