# HG changeset patch # User suruga # Date 1500455250 -32400 # Node ID 6e91ad317eb0406b1de5d10a9d71fe64ba831ecb # Parent d9a9154a075e512eb95c12fbc78e2028c85ff5b6 fix diff -r d9a9154a075e -r 6e91ad317eb0 src/main/java/jp/ac/u_ryukyu/ie/cr/bbs/browsing/App.java --- a/src/main/java/jp/ac/u_ryukyu/ie/cr/bbs/browsing/App.java Wed Jul 19 17:15:37 2017 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/bbs/browsing/App.java Wed Jul 19 18:07:30 2017 +0900 @@ -2,8 +2,7 @@ import jp.ac.u_ryukyu.ie.cr.jungle.DefaultJungle; import jp.ac.u_ryukyu.ie.cr.jungle.Jungle; -import jp.ac.u_ryukyu.ie.cr.jungle.store.impl.DefaultTreeEditor; -import jp.ac.u_ryukyu.ie.cr.jungle.traverser.DefaultTraverser; +import jp.ac.u_ryukyu.ie.cr.jungle.transaction.editor.treeEditor.DefaultTreeEditor; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.servlet.ServletHandler; import org.eclipse.jetty.servlet.ServletHolder; @@ -19,8 +18,7 @@ public static void main(String[] args) throws Exception { System.out.println("main"); - Jungle jungle = new DefaultJungle(null, "hoge", new DefaultTreeEditor( - new DefaultTraverser())); + Jungle jungle = new DefaultJungle(null, "hoge"); new App().startBBS(args, jungle); } diff -r d9a9154a075e -r 6e91ad317eb0 src/main/java/jp/ac/u_ryukyu/ie/cr/bbs/browsing/FindNodeservlet.java --- a/src/main/java/jp/ac/u_ryukyu/ie/cr/bbs/browsing/FindNodeservlet.java Wed Jul 19 17:15:37 2017 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/bbs/browsing/FindNodeservlet.java Wed Jul 19 18:07:30 2017 +0900 @@ -1,9 +1,12 @@ package jp.ac.u_ryukyu.ie.cr.bbs.browsing; +import jp.ac.u_ryukyu.ie.cr.jungle.transaction.node.TreeNode; + import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.PrintWriter; +import java.util.Iterator; public class FindNodeServlet extends HttpServlet { diff -r d9a9154a075e -r 6e91ad317eb0 src/main/java/jp/ac/u_ryukyu/ie/cr/bbs/browsing/JungleBrowsingBulletinBoard.java --- a/src/main/java/jp/ac/u_ryukyu/ie/cr/bbs/browsing/JungleBrowsingBulletinBoard.java Wed Jul 19 17:15:37 2017 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/bbs/browsing/JungleBrowsingBulletinBoard.java Wed Jul 19 18:07:30 2017 +0900 @@ -1,22 +1,22 @@ package jp.ac.u_ryukyu.ie.cr.bbs.browsing; - import jp.ac.u_ryukyu.ie.cr.jungle.DefaultJungle; import jp.ac.u_ryukyu.ie.cr.jungle.Jungle; -import jp.ac.u_ryukyu.ie.cr.jungle.JungleTree; -import jp.ac.u_ryukyu.ie.cr.jungle.JungleTreeEditor; import jp.ac.u_ryukyu.ie.cr.jungle.core.Children; -import jp.ac.u_ryukyu.ie.cr.jungle.store.NodePath; +import jp.ac.u_ryukyu.ie.cr.jungle.query.traverser.InterfaceTraverser; import jp.ac.u_ryukyu.ie.cr.jungle.store.NulIterator; -import jp.ac.u_ryukyu.ie.cr.jungle.store.impl.DefaultNodePath; -import jp.ac.u_ryukyu.ie.cr.jungle.store.impl.DefaultTreeEditor; -import jp.ac.u_ryukyu.ie.cr.jungle.store.impl.TreeNode; -import jp.ac.u_ryukyu.ie.cr.jungle.store.impl.TreeNodeChildren; -import jp.ac.u_ryukyu.ie.cr.jungle.transaction.DefaultTreeNode; +import jp.ac.u_ryukyu.ie.cr.jungle.store.nodepath.DefaultNodePath; +import jp.ac.u_ryukyu.ie.cr.jungle.store.nodepath.NodePath; +import jp.ac.u_ryukyu.ie.cr.jungle.transaction.editor.jungleTreeEditor.JungleTreeEditor; +import jp.ac.u_ryukyu.ie.cr.jungle.transaction.editor.treeEditor.DefaultTreeEditor; +import jp.ac.u_ryukyu.ie.cr.jungle.transaction.node.Default.DefaultTreeNode; +import jp.ac.u_ryukyu.ie.cr.jungle.transaction.node.TreeNode; +import jp.ac.u_ryukyu.ie.cr.jungle.transaction.node.TreeNodeChildren; import jp.ac.u_ryukyu.ie.cr.jungle.traverser.DefaultTraverser; -import jp.ac.u_ryukyu.ie.cr.jungle.traverser.InterfaceTraverser; +import jp.ac.u_ryukyu.ie.cr.jungle.tree.JungleTree; import jp.ac.u_ryukyu.ie.cr.jungle.util.Either; -import jp.ac.u_ryukyu.ie.cr.jungle.util.Error; +import jp.ac.u_ryukyu.ie.cr.jungle.util.jungleError.Error; + import java.nio.ByteBuffer; import java.util.Iterator; @@ -25,8 +25,7 @@ private final Jungle jungle; public JungleBrowsingBulletinBoard() { - jungle = new DefaultJungle(null, "hoge", new DefaultTreeEditor( - new DefaultTraverser())); + jungle = new DefaultJungle(null, "hoge"); jungle.createNewTree("boards"); } @@ -52,14 +51,14 @@ } public void createBoards(final String _name) { - createBoards(_name, new DefaultTreeNode()); + createBoards(_name,new DefaultTreeNode()); } - public void createBoards(final String _name, TreeNode rootNode) { + public void createBoards(final String _name, TreeNode rootNode) { if (null == jungle.createNewTree(_name, rootNode)) { throw new IllegalStateException(); } JungleTree tree = jungle.getTreeByName("boards"); - JungleTreeEditor editor = tree.getTreeEditor(); + JungleTreeEditor editor = tree.getJungleTreeEditor(); DefaultNodePath root = new DefaultNodePath(); Either either = editor.addNewChildAt(root, 0); if (either.isA()) { @@ -78,7 +77,7 @@ } tree = jungle.getTreeByName(_name); - editor = tree.getTreeEditor(); + editor = tree.getJungleTreeEditor(); either = editor.putAttribute(root, "NodeName", ByteBuffer.wrap("root".getBytes())); if (either.isA()) { throw new IllegalStateException(); @@ -99,7 +98,7 @@ JungleTreeEditor editor; do { - editor = tree.getTreeEditor(); + editor = tree.getJungleTreeEditor(); Either either = editor.putAttribute(path, key, ByteBuffer.wrap(attribute.getBytes())); if (either.isA()) { throw new IllegalStateException(); @@ -123,7 +122,7 @@ JungleTreeEditor editor; do { - editor = tree.getTreeEditor(); + editor = tree.getJungleTreeEditor(); Either either = editor.addNewChildAt(path, childCount); if (either.isA()) { throw new IllegalStateException(); @@ -147,7 +146,7 @@ do { JungleTree tree = jungle.getTreeByName(bname); - editor = tree.getTreeEditor(); + editor = tree.getJungleTreeEditor(); Either either = editor.putAttribute(path, key, ByteBuffer.wrap(attribute.getBytes())); @@ -214,7 +213,7 @@ int childNum = Integer.parseInt(childNumString); JungleTree tree = jungle.getTreeByName(bname); DefaultNodePath path = createNodePath(pathString); - JungleTreeEditor editor = tree.getTreeEditor(); + JungleTreeEditor editor = tree.getJungleTreeEditor(); editor = editor.moveChild(path,childNum,move).b(); return editor.success().isB(); } diff -r d9a9154a075e -r 6e91ad317eb0 src/main/java/jp/ac/u_ryukyu/ie/cr/bbs/browsing/ShowBoardMessageServlet.java --- a/src/main/java/jp/ac/u_ryukyu/ie/cr/bbs/browsing/ShowBoardMessageServlet.java Wed Jul 19 17:15:37 2017 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/bbs/browsing/ShowBoardMessageServlet.java Wed Jul 19 18:07:30 2017 +0900 @@ -1,8 +1,7 @@ package jp.ac.u_ryukyu.ie.cr.bbs.browsing; - -import jp.ac.u_ryukyu.ie.cr.jungle.store.impl.TreeNode; -import jp.ac.u_ryukyu.ie.cr.jungle.store.impl.TreeNodeAttributes; +import jp.ac.u_ryukyu.ie.cr.jungle.transaction.node.TreeNode; +import jp.ac.u_ryukyu.ie.cr.jungle.transaction.node.TreeNodeAttributes; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; @@ -69,7 +68,7 @@ _pw.write("

