# HG changeset patch # User one # Date 1416087648 -32400 # Node ID 0854f9a9e81db5db639f02a126ebabf1d004b98e # Parent afbe19c98f533a0d92f48c5c13e47280c6c813b3 change attrs form TreeMap →　TreeMap> diff -r afbe19c98f53 -r 0854f9a9e81d src/main/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/core/App.java --- a/src/main/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/core/App.java Sat Nov 15 17:48:07 2014 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/core/App.java Sun Nov 16 06:40:48 2014 +0900 @@ -2,6 +2,7 @@ import java.nio.ByteBuffer; +import fj.data.List; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.DefaultJungle; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.JungleTree; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.JungleTreeEditor; @@ -35,7 +36,8 @@ TreeNode root = tree.getRootNode(); - ByteBuffer v = root.getAttributes().get(key); + List valueList = root.getAttributes().get(key); + ByteBuffer v = valueList.head(); String str = new String(v.array()); System.out.println(str); } diff -r afbe19c98f53 -r 0854f9a9e81d src/main/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/core/Attributes.java --- a/src/main/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/core/Attributes.java Sat Nov 15 17:48:07 2014 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/core/Attributes.java Sun Nov 16 06:40:48 2014 +0900 @@ -1,9 +1,12 @@ package jp.ac.u_ryukyu.ie.cr.shoshi.jungle.core; import java.nio.ByteBuffer; +import java.util.Iterator; + +import fj.data.List; public interface Attributes { - public ByteBuffer get(String key); - public String getString(String key); + public List get(String key); + public Iterator getString(String key); } diff -r afbe19c98f53 -r 0854f9a9e81d src/main/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/store/impl/TreeNodeAttributes.java --- a/src/main/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/store/impl/TreeNodeAttributes.java Sat Nov 15 17:48:07 2014 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/store/impl/TreeNodeAttributes.java Sun Nov 16 06:40:48 2014 +0900 @@ -12,6 +12,6 @@ { public Either delete(String key); public Either put(String key,ByteBuffer value); - public TreeMap getAttributesAsRawMap(); + public TreeMap> getAttributesAsRawMap(); public List getKeys(); } diff -r afbe19c98f53 -r 0854f9a9e81d src/main/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/store/impl/logger/LoggingAttributes.java --- a/src/main/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/store/impl/logger/LoggingAttributes.java Sat Nov 15 17:48:07 2014 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/store/impl/logger/LoggingAttributes.java Sun Nov 16 06:40:48 2014 +0900 @@ -2,6 +2,7 @@ import java.nio.ByteBuffer; +import fj.data.List; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.TreeNode; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.TreeNodeAttributes; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.operations.DeleteAttributeOperation; @@ -22,7 +23,7 @@ log = _log; } - public ByteBuffer get(String _key) + public List get(String _key) { TreeNodeAttributes attributes = wrap.getAttributes(); return attributes.get(_key); diff -r afbe19c98f53 -r 0854f9a9e81d src/main/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/transaction/DefaultTreeNode.java --- a/src/main/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/transaction/DefaultTreeNode.java Sat Nov 15 17:48:07 2014 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/transaction/DefaultTreeNode.java Sun Nov 16 06:40:48 2014 +0900 @@ -12,18 +12,18 @@ { //private final DefaultNode wrap; private List children; - private TreeMap attrs; + private TreeMap> attrs; private OperationLog log; private static final List NIL_LIST = List.nil(); - private static final TreeMap NIL_MAP = TreeMap.empty(Ord.stringOrd); + private static final TreeMap> NIL_MAP = TreeMap.empty(Ord.stringOrd); public DefaultTreeNode() { this(NIL_LIST,NIL_MAP); } - public DefaultTreeNode(List _children,TreeMap _attrs) + public DefaultTreeNode(List _children,TreeMap> _attrs) { attrs = _attrs; children = _children; diff -r afbe19c98f53 -r 0854f9a9e81d src/main/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/transaction/DefaultTreeNodeAttribute.java --- a/src/main/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/transaction/DefaultTreeNodeAttribute.java Sat Nov 15 17:48:07 2014 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/transaction/DefaultTreeNodeAttribute.java Sun Nov 16 06:40:48 2014 +0900 @@ -1,10 +1,12 @@ package jp.ac.u_ryukyu.ie.cr.shoshi.jungle.transaction; import java.nio.ByteBuffer; +import java.util.Iterator; import fj.data.List; import fj.data.Option; import fj.data.TreeMap; +import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.NulIterator; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.TreeNode; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.TreeNodeAttributes; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.logger.DefaultOperationLog; @@ -16,80 +18,105 @@ import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Either; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Error; -public class DefaultTreeNodeAttribute implements TreeNodeAttributes -{ - public List children; - public TreeMap attrs; - OperationLog log ; - - public DefaultTreeNodeAttribute(List _children,TreeMap _attrs) - { - children = _children; - attrs = _attrs; - log = new DefaultOperationLog(); - } - - public DefaultTreeNodeAttribute(List _children,TreeMap _attrs,OperationLog _log) - { - children = _children; - attrs = _attrs; - log = _log; - } +public class DefaultTreeNodeAttribute implements TreeNodeAttributes { + public List children; + public TreeMap> attrs; + OperationLog log; + + public DefaultTreeNodeAttribute(List _children, TreeMap> _attrs) { + children = _children; + attrs = _attrs; + log = new DefaultOperationLog(); + } - @Override - public TreeMap getAttributesAsRawMap(){ - return attrs; - } - - @Override - public Either delete(String _key) - { - if (_key == null) { - return DefaultEither.newA(NodeEditorError.NULL_VALUE_NOT_ALLOWED); - } - - if (!attrs.contains(_key)) { - return DefaultEither.newA(NodeEditorError.DELETE_KEY_NOT_FOUND); - } - - TreeMap newMap = attrs.delete(_key); - TreeNode newNode = new DefaultTreeNode(children,newMap); - return DefaultEither.newB(newNode); - } + public DefaultTreeNodeAttribute(List _children, TreeMap> _attrs, OperationLog _log) { + children = _children; + attrs = _attrs; + log = _log; + } - @Override - public Either put(String _key, ByteBuffer _value) - { - if (_key == null || _value == null) { - return DefaultEither.newA(NodeEditorError.NULL_VALUE_NOT_ALLOWED); - } - - TreeMap newMap = attrs.set(_key,_value); - TreeNode newNode = new DefaultTreeNode(children,newMap); - return DefaultEither.newB(newNode); - } + @Override + public TreeMap> getAttributesAsRawMap() { + return attrs; + } - @Override - public ByteBuffer get(String _key) - { - if (_key == null) { - return null; - } - - Option result = attrs.get(_key); - return result.isSome() ? result.some() : null; - } + @Override + public Either delete(String _key) { + if (_key == null) { + return DefaultEither.newA(NodeEditorError.NULL_VALUE_NOT_ALLOWED); + } - @Override - public String getString(String key) { - ByteBuffer attribute = get(key); - if (attribute != null) - return new String(attribute.array()); - return null; + if (!attrs.contains(_key)) { + return DefaultEither.newA(NodeEditorError.DELETE_KEY_NOT_FOUND); } - @Override - public List getKeys() { - return attrs.keys(); + TreeMap> newMap = attrs.delete(_key); + TreeNode newNode = new DefaultTreeNode(children, newMap); + return DefaultEither.newB(newNode); + } + + @Override + public Either put(String _key, ByteBuffer _value) { + if (_key == null || _value == null) { + return DefaultEither.newA(NodeEditorError.NULL_VALUE_NOT_ALLOWED); + } + Option> attrsListOp = attrs.get(_key); + + List newAttrsList; + if (attrsListOp.isNone()) { + List attrsList = List.nil(); + newAttrsList = attrsList.cons(_value); + } else { + List attrsList = attrsListOp.some(); + newAttrsList = attrsList.cons(_value); + } + + TreeMap> newMap = attrs.set(_key, newAttrsList); + TreeNode newNode = new DefaultTreeNode(children, newMap); + return DefaultEither.newB(newNode); + } + + @Override + public List get(String _key) { + if (_key == null) { + return List.nil(); } + + Option> result = attrs.get(_key); + return result.isSome() ? result.some() : List.nil(); + } + + @Override + public Iterator getString(String key) { + List attributeList = get(key); + if (attributeList == null) + return new NulIterator<>(); + + return new Iterator() { + + List iteratorAttributeList = attributeList; + ByteBuffer attribute; + + @Override + public boolean hasNext() { + if (!iteratorAttributeList.isEmpty()) { + attribute = iteratorAttributeList.head(); + iteratorAttributeList = iteratorAttributeList.tail(); + return true; + } + return false; + } + + @Override + public String next() { + return new String(attribute.array()); + } + + }; + } + + @Override + public List getKeys() { + return attrs.keys(); + } } diff -r afbe19c98f53 -r 0854f9a9e81d src/main/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/transaction/DefaultTreeNodeChildren.java --- a/src/main/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/transaction/DefaultTreeNodeChildren.java Sat Nov 15 17:48:07 2014 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/transaction/DefaultTreeNodeChildren.java Sun Nov 16 06:40:48 2014 +0900 @@ -8,11 +8,6 @@ import fj.data.TreeMap; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.TreeNode; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.TreeNodeChildren; -import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.logger.DefaultOperationLog; -import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.logger.OperationLog; -import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.operations.AppendChildAtOperation; -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.trasnformer.NodeEditorError; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.DefaultEither; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Either; @@ -30,9 +25,9 @@ } public List children; - public TreeMap attrs; + public TreeMap> attrs; - public DefaultTreeNodeChildren(List _children,TreeMap _attrs) + public DefaultTreeNodeChildren(List _children,TreeMap> _attrs) { children = _children; attrs = _attrs; @@ -112,7 +107,7 @@ @Override public Either at(int _pos) { - if(!boundaryCheck(_pos)){ + if(!boundaryCheck(_pos + 1)){ return DefaultEither.newA(NodeEditorError.INDEX_OUT_OF_BOUNDS); } diff -r afbe19c98f53 -r 0854f9a9e81d src/main/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/traverser/InterfaceTraverser.java --- a/src/main/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/traverser/InterfaceTraverser.java Sat Nov 15 17:48:07 2014 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/traverser/InterfaceTraverser.java Sun Nov 16 06:40:48 2014 +0900 @@ -292,10 +292,11 @@ for (; itNode.hasNext();) { Pair pathNode = itNode.next(); - String value = pathNode.left().getAttributes().getString(key); + Iterator valueIterator = pathNode.left().getAttributes().getString(key); Option>> innerIndexOp = index.get(key); - if (value != null) { + for (;valueIterator.hasNext();) { + String value = valueIterator.next(); if (innerIndexOp.isNone()) { TreeMap> innerIndex = TreeMap.empty(Ord.stringOrd); @@ -405,10 +406,11 @@ for (; itNode.hasNext();) { Pair pathNode = itNode.next(); - String value = pathNode.left().getAttributes().getString(key); + Iterator valueIterator = pathNode.left().getAttributes().getString(key); Option>> innerIndexOp = index.get(key); - if (value != null) { + for (;valueIterator.hasNext();) { + String value = valueIterator.next(); if (innerIndexOp.isNone()) { TreeMap> innerIndex = TreeMap.empty(Ord.stringOrd); diff -r afbe19c98f53 -r 0854f9a9e81d src/main/java/jp/ac/u_ryukyu/ie/cr/tatsuki/jungle/store/index/DeleteIndexEditor.java --- a/src/main/java/jp/ac/u_ryukyu/ie/cr/tatsuki/jungle/store/index/DeleteIndexEditor.java Sat Nov 15 17:48:07 2014 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/tatsuki/jungle/store/index/DeleteIndexEditor.java Sun Nov 16 06:40:48 2014 +0900 @@ -1,6 +1,7 @@ package jp.ac.u_ryukyu.ie.cr.tatsuki.jungle.store.index; import java.nio.ByteBuffer; +import java.util.Iterator; import fj.data.List; import fj.data.Option; @@ -35,8 +36,12 @@ public Either edit(TreeNode root,TransactionManager txManager,TreeEditor editor,TreeOperationLog log,TreeMap>> index) { NodePath newPath = path.pop().right(); TreeNode target = getTarget(node, newPath); - String attribute = target.getAttributes().getString(key); - TreeMap>> newIndex = editIndex(attribute, index); + TreeMap>> newIndex = index; + Iterator attributeIterator = target.getAttributes().getString(key); + for (;attributeIterator.hasNext();){ + String attribute = attributeIterator.next(); + newIndex = editIndex(attribute, newIndex); + } IndexJungleTreeEditor newEditor = new IndexJungleTreeEditor(root,txManager,editor,log, newIndex); Either either = DefaultEither.newB(newEditor); return either; diff -r afbe19c98f53 -r 0854f9a9e81d src/test/java/DefaultJungleTreeTest.java --- a/src/test/java/DefaultJungleTreeTest.java Sat Nov 15 17:48:07 2014 +0900 +++ b/src/test/java/DefaultJungleTreeTest.java Sun Nov 16 06:40:48 2014 +0900 @@ -1,5 +1,6 @@ import java.nio.ByteBuffer; +import fj.data.List; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.DefaultJungle; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.Jungle; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.JungleTree; @@ -45,7 +46,8 @@ // check the value ; TreeNode node = tree.getRootNode(); - ByteBuffer v = node.getAttributes().get(key); + List valueList = node.getAttributes().get(key); + ByteBuffer v = valueList.head(); Assert.assertEquals(0,v.compareTo(value)); Assert.assertEquals(1,tree.revision()); // editor2 must fail transction diff -r afbe19c98f53 -r 0854f9a9e81d src/test/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/core/AttributesTest.java --- a/src/test/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/core/AttributesTest.java Sat Nov 15 17:48:07 2014 +0900 +++ b/src/test/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/core/AttributesTest.java Sun Nov 16 06:40:48 2014 +0900 @@ -12,10 +12,10 @@ public abstract class AttributesTest extends TestCase { @SuppressWarnings("unchecked") - public static List> ENTRIES = List.list( - P.p("KEY1",ByteBuffer.wrap("VALUE1".getBytes())), - P.p("KEY2",ByteBuffer.wrap("VALUE2".getBytes())), - P.p("KEY3",ByteBuffer.wrap("VALUE3".getBytes())) + public static List>> ENTRIES = List.list( + P.p("KEY1",List.list(ByteBuffer.wrap("VALUE1".getBytes()))), + P.p("KEY2",List.list(ByteBuffer.wrap("VALUE2".getBytes()))), + P.p("KEY3",List.list(ByteBuffer.wrap("VALUE3".getBytes()))) ); public abstract Attributes instance(); @@ -24,10 +24,12 @@ { Attributes attrs = instance(); - for(P2 entry : ENTRIES){ + for(P2> entry : ENTRIES){ String key = entry._1(); - ByteBuffer expect = entry._2(); - ByteBuffer actual = attrs.get(key); + List expectList = entry._2(); + List actualList = attrs.get(key); + ByteBuffer expect = expectList.head(); + ByteBuffer actual = actualList.head(); Assert.assertNotNull(actual); Assert.assertEquals(0,actual.compareTo(expect)); } diff -r afbe19c98f53 -r 0854f9a9e81d src/test/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/core/GetOldTreeTest.java --- a/src/test/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/core/GetOldTreeTest.java Sat Nov 15 17:48:07 2014 +0900 +++ b/src/test/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/core/GetOldTreeTest.java Sun Nov 16 06:40:48 2014 +0900 @@ -1,6 +1,7 @@ package jp.ac.u_ryukyu.ie.cr.shoshi.jungle.core; import java.nio.ByteBuffer; +import java.util.Iterator; import org.junit.Test; @@ -28,8 +29,7 @@ for (int num = 0; num < 10; num++) { JungleTreeEditor addChildEditor = editor.addNewChildAt(path, num).b(); - JungleTreeEditor putAttributeEditor = addChildEditor.putAttribute(path.add(num), "test", - ByteBuffer.wrap("tatsuki".getBytes())).b(); + JungleTreeEditor putAttributeEditor = addChildEditor.putAttribute(path.add(num), "test", ByteBuffer.wrap("tatsuki".getBytes())).b(); Either successEither = putAttributeEditor.success(); Assert.assertFalse(successEither.isA()); editor = successEither.b(); @@ -43,16 +43,22 @@ Either childNodeEither = root.getChildren().at(9); Assert.assertTrue(childNodeEither.isB()); TreeNode child = childNodeEither.b(); - Assert.assertEquals(child.getAttributes().getString("test"),"kanagawa"); - long t1 = System.currentTimeMillis(); + Iterator valueIterator = child.getAttributes().getString("test"); + Assert.assertTrue(valueIterator.hasNext()); + String value = valueIterator.next(); + Assert.assertEquals(value,"kanagawa"); + JungleTree oldTree1 = tree.getOldTree(10).b(); - long t2 = System.currentTimeMillis(); - System.out.println("time = " + (t2 - t1)); + TreeNode oldRoot1 = oldTree1.getRootNode(); Either oldChildNodeEither = oldRoot1.getChildren().at(9); Assert.assertTrue(oldChildNodeEither.isB()); + TreeNode oldChildNode = oldChildNodeEither.b(); - Assert.assertEquals(oldChildNode.getAttributes().getString("test"),"tatsuki"); + Iterator oldValueIterator = oldChildNode.getAttributes().getString("test"); + Assert.assertTrue(oldValueIterator.hasNext()); + String oldValue = oldValueIterator.next(); + Assert.assertEquals(oldValue,"tatsuki"); JungleTree oldTree2 = tree.getOldTree(9).b(); diff -r afbe19c98f53 -r 0854f9a9e81d src/test/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/core/impl/treeeditor/DefaultTreeEditorTest.java --- a/src/test/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/core/impl/treeeditor/DefaultTreeEditorTest.java Sat Nov 15 17:48:07 2014 +0900 +++ b/src/test/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/core/impl/treeeditor/DefaultTreeEditorTest.java Sun Nov 16 06:40:48 2014 +0900 @@ -1,7 +1,9 @@ package jp.ac.u_ryukyu.ie.cr.shoshi.jungle.core.impl.treeeditor; import java.nio.ByteBuffer; +import java.util.Iterator; +import fj.data.List; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.DefaultNodePath; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.DefaultTreeEditor; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.TreeNode; @@ -53,15 +55,16 @@ DefaultTraverser traverser = new DefaultTraverser(); for(DefaultNodePath part : path.inits()){ + System.out.println(part.toString()); Either either = traverser.traverse(newRoot,new DefaultEvaluator(part)); if(either.isA()){ Assert.fail(); } TreeNode target = either.b().destination(); String expected = part.toString(); - String actual = new String(target.getAttributes().get(key).array()); - - Assert.assertEquals(expected,actual); + Iterator actualIterator = target.getAttributes().getString(key); + Assert.assertTrue(actualIterator.hasNext()); + Assert.assertEquals(expected,actualIterator.next()); } for(DefaultNodePath part : path.inits()){ @@ -70,9 +73,9 @@ Assert.fail(); } TreeNode target = either.b().destination(); - ByteBuffer actual = target.getAttributes().get(key); - - Assert.assertNull(actual); + System.out.println(part.toString()); + List actualList = target.getAttributes().get(key); + Assert.assertTrue(actualList.isEmpty()); } } diff -r afbe19c98f53 -r 0854f9a9e81d src/test/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/core/nodeeditor/DeleteAttributeAtTest.java --- a/src/test/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/core/nodeeditor/DeleteAttributeAtTest.java Sat Nov 15 17:48:07 2014 +0900 +++ b/src/test/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/core/nodeeditor/DeleteAttributeAtTest.java Sun Nov 16 06:40:48 2014 +0900 @@ -2,6 +2,7 @@ import java.nio.ByteBuffer; +import fj.data.List; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.TreeNode; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.logger.LoggingNode; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.trasnformer.DeleteAttribute; @@ -31,7 +32,7 @@ Assert.fail(); } LoggingNode newNode = either2.b(); - ByteBuffer ret = newNode.getAttributes().get(key); - Assert.assertNull(ret); + List retList = newNode.getAttributes().get(key); + Assert.assertTrue(retList.isEmpty()); } } diff -r afbe19c98f53 -r 0854f9a9e81d src/test/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/core/nodeeditor/PutAttributeTest.java --- a/src/test/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/core/nodeeditor/PutAttributeTest.java Sat Nov 15 17:48:07 2014 +0900 +++ b/src/test/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/core/nodeeditor/PutAttributeTest.java Sun Nov 16 06:40:48 2014 +0900 @@ -4,6 +4,7 @@ import org.junit.Assert; +import fj.data.List; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.TreeNode; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.logger.LoggingNode; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.trasnformer.PutAttribute; @@ -27,7 +28,8 @@ } LoggingNode newNode = either.b(); - ByteBuffer ret = newNode.getAttributes().get(key); + List retList = newNode.getAttributes().get(key); + ByteBuffer ret = retList.head(); Assert.assertEquals(0,ret.compareTo(value)); } } diff -r afbe19c98f53 -r 0854f9a9e81d src/test/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/impl/clonable/DefaultTreeNodeAttributesTest.java --- a/src/test/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/impl/clonable/DefaultTreeNodeAttributesTest.java Sat Nov 15 17:48:07 2014 +0900 +++ b/src/test/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/impl/clonable/DefaultTreeNodeAttributesTest.java Sun Nov 16 06:40:48 2014 +0900 @@ -10,7 +10,6 @@ import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.core.AttributesTest; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.TreeNode; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.transaction.DefaultTreeNode; -import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.transaction.DefaultTreeNodeAttribute; import junit.framework.TestCase; import junit.framework.TestSuite; @@ -27,9 +26,9 @@ public static DefaultTreeNode instance() { List rawList = List.nil(); - TreeMap rawMap = TreeMap.empty(Ord.stringOrd); + TreeMap> rawMap = TreeMap.empty(Ord.stringOrd); - for(P2 entry : AttributesTest.ENTRIES){ + for(P2> entry : AttributesTest.ENTRIES){ rawMap = rawMap.set(entry._1(),entry._2()); } diff -r afbe19c98f53 -r 0854f9a9e81d src/test/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/impl/node/DefaultAttributesTest.java --- a/src/test/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/impl/node/DefaultAttributesTest.java Sat Nov 15 17:48:07 2014 +0900 +++ b/src/test/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/impl/node/DefaultAttributesTest.java Sun Nov 16 06:40:48 2014 +0900 @@ -19,11 +19,11 @@ public TreeNodeAttributes instance() { List rawList = List.nil(); - TreeMap rawMap = TreeMap.empty(Ord.stringOrd); + TreeMap> rawMap = TreeMap.empty(Ord.stringOrd); // add attributes - for(P2 entry : ENTRIES){ + for(P2> entry : ENTRIES){ rawMap = rawMap.set(entry._1(),entry._2()); } @@ -34,22 +34,22 @@ public void testGetAttributesAsRawMap() { TreeNodeAttributes attrs = instance(); - TreeMap rawMap = attrs.getAttributesAsRawMap(); + TreeMap> rawMap = attrs.getAttributesAsRawMap(); // testing rawmap is not null. Assert.assertNotNull(rawMap); // testing rawmap has correct key values. - for(P2 entry : ENTRIES){ + for(P2> entry : ENTRIES){ String key = entry._1(); - ByteBuffer value = entry._2(); + ByteBuffer value = entry._2().head(); - Option option = rawMap.get(key); + Option> option = rawMap.get(key); if(option.isNone()){ Assert.fail(); } - ByteBuffer actual = option.some(); + ByteBuffer actual = option.some().head(); Assert.assertEquals(0,actual.compareTo(value)); } } diff -r afbe19c98f53 -r 0854f9a9e81d src/test/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/impl/node/DefaultChildrenTest.java --- a/src/test/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/impl/node/DefaultChildrenTest.java Sat Nov 15 17:48:07 2014 +0900 +++ b/src/test/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/impl/node/DefaultChildrenTest.java Sun Nov 16 06:40:48 2014 +0900 @@ -23,7 +23,7 @@ rawList = rawList.cons(new DefaultTreeNode()); } - TreeMap rawMap = TreeMap.empty(Ord.stringOrd); + TreeMap> rawMap = TreeMap.empty(Ord.stringOrd); return new DefaultTreeNode(rawList,rawMap).getChildren(); } diff -r afbe19c98f53 -r 0854f9a9e81d src/test/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/impl/node/DefaultNodeTest.java --- a/src/test/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/impl/node/DefaultNodeTest.java Sat Nov 15 17:48:07 2014 +0900 +++ b/src/test/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/impl/node/DefaultNodeTest.java Sun Nov 16 06:40:48 2014 +0900 @@ -30,7 +30,7 @@ public static DefaultTreeNode instance() { List rawList = List.nil(); - TreeMap rawMap = TreeMap.empty(Ord.stringOrd); + TreeMap> rawMap = TreeMap.empty(Ord.stringOrd); DefaultTreeNode node = new DefaultTreeNode(rawList,rawMap); return node; diff -r afbe19c98f53 -r 0854f9a9e81d src/test/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/traverse/TraverserTest.java --- a/src/test/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/traverse/TraverserTest.java Sat Nov 15 17:48:07 2014 +0900 +++ b/src/test/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/traverse/TraverserTest.java Sun Nov 16 06:40:48 2014 +0900 @@ -43,7 +43,8 @@ Traversal traversal = ret.b(); TreeNode target = traversal.destination(); String expect = path.toString(); - ByteBuffer value = target.getAttributes().get(key); + List valueList = target.getAttributes().get(key); + ByteBuffer value = valueList.head(); String actual = new String(value.array()); Assert.assertEquals(expect,actual); @@ -52,7 +53,7 @@ for(Direction d : traversal){ DefaultNodePath part = parts.head(); parts = parts.tail(); - value = d.getTarget().getAttributes().get(key); + value = d.getTarget().getAttributes().get(key).head(); String actualCurrentPathStr = new String(value.array()); String expectCurrentPathStr = part.toString(); Assert.assertEquals(expectCurrentPathStr,actualCurrentPathStr); diff -r afbe19c98f53 -r 0854f9a9e81d src/test/java/jp/ac/u_ryukyu/ie/cr/tatsuki/functionaljava/FjListTest.java --- a/src/test/java/jp/ac/u_ryukyu/ie/cr/tatsuki/functionaljava/FjListTest.java Sat Nov 15 17:48:07 2014 +0900 +++ b/src/test/java/jp/ac/u_ryukyu/ie/cr/tatsuki/functionaljava/FjListTest.java Sun Nov 16 06:40:48 2014 +0900 @@ -1,11 +1,14 @@ package jp.ac.u_ryukyu.ie.cr.tatsuki.functionaljava; +import java.nio.ByteBuffer; + import fj.F; import fj.data.List; public class FjListTest { static public void main(String args[]){ + List list = List.nil(); list = list.cons("wei"); String aaa = list.head(); diff -r afbe19c98f53 -r 0854f9a9e81d src/test/java/jp/ac/u_ryukyu/ie/cr/tatsuki/jungle/index/AddChildrenIndexTest.java --- a/src/test/java/jp/ac/u_ryukyu/ie/cr/tatsuki/jungle/index/AddChildrenIndexTest.java Sat Nov 15 17:48:07 2014 +0900 +++ b/src/test/java/jp/ac/u_ryukyu/ie/cr/tatsuki/jungle/index/AddChildrenIndexTest.java Sun Nov 16 06:40:48 2014 +0900 @@ -4,10 +4,8 @@ import java.util.Iterator; import org.junit.Test; -import org.junit.experimental.theories.suppliers.TestedOn; import fj.data.List; -import fj.data.Option; import fj.data.TreeMap; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.DefaultJungle; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.Jungle; @@ -28,81 +26,89 @@ public class AddChildrenIndexTest { - @Test - public void AddChildrenTest(){ - Jungle jungle = new DefaultJungle(null, "hogehoge",new DefaultTreeEditor(new DefaultTraverser())); - jungle.createNewTree("tree"); - JungleTree tree = jungle.getTreeByName("tree"); - createTree(tree); - tree.getRootNode(); - InterfaceTraverser ifTraverser = tree.getTraverser(); + @Test + public void AddChildrenTest() { + Jungle jungle = new DefaultJungle(null, "hogehoge", new DefaultTreeEditor(new DefaultTraverser())); + jungle.createNewTree("tree"); + JungleTree tree = jungle.getTreeByName("tree"); + createTree(tree); + tree.getRootNode(); + InterfaceTraverser ifTraverser = tree.getTraverser(); - Iterator> pairIterator = ifTraverser.find((TreeNode node) -> { - ByteBuffer attribute = node.getAttributes().get(key); - if (attribute != null) { - byte[] byteAttribute = attribute.array(); - String str = new String(byteAttribute); - System.out.println("attribute = " + str); - return str.equals("<-1,0,1>"); - } - return false; - }, key, "<-1,0,1>"); + Iterator> pairIterator = ifTraverser.find((TreeNode node) -> { + List attributeList = node.getAttributes().get(key); + if (attributeList.isNotEmpty()) { + for (ByteBuffer attribute : attributeList) { + byte[] byteAttribute = attribute.array(); + String str = new String(byteAttribute); + System.out.println("attribute = " + str); + if (str.equals("<-1,0,1>")) + return true; + continue; + } + } + return false; + }, key, "<-1,0,1>"); + + for (; pairIterator.hasNext(); pairIterator.next()) { + + } + ifTraverser.commitIndex(); + + IndexJungleTreeEditor editor = tree.getIndexTreeEditor(); + Either either = editor.addNewChildAt(new DefaultNodePath().add(0), 0); + either.b().success(); + + InterfaceTraverser newIfTraverser = tree.getTraverser(); + TreeMap>> newIndex = newIfTraverser.getIndex(); + NodePath targetPath = newIndex.get(key).some().get("<-1,0,2>").some().head(); + TreeNode targetNode = getTarget(tree.getRootNode(), targetPath); + Iterator attributeIterator = targetNode.getAttributes().getString(key); + Assert.assertTrue(attributeIterator.hasNext()); + String attribute = attributeIterator.next(); + Assert.assertEquals(attribute, "<-1,0,1>"); - for (;pairIterator.hasNext();pairIterator.next()) { - - } - ifTraverser.commitIndex(); - - IndexJungleTreeEditor editor = tree.getIndexTreeEditor(); - Either either = editor.addNewChildAt(new DefaultNodePath().add(0), 0); - either.b().success(); - - InterfaceTraverser newIfTraverser = tree.getTraverser(); - TreeMap>> newIndex = newIfTraverser.getIndex(); - NodePath targetPath = newIndex.get(key).some().get("<-1,0,2>").some().head(); - TreeNode targetNode = getTarget(tree.getRootNode(), targetPath); - Assert.assertEquals(targetNode.getAttributes().getString(key) ,"<-1,0,1>"); - - } - public static String key = "KEY"; - public static DefaultTreeNode factory = new DefaultTreeNode(); + } + + public static String key = "KEY"; + public static DefaultTreeNode factory = new DefaultTreeNode(); + + public void createTree(JungleTree tree) { + NodePath root = new DefaultNodePath(); + createChildren(tree, root, 0); - public void createTree(JungleTree tree) { - NodePath root = new DefaultNodePath(); - createChildren(tree, root, 0); + for (int x = 0; x < 3; x++) { + createChildren(tree, root.add(0), x); + for (int y = 0; y < 3; y++) { + createChildren(tree, root.add(0).add(x), y); + } + } + + } - for (int x = 0; x < 3; x++) { - createChildren(tree, root.add(0), x); - for (int y = 0; y < 3; y++) { - createChildren(tree, root.add(0).add(x), y); - } - } - - } + public void createChildren(JungleTree tree, NodePath root, int num) { + JungleTreeEditor editor = tree.getTreeEditor();// Treeのeditorを作成 + Either either = editor.addNewChildAt(root, num); // 新しく入れるところへのパス + if (either.isA()) { + Assert.fail(); + } + editor = either.b(); + either = editor.success(); + if (either.isA()) { + Assert.fail(); + } + NodePath childPath = root.add(num); + editor = tree.getTreeEditor(); + NodePath attribute = root.add(num); + System.out.println(attribute.toString()); + either = editor.putAttribute(childPath, key, ByteBuffer.wrap(attribute.toString().getBytes())); + if (either.isA()) { + Assert.fail(); + } + editor = either.b(); + either = editor.success(); + } - public void createChildren(JungleTree tree, NodePath root, int num) { - JungleTreeEditor editor = tree.getTreeEditor();// Treeのeditorを作成 - Either either = editor - .addNewChildAt(root, num); // 新しく入れるところへのパス - if (either.isA()) { - Assert.fail(); - } - editor = either.b(); - either = editor.success(); - if (either.isA()) { - Assert.fail(); - } - NodePath childPath = root.add(num); - editor = tree.getTreeEditor(); - NodePath attribute = root.add(num); - System.out.println(attribute.toString()); - either = editor.putAttribute(childPath, key,ByteBuffer.wrap(attribute.toString().getBytes())); - if (either.isA()) { - Assert.fail(); - } - editor = either.b(); - either = editor.success(); - } public TreeNode getTarget(TreeNode node, NodePath path) { Pair removeHeadPath = path.pop(); diff -r afbe19c98f53 -r 0854f9a9e81d src/test/java/jp/ac/u_ryukyu/ie/cr/tatsuki/jungle/index/AttributeIndexTest.java --- a/src/test/java/jp/ac/u_ryukyu/ie/cr/tatsuki/jungle/index/AttributeIndexTest.java Sat Nov 15 17:48:07 2014 +0900 +++ b/src/test/java/jp/ac/u_ryukyu/ie/cr/tatsuki/jungle/index/AttributeIndexTest.java Sun Nov 16 06:40:48 2014 +0900 @@ -1,9 +1,11 @@ package jp.ac.u_ryukyu.ie.cr.tatsuki.jungle.index; import java.nio.ByteBuffer; +import java.util.Iterator; import org.junit.Test; + import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.DefaultJungle; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.JungleTree; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.JungleTreeEditor; @@ -44,7 +46,9 @@ NodePath targetPath = index.get("key").some().get("test").some().head(); TreeNode targetNode = getTarget(tree.getRootNode(), targetPath); - Assert.assertEquals(targetNode.getAttributes().getString("key"),"test"); + Iterator AttributeIterator = targetNode.getAttributes().getString("key"); + Assert.assertTrue(AttributeIterator.hasNext()); + Assert.assertEquals(AttributeIterator.next(),"test"); JungleTreeEditor editor4 = tree.getIndexTreeEditor(); Either either3 = editor4.deleteAttribute(path.add(0), "key"); diff -r afbe19c98f53 -r 0854f9a9e81d src/test/java/jp/ac/u_ryukyu/ie/cr/tatsuki/jungle/index/DeleteChildrenIndexTest.java --- a/src/test/java/jp/ac/u_ryukyu/ie/cr/tatsuki/jungle/index/DeleteChildrenIndexTest.java Sat Nov 15 17:48:07 2014 +0900 +++ b/src/test/java/jp/ac/u_ryukyu/ie/cr/tatsuki/jungle/index/DeleteChildrenIndexTest.java Sun Nov 16 06:40:48 2014 +0900 @@ -36,12 +36,16 @@ InterfaceTraverser ifTraverser = tree.getTraverser(); Iterator> pairIterator = ifTraverser.find((TreeNode node) -> { - ByteBuffer attribute = node.getAttributes().get(key); - if (attribute != null) { - byte[] byteAttribute = attribute.array(); - String str = new String(byteAttribute); - System.out.println("attribute = " + str); - return str.equals("<-1,0,1>"); + List attributeList = node.getAttributes().get(key); + if (attributeList.isNotEmpty()) { + for (ByteBuffer attribute : attributeList) { + byte[] byteAttribute = attribute.array(); + String str = new String(byteAttribute); + System.out.println("attribute = " + str); + if (str.equals("<-1,0,1>")) + return true; + continue; + } } return false; }, key, "<-1,0,1>"); @@ -62,7 +66,10 @@ TreeMap>> newIndex = newIfTraverser.getIndex(); NodePath targetPath = newIndex.get(key).some().get("<-1,0,1>").some().head(); TreeNode targetNode = getTarget(tree.getRootNode(), targetPath); - Assert.assertEquals(targetNode.getAttributes().getString(key), "<-1,0,2>"); + Iterator attributeIterator = targetNode.getAttributes().getString(key); + Assert.assertTrue(attributeIterator.hasNext()); + String attribute = attributeIterator.next(); + Assert.assertEquals(attribute, "<-1,0,2>"); } diff -r afbe19c98f53 -r 0854f9a9e81d src/test/java/jp/ac/u_ryukyu/ie/cr/tatsuki/jungle/index/IndexCommitTest.java --- a/src/test/java/jp/ac/u_ryukyu/ie/cr/tatsuki/jungle/index/IndexCommitTest.java Sat Nov 15 17:48:07 2014 +0900 +++ b/src/test/java/jp/ac/u_ryukyu/ie/cr/tatsuki/jungle/index/IndexCommitTest.java Sun Nov 16 06:40:48 2014 +0900 @@ -1,7 +1,5 @@ package jp.ac.u_ryukyu.ie.cr.tatsuki.jungle.index; - - import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.DefaultJungle; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.Jungle; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.JungleTree; @@ -19,7 +17,6 @@ import java.nio.ByteBuffer; - import org.junit.Test; import fj.data.List; @@ -28,113 +25,119 @@ public class IndexCommitTest { - @Test - public void IndexCommitTest() throws InterruptedException { - - Jungle jungle = new DefaultJungle(null, "hogehoge",new DefaultTreeEditor(new DefaultTraverser())); - jungle.createNewTree("tree"); - JungleTree tree = jungle.getTreeByName("tree"); - createTree(tree); - tree.getRootNode(); - InterfaceTraverser ifTraverser = tree.getTraverser(); + @Test + public void IndexCommitTest() throws InterruptedException { - ifTraverser.find((TreeNode node) -> { - ByteBuffer attribute = node.getAttributes().get(key); - if (attribute != null) { - byte[] byteAttribute = attribute.array(); - String str = new String(byteAttribute); - System.out.println("attribute = " + str); - return str.equals("<-1,0,1>"); - } - return false; - }, key, "<-1,0,1>"); + Jungle jungle = new DefaultJungle(null, "hogehoge", new DefaultTreeEditor(new DefaultTraverser())); + jungle.createNewTree("tree"); + JungleTree tree = jungle.getTreeByName("tree"); + createTree(tree); + tree.getRootNode(); + InterfaceTraverser ifTraverser = tree.getTraverser(); - //check index - TreeMap>> index = ifTraverser.getIndex(); - Option>> opIndex = index.get(key); - - Assert.assertTrue(!opIndex.isNone()); - - TreeMap> innerIndex = opIndex.some(); - Assert.assertTrue(!innerIndex.get("<-1,0,0>").isNone()); + ifTraverser.find((TreeNode node) -> { + List attributeList = node.getAttributes().get(key); + if (attributeList.isNotEmpty()) { + for (ByteBuffer attribute : attributeList) { + byte[] byteAttribute = attribute.array(); + String str = new String(byteAttribute); + System.out.println("attribute = " + str); + if (str.equals("<-1,0,1>")) + return true; + continue; + } + } + return false; + }, key, "<-1,0,1>"); - JungleTreeEditor editor = tree.getTreeEditor(); - Either either = editor.addNewChildAt(new DefaultNodePath(), 0); - editor = either.b(); - editor.success(); - - ifTraverser.commitIndex(); - JungleTree newTree = jungle.getTreeByName("tree"); - InterfaceTraverser newIfTraverser = newTree.getTraverser(); - TreeMap>> newIndex = newIfTraverser.getIndex(); - Assert.assertTrue(newIndex.isEmpty()); - - InterfaceTraverser ifTraverser1= tree.getTraverser(); + // check index + TreeMap>> index = ifTraverser.getIndex(); + Option>> opIndex = index.get(key); + + Assert.assertTrue(!opIndex.isNone()); + + TreeMap> innerIndex = opIndex.some(); + Assert.assertTrue(!innerIndex.get("<-1,0,0>").isNone()); + + JungleTreeEditor editor = tree.getTreeEditor(); + Either either = editor.addNewChildAt(new DefaultNodePath(), 0); + editor = either.b(); + editor.success(); + + ifTraverser.commitIndex(); + JungleTree newTree = jungle.getTreeByName("tree"); + InterfaceTraverser newIfTraverser = newTree.getTraverser(); + TreeMap>> newIndex = newIfTraverser.getIndex(); + Assert.assertTrue(newIndex.isEmpty()); + + InterfaceTraverser ifTraverser1 = tree.getTraverser(); - ifTraverser1.find((TreeNode node) -> { - ByteBuffer attribute = node.getAttributes().get(key); - if (attribute != null) { - byte[] byteAttribute = attribute.array(); - String str = new String(byteAttribute); - System.out.println("attribute = " + str); - return str.equals("<-1,0,1>"); - } - return false; - }, key, "<-1,0,1>"); - - ifTraverser1.commitIndex(); - JungleTree newTree2 = jungle.getTreeByName("tree"); - InterfaceTraverser newIfTraverser2 = newTree2.getTraverser(); - TreeMap>> newIndex1 = newIfTraverser2.getIndex(); - Assert.assertFalse(newIndex1.isEmpty()); + ifTraverser1.find((TreeNode node) -> { + List attributeList = node.getAttributes().get(key); + if (attributeList.isNotEmpty()) { + for (ByteBuffer attribute : attributeList) { + byte[] byteAttribute = attribute.array(); + String str = new String(byteAttribute); + System.out.println("attribute = " + str); + if (str.equals("<-1,0,1>")) + return true; + continue; + } + } + return false; + }, key, "<-1,0,1>"); - } + ifTraverser1.commitIndex(); + JungleTree newTree2 = jungle.getTreeByName("tree"); + InterfaceTraverser newIfTraverser2 = newTree2.getTraverser(); + TreeMap>> newIndex1 = newIfTraverser2.getIndex(); + Assert.assertFalse(newIndex1.isEmpty()); + + } - public boolean compare(TreeNode compareNode, String compareAttribute) { - String labName = compareNode.getAttributes().getString(key); - if (labName.equals(compareAttribute)) - return true; - return false; - } + public boolean compare(TreeNode compareNode, String compareAttribute) { + String labName = compareNode.getAttributes().getString(key).next(); + if (labName.equals(compareAttribute)) + return true; + return false; + } - public static String key = "KEY"; - public static DefaultTreeNode factory = new DefaultTreeNode(); - - public void createTree(JungleTree tree) { - NodePath root = new DefaultNodePath(); - createChildren(tree, root, 0); + public static String key = "KEY"; + public static DefaultTreeNode factory = new DefaultTreeNode(); - for (int x = 0; x < 2; x++) { - createChildren(tree, root.add(0), x); - for (int y = 0; y < 2; y++) { - createChildren(tree, root.add(0).add(x), y); - } - } + public void createTree(JungleTree tree) { + NodePath root = new DefaultNodePath(); + createChildren(tree, root, 0); - } + for (int x = 0; x < 2; x++) { + createChildren(tree, root.add(0), x); + for (int y = 0; y < 2; y++) { + createChildren(tree, root.add(0).add(x), y); + } + } + + } - public void createChildren(JungleTree tree, NodePath root, int num) { - JungleTreeEditor editor = tree.getTreeEditor();// Treeのeditorを作成 - Either either = editor - .addNewChildAt(root, num); // 新しく入れるところへのパス - if (either.isA()) { - Assert.fail(); - } - editor = either.b(); - either = editor.success(); - if (either.isA()) { - Assert.fail(); - } - NodePath childPath = root.add(num); - editor = tree.getTreeEditor(); - NodePath attribute = root.add(num); - System.out.println(attribute.toString()); - either = editor.putAttribute(childPath, key, - ByteBuffer.wrap(attribute.toString().getBytes())); - if (either.isA()) { - Assert.fail(); - } - editor = either.b(); - either = editor.success(); - } + public void createChildren(JungleTree tree, NodePath root, int num) { + JungleTreeEditor editor = tree.getTreeEditor();// Treeのeditorを作成 + Either either = editor.addNewChildAt(root, num); // 新しく入れるところへのパス + if (either.isA()) { + Assert.fail(); + } + editor = either.b(); + either = editor.success(); + if (either.isA()) { + Assert.fail(); + } + NodePath childPath = root.add(num); + editor = tree.getTreeEditor(); + NodePath attribute = root.add(num); + System.out.println(attribute.toString()); + either = editor.putAttribute(childPath, key, ByteBuffer.wrap(attribute.toString().getBytes())); + if (either.isA()) { + Assert.fail(); + } + editor = either.b(); + either = editor.success(); + } } diff -r afbe19c98f53 -r 0854f9a9e81d src/test/java/jp/ac/u_ryukyu/ie/cr/tatsuki/query/SearchQueryTest.java --- a/src/test/java/jp/ac/u_ryukyu/ie/cr/tatsuki/query/SearchQueryTest.java Sat Nov 15 17:48:07 2014 +0900 +++ b/src/test/java/jp/ac/u_ryukyu/ie/cr/tatsuki/query/SearchQueryTest.java Sun Nov 16 06:40:48 2014 +0900 @@ -27,7 +27,7 @@ public class SearchQueryTest { - @Test + @Test public void SearchQueryTest() { Jungle jungle = new DefaultJungle(null, "hogehoge",new DefaultTreeEditor(new DefaultTraverser())); jungle.createNewTree("tree"); @@ -40,12 +40,16 @@ Iterator> searchNode = ifTraverser.find( (TreeNode node) -> { - ByteBuffer attribute = node.getAttributes().get(key); - if(attribute != null){ + List attributeList = node.getAttributes().get(key); + if(attributeList.isNotEmpty()){ + for (ByteBuffer attribute : attributeList) { byte[] byteAttribute = attribute.array(); String str = new String(byteAttribute); System.out.println("attribute = " + str); - return str.equals("<-1,0,1>"); + if (str.equals("<-1,0,1>")) + return true; + continue; + } } return false; } @@ -53,7 +57,8 @@ while (searchNode.hasNext()){ - Assert.assertTrue(compare(searchNode.next().left(),"<-1,0,1>")); + TreeNode node = searchNode.next().left(); + Assert.assertTrue(compare(node,"<-1,0,1>")); } TreeMap>> index = ifTraverser.getIndex(); @@ -62,51 +67,52 @@ TreeMap> innerIndex = opIndex.some(); Assert.assertTrue(!innerIndex.get("<-1,0,0>").isNone()); } - - - public boolean compare(TreeNode compareNode, String compareAttribute) { - String labName = compareNode.getAttributes().getString(key); - if (labName.equals(compareAttribute)) - return true; - return false; - } + + public boolean compare(TreeNode compareNode, String compareAttribute) { + Iterator labNameIterator = compareNode.getAttributes().getString(key); + Assert.assertTrue(labNameIterator.hasNext()); + String labName = labNameIterator.next(); + if (labName.equals(compareAttribute)) + return true; + return false; + } - public static String key = "KEY"; - public static DefaultTreeNode factory = new DefaultTreeNode(); + public static String key = "KEY"; + public static DefaultTreeNode factory = new DefaultTreeNode(); - public void createTree(JungleTree tree) { - NodePath root = new DefaultNodePath(); - createChildren(tree, root, 0); + public void createTree(JungleTree tree) { + NodePath root = new DefaultNodePath(); + createChildren(tree, root, 0); - for (int x = 0; x < 2; x++) { - createChildren(tree, root.add(0), x); - for (int y = 0; y < 2; y++) { - createChildren(tree, root.add(0).add(x), y); - } - } + for (int x = 0; x < 2; x++) { + createChildren(tree, root.add(0), x); + for (int y = 0; y < 2; y++) { + createChildren(tree, root.add(0).add(x), y); + } + } - } + } - public void createChildren(JungleTree tree, NodePath root, int num) { - JungleTreeEditor editor = tree.getTreeEditor();// Treeのeditorを作成 - Either either = editor.addNewChildAt(root,num); // 新しく入れるところへのパス - if (either.isA()) { - Assert.fail(); - } - editor = either.b(); - either = editor.success(); - if (either.isA()) { - Assert.fail(); - } - NodePath childPath = root.add(num); - editor = tree.getTreeEditor(); - NodePath attribute = root.add(num); - System.out.println(attribute.toString()); - either = editor.putAttribute(childPath, key,ByteBuffer.wrap(attribute.toString().getBytes())); - if (either.isA()) { - Assert.fail(); - } - editor = either.b(); - either = editor.success(); - } + public void createChildren(JungleTree tree, NodePath root, int num) { + JungleTreeEditor editor = tree.getTreeEditor();// Treeのeditorを作成 + Either either = editor.addNewChildAt(root, num); // 新しく入れるところへのパス + if (either.isA()) { + Assert.fail(); + } + editor = either.b(); + either = editor.success(); + if (either.isA()) { + Assert.fail(); + } + NodePath childPath = root.add(num); + editor = tree.getTreeEditor(); + NodePath attribute = root.add(num); + System.out.println(attribute.toString()); + either = editor.putAttribute(childPath, key, ByteBuffer.wrap(attribute.toString().getBytes())); + if (either.isA()) { + Assert.fail(); + } + editor = either.b(); + either = editor.success(); + } }