X-Git-Url: https://git.llucax.com/z.facultad/75.52/treemulator.git/blobdiff_plain/56b4eba70b4efa0149bab92cfbe5e83ecfa5524b..aaa9a007ee4af6b40d2eefef15bccc51f92e17d9:/src/btree.cpp?ds=inline

diff --git a/src/btree.cpp b/src/btree.cpp
index 1bbb755..ae98139 100644
--- a/src/btree.cpp
+++ b/src/btree.cpp
@@ -1,8 +1,9 @@
 
 #include "btree.h"
 
-BTree::BTree (const std::string &name, unsigned int block_size, bool create_new_file)
+BTree::BTree (const std::string &name, unsigned int block_size, int kt, bool create_new_file)
 {
+	key_type = kt;
 	uchar *node;
 	BTreeNodeHeader nh;
 
@@ -51,7 +52,7 @@ void BTree::WriteBlock (uchar *block, uint num)
 void BTree::AddKey (const Clave &k)
 {
 	uint left, right;
-	Clave *kout = AddKeyR (&k, 0, left, right);
+	Clave *kout = AddKeyR (k.Clone (), 0, left, right);
 
 	if (kout) {
 		unsigned short level;
@@ -70,6 +71,7 @@ void BTree::AddKey (const Clave &k)
 		WriteKeys (node, node_header, node_keys);
 		WriteNodoHeader (node, &node_header);
 		WriteBlock (node, left);
+		DeleteKeys (node_keys);
 		delete [] node;
 
 		/* Leo y actualizo la Raiz */
@@ -86,6 +88,8 @@ void BTree::AddKey (const Clave &k)
 		WriteKeys (node, node_header, node_keys);
 		WriteNodoHeader (node, &node_header);
 		WriteBlock (node, 0);
+		delete [] node;
+		DeleteKeys (node_keys);
 		PrintNode (0);
 	}
 }
@@ -131,6 +135,8 @@ Clave* BTree::AddKeyLeafR (const Clave *k, uint node_num, uint &left_child, uint
 		WriteKeys (node, node_header, node_keys);
 		WriteNodoHeader (node, &node_header);
 		WriteBlock (node, node_num);
+		DeleteKeys (node_keys);
+		delete [] node;
 
 		PrintNode (node_num);
 	} else {
@@ -207,6 +213,8 @@ Clave* BTree::AddKeyLeafR (const Clave *k, uint node_num, uint &left_child, uint
 		WriteKeys (new_node, new_node_header, new_node_keys);
 		WriteNodoHeader (new_node, &new_node_header);
 		WriteBlock (new_node, new_node_num);
+		DeleteKeys (old_node_keys);
+		DeleteKeys (new_node_keys);
 
 		PrintNode (node_num);
 		PrintNode (new_node_num);
@@ -255,9 +263,14 @@ Clave* BTree::AddKeyOtherR (const Clave *k, uint node_num, uint &left_child, uin
 	} else {
 		k = AddKeyR (k, (*ultima)->getChild (), left_child, right_child);
 	}
+	DeleteKeys (node_keys);
 
 	/* Nada que hacer */
-	if (!k) return NULL;
+	if (data) delete data;
+	if (!k) {
+		delete [] node;
+		return NULL;
+	}
 
 	data = new BTreeData (k->Clone (), right_child);
 
@@ -277,6 +290,8 @@ Clave* BTree::AddKeyOtherR (const Clave *k, uint node_num, uint &left_child, uin
 		WriteKeys (node, node_header, node_keys);
 		WriteNodoHeader (node, &node_header);
 		WriteBlock (node, node_num);
+		DeleteKeys (node_keys);
+		delete [] node;
 
 		PrintNode (node_num);
 	} else {
@@ -357,6 +372,8 @@ Clave* BTree::AddKeyOtherR (const Clave *k, uint node_num, uint &left_child, uin
 		WriteKeys (new_node, new_node_header, new_node_keys);
 		WriteNodoHeader (new_node, &new_node_header);
 		WriteBlock (new_node, new_node_num);
+		DeleteKeys (old_node_keys);
+		DeleteKeys (new_node_keys);
 
 		PrintNode (node_num);
 		PrintNode (new_node_num);
@@ -417,9 +434,9 @@ std::list<BTreeData *> BTree::ReadKeys (uchar *node, BTreeNodeHeader &node_heade
 		/* TODO : Detectar si estoy en una hoja */
 		BTreeData *data;
 		if (node_header.level == 0) {
-			data = new BTreeLeafData (node);
+			data = new BTreeLeafData (node, key_type);
 		} else {
-			data = new BTreeData (node);
+			data = new BTreeData (node, key_type);
 		}
 		node += data->Size ();
 		keys.push_back (data);
@@ -439,7 +456,9 @@ void BTree::WriteKeys (uchar *node, BTreeNodeHeader &node_header, std::list<BTre
 
 	while (it != keys.end ()) {
 		BTreeData *d = (*it);
-		memcpy (node, d->ToArray(), d->Size ());
+		uchar *n = d->ToArray ();
+		memcpy (node, n, d->Size ());
+		delete [] n;
 		node += d->Size ();
 		node_header.free_space -= d->Size ();
 		node_header.item_count++;
@@ -470,6 +489,7 @@ void BTree::PrintNode (uint num)
 	std::cout << std::endl;
 
 	delete [] node;
+	DeleteKeys (node_keys);
 }
 
 uchar *BTree::NewBlock (uint &num)
@@ -494,3 +514,67 @@ uchar *BTree::NewBlock (uint &num)
 	return node;
 }
 
+bool BTree::FindKey (const Clave &k)
+{
+	return FindKeyR (&k, 0);
+}
+
+bool BTree::FindKeyR (const Clave *k, uint node_num)
+{
+	std::list<BTreeData *> node_keys;
+	BTreeNodeHeader node_header;
+
+	/* Leo el nodo raiz para empezar a agregar */
+	uchar *node = ReadBlock (node_num);
+	ReadNodoHeader (node, &node_header);
+	node_keys = ReadKeys (node, node_header);
+
+	std::list<BTreeData *>::iterator it = node_keys.begin ();
+	std::list<BTreeData *>::iterator posterior;
+	std::list<BTreeData *>::iterator ultima;
+	
+	/* Se supone que la primera es un hijo :) */
+	BTreeData *lchild;
+	if (node_header.level != 0) {
+		lchild = (*it++);
+	}
+	posterior = it;
+
+	BTreeData *data;
+	if (node_header.level == 0)
+		data = new BTreeLeafData ((Clave *)k);
+	else
+		data = new BTreeData ((Clave *)k, 0);
+
+	while (it != node_keys.end ()) {
+		if ((*data) == (*(*it))) {
+			/* La encontre!, retorno */
+			delete [] node;
+			DeleteKeys (node_keys);
+			return true;
+		}
+
+		if ((*data) < (*(*it)))
+			break;
+		ultima = it;
+		it++;
+	}
+
+	/* TODO: Aca faltaria liberar memoria */
+	if (it == posterior)
+		return FindKeyR (k, lchild->getChild ());
+		
+	return FindKeyR (k, (*ultima)->getChild ());
+}
+
+void BTree::DeleteKeys (std::list<BTreeData *> &keys)
+{
+	std::list<BTreeData *>::iterator it = keys.begin ();
+
+	while (it != keys.end ()) {
+		BTreeData *d = (*it);
+		delete d;
+		it++;
+	}
+}
+