add ~Btree(), link leaf node

kimxavi · May 31, 2016 · 379b417 · 379b417
1 parent 1951bb3
commit 379b417
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/map/BtreeMap.h b/map/BtreeMap.h
@@ -34,7 +34,17 @@ BtreeMap<K,V>::BtreeMap(){
 
 template <class K,class V>
 BtreeMap<K,V>::~BtreeMap(){
-	delete root->left(0);
+	Queue<pNode> queue;
+	queue.push(root->left(0));
+	pNode c;
+
+	while( !queue.isEmpty() && (c = queue.pop()) != NULL){
+		int i = 0;
+		while(c->left(i) != NULL && i < DCOUNT){
+			queue.push(c->left(i++));
+		}
+		delete c;
+	}
 	delete root;
 }
 
@@ -45,7 +55,6 @@ V BtreeMap<K,V>::get(const K& key) {
 }
 template <class K,class V>
 V BtreeMap<K,V>::put(const K& key,const V& value){
-	printf("put : %d\n",key);
 	pNode p = root;
 	pNode c = root->left(0);
 	Stack<pNode> stack;
@@ -57,7 +66,7 @@ V BtreeMap<K,V>::put(const K& key,const V& value){
 		while(1){
 			stack.push(p);
 			for(i = 0; i< c->getSize() && c->key(i) < key;i++);
-			if(c->left(i) == NULL) break;
+			if(c->isLeaf()) break;
 			p = c;
 			c = c->left(i);
 		}

diff --git a/map/Node.h b/map/Node.h
@@ -113,7 +113,7 @@ void Node<K,V>::remove(int index, pData& _data, Node*& _left){
 template <class K, class V>
 pNode Node<K,V>::splitFirst(){
 	 pNode newNode = new Node<K,V>();
-	 newNode->insert(data[0], left(0), NULL);
+	 newNode->insert(data[0], left(0), this);
 	 _moveLeft(0);
 	 return newNode;
 }