\n"); _pw.write("

Children

\n"); - Iterator children = bbs.getChildren(bname, path); + Iterator children = bbs.getChildren(bname, path); for (int childCount = 0; children.hasNext(); childCount++) { TreeNode child = children.next(); TreeNodeAttributes attribute = child.getAttributes(); diff -r d9a9154a075e -r 6e91ad317eb0 src/main/java/jp/ac/u_ryukyu/ie/cr/bbs/local/App.java --- a/src/main/java/jp/ac/u_ryukyu/ie/cr/bbs/local/App.java Wed Jul 19 17:15:37 2017 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,75 +0,0 @@ -package jp.ac.u_ryukyu.ie.cr.bbs.local; - -import me.prettyprint.hector.api.HConsistencyLevel; -import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.servlet.ServletHandler; -import org.eclipse.jetty.servlet.ServletHolder; - -import javax.servlet.Servlet; - - -/** - * Hello world! - * - */ -public class App -{ - public static void main( String[] args ) throws Exception - { - BulletinBoard cassaBBS = null; - if(args.length == 0){ - cassaBBS = new JungleBulletinBoard(); - }else{ - HConsistencyLevel cLevel = HConsistencyLevel.QUORUM; - int rep_factor = 1; - int i=0; - while(i either = editor.addNewChildAt(root, 0); if (either.isA()) { @@ -67,7 +64,7 @@ } tree = jungle.getTreeByName(_name); - editor = tree.getTreeEditor(); + editor = tree.getJungleTreeEditor(); editor = editor.putAttribute(root,"author", ByteBuffer.wrap(_author.getBytes())).b(); editor = editor.putAttribute(root,"key", ByteBuffer.wrap(_editKey.getBytes())).b(); either = editor.putAttribute(root,"mes", ByteBuffer.wrap(_initMessage.getBytes())); @@ -92,7 +89,7 @@ int size = node.getChildren().size(); DefaultNodePath path = new DefaultNodePath(); - editor = tree.getTreeEditor(); + editor = tree.getJungleTreeEditor(); Either either = editor.addNewChildAt(path, size); if (either.isA()) { @@ -118,7 +115,7 @@ path = path.add(Integer.parseInt(_uuid)); JungleTree tree = jungle.getTreeByName(_board); - editor = tree.getTreeEditor(); + editor = tree.getJungleTreeEditor(); editor = editor.putAttribute(path,"author", ByteBuffer.wrap(_author.getBytes())).b(); editor = editor.putAttribute(path,"key", ByteBuffer.wrap(_editKey.getBytes())).b(); diff -r d9a9154a075e -r 6e91ad317eb0 src/main/java/jp/ac/u_ryukyu/ie/cr/bbs/network/BulletinBoardJungleManager.java --- a/src/main/java/jp/ac/u_ryukyu/ie/cr/bbs/network/BulletinBoardJungleManager.java Wed Jul 19 17:15:37 2017 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/bbs/network/BulletinBoardJungleManager.java Wed Jul 19 18:07:30 2017 +0900 @@ -3,14 +3,12 @@ import jp.ac.u_ryukyu.ie.cr.jungle.DefaultJungle; import jp.ac.u_ryukyu.ie.cr.jungle.Jungle; -import jp.ac.u_ryukyu.ie.cr.jungle.JungleTree; -import jp.ac.u_ryukyu.ie.cr.jungle.JungleTreeEditor; -import jp.ac.u_ryukyu.ie.cr.jungle.store.impl.DefaultNodePath; -import jp.ac.u_ryukyu.ie.cr.jungle.store.impl.DefaultTreeEditor; -import jp.ac.u_ryukyu.ie.cr.jungle.store.impl.TreeNode; -import jp.ac.u_ryukyu.ie.cr.jungle.traverser.DefaultTraverser; +import jp.ac.u_ryukyu.ie.cr.jungle.store.nodepath.DefaultNodePath; +import jp.ac.u_ryukyu.ie.cr.jungle.transaction.editor.jungleTreeEditor.JungleTreeEditor; +import jp.ac.u_ryukyu.ie.cr.jungle.transaction.node.TreeNode; +import jp.ac.u_ryukyu.ie.cr.jungle.tree.JungleTree; import jp.ac.u_ryukyu.ie.cr.jungle.util.Either; -import jp.ac.u_ryukyu.ie.cr.jungle.util.Error; +import jp.ac.u_ryukyu.ie.cr.jungle.util.jungleError.Error; import jp.ac.u_ryukyu.ie.cr.jungleNetwork.operations.NetworkTreeOperationLog; import jp.ac.u_ryukyu.ie.cr.jungleNetwork.transaction.JungleUpdater; @@ -23,7 +21,7 @@ private static AtomicInteger requestCounter = new AtomicInteger(0); private BulletinBoardJungleManager() { - jungle = new DefaultJungle(null,"default",new DefaultTreeEditor(new DefaultTraverser())); + jungle = new DefaultJungle(null,"default"); } public static int requestGetAndIncrement() { @@ -69,7 +67,7 @@ DefaultNodePath root = new DefaultNodePath(); tBuffer.putLong(timestamp); do { - JungleTreeEditor editor = tree.getLocalTreeEditor(); + JungleTreeEditor editor = tree.getJungleTreeEditor(); /* * Merge. */ diff -r d9a9154a075e -r 6e91ad317eb0 src/main/java/jp/ac/u_ryukyu/ie/cr/bbs/network/NetworkJungleBulletinBoard.java --- a/src/main/java/jp/ac/u_ryukyu/ie/cr/bbs/network/NetworkJungleBulletinBoard.java Wed Jul 19 17:15:37 2017 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/bbs/network/NetworkJungleBulletinBoard.java Wed Jul 19 18:07:30 2017 +0900 @@ -28,12 +28,12 @@ import jp.ac.u_ryukyu.ie.cr.jungleNetwork.persistent.NetworkJournal; import jp.ac.u_ryukyu.ie.cr.jungleNetwork.persistent.PersistentJournal; import jp.ac.u_ryukyu.ie.cr.jungleNetwork.transaction.JungleUpdater; -import junit.framework.Assert; import java.io.File; import java.io.IOException; import java.nio.ByteBuffer; import java.util.concurrent.atomic.AtomicInteger; +import static org.junit.Assert.*; public class NetworkJungleBulletinBoard implements NetworkBulletinBoard { protected final Jungle jungle; @@ -240,7 +240,7 @@ DefaultEvaluator evaluator = new DefaultEvaluator(path); Either ret = traverser.traverse(node, evaluator); if (ret.isA()) { - Assert.fail(); + assertEquals(1,0); } Traversal traversal = ret.b(); @@ -572,7 +572,7 @@ DefaultEvaluator evaluator = new DefaultEvaluator(path); Either ret = traverser.traverse(node, evaluator); if (ret.isA()) { - Assert.fail(); + assertEquals(1,0); } Traversal traversal = ret.b(); diff -r d9a9154a075e -r 6e91ad317eb0 src/main/java/jp/ac/u_ryukyu/ie/cr/bbs/network/codesegment/LogUpdateCodeSegment.java --- a/src/main/java/jp/ac/u_ryukyu/ie/cr/bbs/network/codesegment/LogUpdateCodeSegment.java Wed Jul 19 17:15:37 2017 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/bbs/network/codesegment/LogUpdateCodeSegment.java Wed Jul 19 18:07:30 2017 +0900 @@ -3,10 +3,10 @@ import alice.codesegment.CodeSegment; import alice.datasegment.CommandType; import alice.datasegment.Receiver; -import jp.ac.u_ryukyu.ie.cr.jungle.JungleTreeEditor; +import jp.ac.u_ryukyu.ie.cr.bbs.network.BulletinBoardJungleManager; +import jp.ac.u_ryukyu.ie.cr.jungle.transaction.editor.jungleTreeEditor.JungleTreeEditor; import jp.ac.u_ryukyu.ie.cr.jungle.util.Either; -import jp.ac.u_ryukyu.ie.cr.jungle.util.Error; -import jp.ac.u_ryukyu.ie.cr.bbs.network.BulletinBoardJungleManager; +import jp.ac.u_ryukyu.ie.cr.jungle.util.jungleError.Error; import jp.ac.u_ryukyu.ie.cr.jungleNetwork.operations.NetworkTreeOperationLog; import java.util.List;