diff src/main/java/jp/ac/u_ryukyu/ie/cr/tatsuki/jungle/store/index/DeleteChildIndexEditor.java @ 143:afbe19c98f53

change Index form TreeMap<String,TreeMap<String<List<Pair<TreeNode,NodePath>>>> → TreeMap<String,TreeMap<String<List<NodePath>>> bag
author one
date Sat, 15 Nov 2014 17:48:07 +0900
parents 6e9a8d26e0cf
children a2c374a2686b
line wrap: on
line diff
--- a/src/main/java/jp/ac/u_ryukyu/ie/cr/tatsuki/jungle/store/index/DeleteChildIndexEditor.java	Thu Nov 13 22:04:14 2014 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/tatsuki/jungle/store/index/DeleteChildIndexEditor.java	Sat Nov 15 17:48:07 2014 +0900
@@ -35,30 +35,29 @@
 			TransactionManager txManager,
 			TreeEditor editor,
 			TreeOperationLog log,
-			TreeMap<String, TreeMap<String, List<Pair<TreeNode, NodePath>>>> index) {
+			TreeMap<String, TreeMap<String, List<NodePath>>> index) {
 
-		TreeMap<String, TreeMap<String, List<Pair<TreeNode, NodePath>>>> newIndex = editIndex(index);
+		TreeMap<String, TreeMap<String, List<NodePath>>> newIndex = editIndex(index);
 		IndexJungleTreeEditor newEditor = new IndexJungleTreeEditor(root, txManager, editor, newIndex);
 		return DefaultEither.newB(newEditor);
 	}
 
-	public TreeMap<String, TreeMap<String, List<Pair<TreeNode, NodePath>>>> editIndex(
-			TreeMap<String, TreeMap<String, List<Pair<TreeNode, NodePath>>>> index) {
+	public TreeMap<String, TreeMap<String, List<NodePath>>> editIndex(
+			TreeMap<String, TreeMap<String, List<NodePath>>> index) {
 
 		if (!index.isEmpty()) {
 			List<String> keyList = index.keys();
-			TreeMap<String, TreeMap<String, List<Pair<TreeNode, NodePath>>>> newIndex = TreeMap.empty(Ord.stringOrd);
-			TreeMap<String, List<Pair<TreeNode, NodePath>>> newInnerIndex = TreeMap.empty(Ord.stringOrd);
+			TreeMap<String, TreeMap<String, List<NodePath>>> newIndex = TreeMap.empty(Ord.stringOrd);
+			TreeMap<String, List<NodePath>> newInnerIndex = TreeMap.empty(Ord.stringOrd);
 
 			for (String indexKey : keyList) {
-				TreeMap<String, List<Pair<TreeNode, NodePath>>> innerIndex = index.get(indexKey).some();
+				TreeMap<String, List<NodePath>> innerIndex = index.get(indexKey).some();
 				List<String> innerIndexKeyList = innerIndex.keys();
 
 				for (String innerIndexKey : innerIndexKeyList) {
-					List<Pair<TreeNode, NodePath>> pairList = innerIndex.get(innerIndexKey).some();
-					List<Pair<TreeNode, NodePath>> list = checkPath(pairList);
+					List<NodePath> pairList = innerIndex.get(innerIndexKey).some();
+					List<NodePath> list = checkPath(pairList);
 					if (!list.isEmpty()){
-						System.out.println(new String(list.head().left().getAttributes().get("KEY").array()));
 						newInnerIndex = newInnerIndex.set(innerIndexKey, list);
 					}
 				}
@@ -70,12 +69,11 @@
 		}
 	}
 
-	public List<Pair<TreeNode, NodePath>> checkPath(List<Pair<TreeNode, NodePath>> pairList){
+	public List<NodePath> checkPath(List<NodePath> pairList){
 
-		List<Pair<TreeNode, NodePath>> list = List.nil();
-		for (Pair<TreeNode, NodePath> pair : pairList) {
+		List<NodePath> list = List.nil();
+		for (NodePath path : pairList) {
 
-			NodePath path = pair.right();
 			System.out.println("oldPath = " + path.toString());
 			NodePath newPath = new DefaultNodePath();
 			
@@ -84,7 +82,7 @@
 			}
 			
 			if (editNodePath.size() > path.size()) {
-				list = list.cons(pair);
+				list = list.cons(path);
 				continue;
 			}
 
@@ -115,9 +113,7 @@
 			}
 
 			System.out.println("newPath = " + newPath.toString());
-			Pair<TreeNode, NodePath> newPair = new Pair<TreeNode, NodePath>(
-					pair.left(), newPath);
-			list = list.cons(newPair);
+			list = list.cons(path);
 		}
 
 		return list;