Mercurial > hg > Members > tatsuki > bench > jungle-core
diff src/main/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/traverser/InterfaceTraverser.java @ 134:f46a6e0e4594
add deleteIndexEditor
author | one |
---|---|
date | Tue, 21 Oct 2014 19:47:25 +0900 |
parents | ba5370090393 |
children | 0f68cd7b2838 |
line wrap: on
line diff
--- a/src/main/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/traverser/InterfaceTraverser.java Sun Oct 19 18:34:58 2014 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/traverser/InterfaceTraverser.java Tue Oct 21 19:47:25 2014 +0900 @@ -21,41 +21,32 @@ import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Pair; import jp.ac.u_ryukyu.ie.cr.tatsuki.jungle.query.PathNodeIterator; import jp.ac.u_ryukyu.ie.cr.tatsuki.jungle.query.Query; +import jp.ac.u_ryukyu.ie.cr.tatsuki.jungle.store.index.IndexManager; public class InterfaceTraverser { //InterfaceTraverser traverser; TreeNode node; TreeMap<String, TreeMap<String, List<Pair<TreeNode, NodePath>>>> index; - AtomicReservableReference<TreeContext>.Reservation reservation; + IndexManager indexManager; - public InterfaceTraverser(TreeNode _root, AtomicReservableReference<TreeContext>.Reservation reservation) { + public InterfaceTraverser(TreeNode _root, IndexManager indexManager) { this.node = _root; this.index = TreeMap.empty(Ord.stringOrd); - this.reservation = reservation; + this.indexManager = indexManager; } public InterfaceTraverser( TreeNode _root, TreeMap<String, TreeMap<String, List<Pair<TreeNode, NodePath>>>> index, - AtomicReservableReference<TreeContext>.Reservation reservation) { + IndexManager indexManager) { this.node = _root; this.index = index; - this.reservation = reservation; + this.indexManager = indexManager; } public void commitIndex(){ - TreeContext tc = reservation.get(); - ChangeSet cs = tc.getChangeSet(); - TreeNode root = cs.getRoot(); - ChangeSet prev = cs.prev(); - ChangeList cl = cs.getChangeList(); - String uuid = cs.uuid(); - String treeName = cs.getTreeName(); - long revision = cs.revision(); - ChangeSet newCs = new DefaultChangeSet(root, prev,cl, uuid, treeName, revision, index); - TreeContext newTc = new DefaultTreeContext(root, newCs); - reservation.set(newTc); + indexManager.commit(index); } public TreeMap<String, TreeMap<String, List<Pair<TreeNode, NodePath>>>> getIndex() { @@ -80,7 +71,7 @@ - public Iterator<Pair<TreeNode, NodePath>> find(final Query query, String key, String searchValue) { + public Iterator<Pair<TreeNode, NodePath>> find(Query query, String key, String searchValue) { if (index.get(key).isSome()) { @@ -107,7 +98,6 @@ Pair<TreeNode, NodePath> pathNode = itNode.next(); String value = pathNode.left().getAttributes().getString(key); Option<TreeMap<String, List<Pair<TreeNode, NodePath>>>> innerIndexOp = index.get(key); - System.out.println("value = "+ value); if (value != null) { if (innerIndexOp.isNone()) {