# HG changeset patch # User one # Date 1372678289 -32400 # Node ID 8593c2525aa7c2792e432fc5b7c6515b9424aa47 # Parent 16ea4835f36ea2ade905ce36173d555bb5db5d1e add NeworkTransactionManager diff -r 16ea4835f36e -r 8593c2525aa7 src/jungle/test/codesegment/persistence/AliceJournal.java --- a/src/jungle/test/codesegment/persistence/AliceJournal.java Mon Jul 01 19:36:17 2013 +0900 +++ b/src/jungle/test/codesegment/persistence/AliceJournal.java Mon Jul 01 20:31:29 2013 +0900 @@ -32,14 +32,11 @@ @Override public Result write(ChangeList _operations) { - - /* +/* for(TreeOperation op : _operations){ DefaultTreeOperationContainer container = new DefaultTreeOperationContainer(); container.unconvert(op); - cs.ods.update("local", "op", op); - } */ diff -r 16ea4835f36e -r 8593c2525aa7 src/jungle/test/core/practice/LogReadCodeSegment.java --- a/src/jungle/test/core/practice/LogReadCodeSegment.java Mon Jul 01 19:36:17 2013 +0900 +++ b/src/jungle/test/core/practice/LogReadCodeSegment.java Mon Jul 01 20:31:29 2013 +0900 @@ -9,13 +9,13 @@ 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.logger.DefaultTreeOperationLog; +import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.logger.TreeOperationLog; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.operations.NodeOperation; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.operations.TreeOperation; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Either; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Error; import jungle.test.codesegment.operation.JungleManager; import jungle.test.datasegment.store.operations.DefaultTreeOperationLogContainer; -import jungle.test.transaction.NetworkDefaultJungleTreeEditor; import alice.codesegment.CodeSegment; import alice.datasegment.CommandType; import alice.datasegment.Receiver; @@ -38,25 +38,33 @@ } catch (IOException e) { e.printStackTrace(); } - JungleManager jm = new JungleManager(); - Jungle jungle = jm.getJungle(); + Jungle jungle = new JungleManager().getJungle(); JungleTree tree = jungle.getTreeByName("tree"); JungleTreeEditor editor = tree.getTreeEditor(); + Either either = edit(editor, log); + if (either.isA()) { + throw new IllegalStateException(); + } + editor = either.b(); + editor.success(); + new PrintChildrenAttribute("key1"); + ods.update("key1", "key1"); + } + + private Either edit(JungleTreeEditor _editor ,TreeOperationLog _log) { + JungleTreeEditor editor = _editor; Either either = null; - for (TreeOperation op : log) { - either = edit(editor, op); + for (TreeOperation op : _log) { + either = _edit(editor, op); if(either.isA()) { - throw new IllegalStateException(); + return either; } editor = either.b(); } - editor.success(); - new PrintChildrenAttribute("key1"); - ods.update("key1", "key1"); - + return either; } - public Either edit(JungleTreeEditor editor, + private Either _edit(JungleTreeEditor editor, TreeOperation op) { NodePath path = op.getNodePath(); NodeOperation nodeOp = op.getNodeOperation(); diff -r 16ea4835f36e -r 8593c2525aa7 src/jungle/test/transaction/NetworkTransactionManager.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jungle/test/transaction/NetworkTransactionManager.java Mon Jul 01 20:31:29 2013 +0900 @@ -0,0 +1,87 @@ +package jungle.test.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(ChangeListWriter _writer,TreeContext _tip, + AtomicReservableReference> _repository,String _uuid, String _treeName) + { + 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(); + } + }; + + Node root = _newRoot.getAsNode(); + DefaultChangeSet newCs = new DefaultChangeSet(root, cs, list, uuid, 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){ + reservation.confirm(); + TransactionManager txManager = new NetworkTransactionManager(writer, newContext, repository, uuid, treeName); + return DefaultEither.newB(txManager); + } + + return DefaultEither.newA((Error)new DefaultError()); + } + + @Override + public long getRevision() + { + ChangeSet cs = tip.getChangeSet(); + return cs.revision(); + } + + @Override + public String getUUID() { + return uuid; + } + +}