X-Git-Url: https://git.llucax.com/z.facultad/75.52/treemulator.git/blobdiff_plain/3a7aa16a342ce2cca383b3e118d4f41ef1c698a4..58866104a92791fdba206b3042be2c2b181a1e81:/src/btree.cpp diff --git a/src/btree.cpp b/src/btree.cpp index 7a3daaf..e78a91e 100644 --- a/src/btree.cpp +++ b/src/btree.cpp @@ -1,9 +1,8 @@ #include "btree.h" -BTree::BTree (const std::string &name, unsigned int block_size, int kt, bool create_new_file) +BTree::BTree (const std::string &name, unsigned int block_size, int tt, int kt, bool create_new_file) { - key_type = kt; uchar *node; BTreeNodeHeader nh; @@ -18,6 +17,8 @@ BTree::BTree (const std::string &name, unsigned int block_size, int kt, bool cre /* Inicializo el header */ header.block_size = block_size; + header.tree_type = tt; + header.key_type = kt; WriteFileHeader (); /* Creo el primer bloque vacio */ @@ -32,9 +33,52 @@ BTree::BTree (const std::string &name, unsigned int block_size, int kt, bool cre delete [] node; } +BTree::BTree (const std::string &name) +{ + /* Leo los bloques recuperables */ + std::string del = filename + ".del"; + + fp = fopen (del.c_str (), "wb"); + if (fp != NULL) { + uint i; + + while (fread (&i, 1, sizeof (uint), fp)) { + deleted_nodes.push_back (i); + } + + fclose (fp); + } + + fp = fopen (name.c_str(), "rb+"); + if (!fp) { + /* TODO : mandar una exception ? */ + return; + } + ReadFileHeader (); +} + BTree::~BTree () { fclose (fp); + + std::string del = filename + ".del"; + + fp = fopen (del.c_str (), "wb"); + std::list::iterator it = deleted_nodes.begin (); + + while (it != deleted_nodes.end ()) { + uint i = *it; + fwrite (&i, 1, sizeof (uint), fp); + it++; + } + + fclose (fp); +} + +void BTree::ReadFileHeader () +{ + fseek (fp, 0L, SEEK_SET); + fread (&header, 1, sizeof (BTreeFileHeader), fp); } void BTree::WriteFileHeader () @@ -53,7 +97,13 @@ void BTree::WriteBlock (uchar *block, uint num) void BTree::AddKey (const Clave &k) { uint left, right; - Clave *kout = AddKeyR (k.Clone (), 0, left, right); + Clave *kout; + + try { + kout = AddKeyR (k.Clone (), 0, left, right); + } catch (Exception *e) { + throw e; + } if (kout) { unsigned short level; @@ -102,10 +152,19 @@ Clave* BTree::AddKeyR (const Clave *k, uint node_num, uint &left_child, uint &ri ReadNodoHeader (node, &node_header); delete [] node; - if (node_header.level == 0) - return AddKeyLeafR (k, node_num, left_child, right_child); + if (node_header.level == 0) { + try { + return AddKeyLeafR (k, node_num, left_child, right_child); + } catch (Exception *e) { + throw e; + } + } - return AddKeyOtherR (k, node_num, left_child, right_child); + try { + return AddKeyOtherR (k, node_num, left_child, right_child); + } catch (Exception *e) { + throw e; + } } Clave* BTree::AddKeyLeafR (const Clave *k, uint node_num, uint &left_child, uint &right_child) @@ -127,6 +186,14 @@ Clave* BTree::AddKeyLeafR (const Clave *k, uint node_num, uint &left_child, uint while (it != node_keys.end ()) { datait = (*it); + if (header.tree_type == TYPE_IDENTIFICACION) { + /* Verifico que la clave no existea ya en el arbol */ + if ((*data) == (*datait)) { + throw new AddException (); + return NULL; + } + } + if ((*data) < (*datait)) /* Me pase, lo agrego aca! */ break; @@ -160,6 +227,13 @@ Clave* BTree::AddKeyLeafR (const Clave *k, uint node_num, uint &left_child, uint while (it != node_keys.end ()) { BTreeData *datait; datait = (*it); + if (header.tree_type == TYPE_IDENTIFICACION) { + /* Verifico que la clave no existea ya en el arbol */ + if ((*data) == (*datait)) { + throw new AddException (); + return NULL; + } + } if ((*data) < (*datait)) /* Me pase, lo agrego aca! */ break; @@ -199,7 +273,7 @@ Clave* BTree::AddKeyLeafR (const Clave *k, uint node_num, uint &left_child, uint used += d->Size (); it++; } - kout = (*it++)->getClave (); // Esta se retorna al "padre" para que se la agregue + kout = (*it++)->GetKey (); // Esta se retorna al "padre" para que se la agregue while (it != node_keys.end ()) { BTreeData *d = (*it); @@ -253,6 +327,13 @@ Clave* BTree::AddKeyOtherR (const Clave *k, uint node_num, uint &left_child, uin posterior = it; while (it != node_keys.end ()) { + if (header.tree_type == TYPE_IDENTIFICACION) { + /* Verifico que la clave no existea ya en el arbol */ + if ((*data) == (*(*it))) { + throw new AddException (); + return NULL; + } + } if ((*data) < (*(*it))) break; ultima = it; @@ -260,9 +341,9 @@ Clave* BTree::AddKeyOtherR (const Clave *k, uint node_num, uint &left_child, uin } if (it == posterior) { - k = AddKeyR (k, lchild->getChild (), left_child, right_child); + k = AddKeyR (k, lchild->GetChild (), left_child, right_child); } else { - k = AddKeyR (k, (*ultima)->getChild (), left_child, right_child); + k = AddKeyR (k, (*ultima)->GetChild (), left_child, right_child); } DeleteKeys (node_keys); @@ -282,6 +363,13 @@ Clave* BTree::AddKeyOtherR (const Clave *k, uint node_num, uint &left_child, uin while (it != node_keys.end ()) { datait = (*it); + if (header.tree_type == TYPE_IDENTIFICACION) { + /* Verifico que la clave no existea ya en el arbol */ + if ((*data) == (*datait)) { + throw new AddException (); + return NULL; + } + } if ((*data) < (*datait)) /* Me pase, lo agrego aca! */ break; @@ -317,6 +405,13 @@ Clave* BTree::AddKeyOtherR (const Clave *k, uint node_num, uint &left_child, uin while (it != node_keys.end ()) { BTreeData *datait; datait = (*it); + if (header.tree_type == TYPE_IDENTIFICACION) { + /* Verifico que la clave no existea ya en el arbol */ + if ((*data) == (*datait)) { + throw new AddException (); + return NULL; + } + } if ((*data) < (*datait)) /* Me pase, lo agrego aca! */ break; @@ -356,9 +451,9 @@ Clave* BTree::AddKeyOtherR (const Clave *k, uint node_num, uint &left_child, uin used += d->Size (); it++; } - kout = (*it)->getClave (); // Esta se retorna al "padre" para que se la agregue + kout = (*it)->GetKey (); // Esta se retorna al "padre" para que se la agregue - new_node_keys.push_back ( new BTreeChildData ((*it)->getChild ())); + new_node_keys.push_back ( new BTreeChildData ((*it)->GetChild ())); it++; while (it != node_keys.end ()) { BTreeData *d = (*it); @@ -391,7 +486,11 @@ Clave* BTree::AddKeyOtherR (const Clave *k, uint node_num, uint &left_child, uin void BTree::DelKey (const Clave &k) { - DelKeyR (new BTreeLeafData (k.Clone ()), 0, 0); + std::string s = k; + std::cout << "========= Borrando " << s << " =================\n"; + BTreeData *b = new BTreeLeafData (k.Clone ()); + DelKeyR (b, 0, 0); + delete b; } void BTree::DelKeyR (BTreeData *k, uint node_num, uint padre) @@ -418,19 +517,21 @@ void BTree::DelKeyR (BTreeData *k, uint node_num, uint padre) if ((*k) == (*(*it))) { /* La encontre!, retorno */ if (node_header.level == 0) { - DelKeyFromLeaf (k->getClave (), node_num, padre); + DelKeyFromLeaf (k->GetKey (), node_num, padre); } else { uint left, right; if (it == posterior) { - left = lchild->getChild (); - right = (*it)->getChild (); + left = lchild->GetChild (); + right = (*it)->GetChild (); } else { - left = (*ultima)->getChild (); - right = (*it)->getChild (); + left = (*ultima)->GetChild (); + right = (*it)->GetChild (); } std::cout << "Eliminar de Nodo con hijos : " << left << " y " << right << std::endl; - DelKeyFromNode (k->getClave (), node_num, padre, left, right); + DelKeyFromNode (k->GetKey (), node_num, padre, left, right); } + DeleteKeys (node_keys); + delete [] node; return; } @@ -444,15 +545,15 @@ void BTree::DelKeyR (BTreeData *k, uint node_num, uint padre) * decir que no lo encontre */ if (node_header.level == 0) { - std::cout << "Clave no encontrada\n"; + std::cout << "*** Clave no encontrada ***\n"; return; } /* TODO: Aca faltaria liberar memoria */ if (it == posterior) { - DelKeyR (k, lchild->getChild (), node_num); + DelKeyR (k, lchild->GetChild (), node_num); } else { - DelKeyR (k, (*ultima)->getChild (), node_num); + DelKeyR (k, (*ultima)->GetChild (), node_num); } } @@ -467,13 +568,15 @@ void BTree::DelKeyFromLeaf (Clave *k, uint node_num, uint padre) ReadNodoHeader (node, &node_header); node_keys = ReadKeys (node, node_header); - data = new BTreeLeafData (k); + data = new BTreeLeafData (k->Clone ()); std::list::iterator it; it = node_keys.begin (); while (it != node_keys.end ()) { if ((*data) == (*(*it))) { + BTreeData *aborrar = (*it); node_keys.erase (it); + delete aborrar; break; } it++; @@ -481,15 +584,13 @@ void BTree::DelKeyFromLeaf (Clave *k, uint node_num, uint padre) delete data; - /* TODO : que pasa cuando el nodo se queda vacio o con - * muy pocas claveS?? - */ WriteKeys (node, node_header, node_keys); WriteNodoHeader (node, &node_header); WriteBlock (node, node_num); /* Veo si se cumple la condición de minimalidad */ - if ((node_header.free_space <= ((header.block_size-sizeof(BTreeNodeHeader))/2)) && (node_num != 0)) { + uint min_free = (header.block_size-sizeof(BTreeNodeHeader))/2; + if ((node_header.free_space > min_free) && (node_num != 0)) { /* Oops! Debo pedir prestada clave */ uint hi, hd; Clave *pedida; @@ -513,15 +614,23 @@ void BTree::DelKeyFromLeaf (Clave *k, uint node_num, uint padre) } else { std::cout << "NADIE ME PUEDE PRESTAR, FUNDIR NODOS\n"; uint join1, join2; + int tipoh; if (hi != 0) { + std::cout << "Join con Hermano Izquierdo\n"; join1 = hi; join2 = node_num; + tipoh = 0; } else { + std::cout << "Join con Hermano Derecho\n"; join1 = node_num; join2 = hd; + tipoh = 1; } - JoinNodes (join1, join2, padre); + JoinNodes (join1, join2, padre, tipoh); + + DeleteKeys (node_keys); + delete [] node; return; } @@ -535,12 +644,29 @@ void BTree::DelKeyFromLeaf (Clave *k, uint node_num, uint padre) std::cout << "Borrado de una hoja listo\n"; } -void BTree::JoinNodes (uint node1, uint node2, uint padre) +void BTree::JoinNodes (uint node1, uint node2, uint padre, int tipohermano) { uchar *n1, *n2, *npadre; BTreeNodeHeader nh1, nh2, nhp; std::list nk1, nk2, nkpadre; + if (node1 == node2) { + std::cout << "PANIC : No puedo juntar el mismo nodo con si mismo!!\n"; + exit (1); + } + if (node1 == padre) { + std::cout << "PANIC : No puedo juntar el mismo nodo con si mismo!!\n"; + exit (1); + } + if (node2 == padre) { + std::cout << "PANIC : No puedo juntar el mismo nodo con si mismo!!\n"; + exit (1); + } + + PrintNode (padre); + PrintNode (node1); + PrintNode (node2); + /* Leo los nodos */ n1 = ReadBlock (node1); n2 = ReadBlock (node2); @@ -550,67 +676,110 @@ void BTree::JoinNodes (uint node1, uint node2, uint padre) ReadNodoHeader (n2, &nh2); ReadNodoHeader (npadre, &nhp); + /* Apunto de Unir */ + uint tmp = header.block_size - sizeof (BTreeNodeHeader); + uint l = tmp - nh1.free_space; + l += tmp - nh1.free_space; + l += 4; + + std::cout << "Espacio ocupado despues de unir : " << l << " de " << tmp << std::endl; + nk1 = ReadKeys (n1, nh1); nk2 = ReadKeys (n2, nh2); nkpadre = ReadKeys (npadre, nhp); - /* Busco la clave a juntar con los nodos */ + /* Busco la clave del padre a juntar con los nodos */ std::list::iterator it = nkpadre.begin (); + std::list::iterator borrar_padre; std::list::iterator sig; + std::list::iterator anterior = it; Clave *cpadre; BTreeData *lchild = (*it++); - if (lchild->getChild () == node1) { - cpadre = (*it)->getClave (); - nkpadre.erase (it); + if (lchild->GetChild () == node1) { + cpadre = (*it)->GetKey (); + borrar_padre = it; } else { while (it != nkpadre.end ()) { - if ((*it)->getChild () == node1) - break; + if (tipohermano == 0) { + if ((*it)->GetChild () == node2) + break; + } else { + if ((*it)->GetChild () == node1) + break; + } + anterior = it; it++; } - cpadre = (*it)->getClave (); - nkpadre.erase (it); + cpadre = (*it)->GetKey (); + borrar_padre = it; + } + if (it == nkpadre.end ()) { + std::cout << "PANIC : Me pase sin encontrar la clave!!\n"; + exit(1); } - sig = it++; + it++; + sig = it; std::list newkeys; std::list::iterator i; i = nk1.begin (); while (i != nk1.end ()) { - newkeys.push_back ( new BTreeLeafData ((*i)->getClave ()->Clone ())); + newkeys.push_back ( new BTreeLeafData ((*i)->GetKey ()->Clone ())); i++; } - if (cpadre) + //if (tipohermano == 0) newkeys.push_back ( new BTreeLeafData (cpadre->Clone ())); i = nk2.begin (); while (i != nk2.end ()) { - newkeys.push_back ( new BTreeLeafData ((*i)->getClave ()->Clone ())); + newkeys.push_back ( new BTreeLeafData ((*i)->GetKey ()->Clone ())); i++; } - if (padre == 0) { + std::cout << "Espacio ocupado por las nuevas claves : " << (newkeys.size()*4) << std::endl; + if ((newkeys.size()*4) > tmp) { + std::cout << "PANIC : El nodo fundido no entra !!!\n"; + exit (1); + } + + /* Para el padre, tener 2 items significa tener solo 1 clave, ya que + * el otro item es el LeftChild! + */ + if ((padre == 0) && (nhp.item_count == 2)) { + /* Si junte 2 nodos, cuyo padre era la raiz, y esta tenia + * solo una clave, quiere decir que lo que me queda + * es de nuevo solo una raiz con todas las claves + */ nhp.level = 0; WriteKeys (npadre, nhp, newkeys); WriteNodoHeader (npadre, &nhp); WriteBlock (npadre, padre); - /* TODO: Recuperar nodo1 y nodo2 */ + deleted_nodes.push_back (node1); + deleted_nodes.push_back (node2); } else { WriteKeys (n1, nh1, newkeys); WriteNodoHeader (n1, &nh1); WriteBlock (n1, node1); - /* TODO : Recuperar node2 */ + deleted_nodes.push_back (node2); + /* Actualizo punero al padre */ - (*sig)->setChild (node1); + (*anterior)->SetChild (node1); + + nkpadre.erase (borrar_padre); WriteKeys (npadre, nhp, nkpadre); WriteNodoHeader (npadre, &nhp); WriteBlock (npadre, padre); } + std::cout << " ----- Luego de Fundir -----\n"; + PrintNode (node1); + PrintNode (padre); + std::cout << " ---------------------------\n"; + DeleteKeys (nk1); DeleteKeys (nk2); DeleteKeys (nkpadre); @@ -623,7 +792,10 @@ void BTree::JoinNodes (uint node1, uint node2, uint padre) Clave *BTree::GetKey (uint node_num, char maxmin) { - if (node_num == 0) return NULL; + if (node_num == 0) { + std::cout << "Nodo no me puede prestar ... es NULL\n"; + return NULL; + } uchar *node; BTreeNodeHeader node_header; @@ -638,8 +810,11 @@ Clave *BTree::GetKey (uint node_num, char maxmin) if (node_header.level != 0) it++; Clave *k; - uint free = node_header.free_space + (*it)->Size (); - if (free > ((header.block_size - sizeof (BTreeNodeHeader))/2)) { + uint free = node_header.free_space; // + (*it)->Size (); + uint min_free = (header.block_size - sizeof (BTreeNodeHeader))/2; + if (free > min_free) { + std::cout << "No puedo prestar : Free = " << free << " Minimo = " << min_free << std::endl; + PrintNode (node_num); WriteKeys (node, node_header, node_keys); WriteNodoHeader (node, &node_header); WriteBlock (node, node_num); @@ -651,12 +826,12 @@ Clave *BTree::GetKey (uint node_num, char maxmin) } if (maxmin == 0) { - k = (*it)->getClave ()->Clone (); + k = (*it)->GetKey ()->Clone (); node_keys.erase (it); } else { it = node_keys.end (); it--; - k = (*it)->getClave ()->Clone (); + k = (*it)->GetKey ()->Clone (); node_keys.erase (it); } @@ -686,28 +861,28 @@ void BTree::FindBrothers (uint node_num, uint padre, uint &left, uint &right) BTreeData *lchild = (*it++); - if (lchild->getChild () == node_num) { + if (lchild->GetChild () == node_num) { /* Solo tengo hermano derecho */ std::cout << "Hermano Izquierdo : NO TENGO" << std::endl; left = 0; - std::cout << "Hermano Derecho : " << (*it)->getChild () << std::endl; - right = (*it)->getChild (); + std::cout << "Hermano Derecho : " << (*it)->GetChild () << std::endl; + right = (*it)->GetChild (); return; } while (it != node_keys.end ()) { - if ((*it)->getChild () == node_num) + if ((*it)->GetChild () == node_num) break; anterior = it; it++; } siguiente = it++; - std::cout << "Hermano Izquierdo : " << (*anterior)->getChild () << std::endl; - left = (*anterior)->getChild (); + std::cout << "Hermano Izquierdo : " << (*anterior)->GetChild () << std::endl; + left = (*anterior)->GetChild (); if (siguiente != node_keys.end ()) { - right = (*siguiente)->getChild (); - std::cout << "Hermano Derecho : " << (*siguiente)->getChild () << std::endl; + right = (*siguiente)->GetChild (); + std::cout << "Hermano Derecho : " << (*siguiente)->GetChild () << std::endl; } else { right = 0; std::cout << "Hermano Derecho : NO TENGO" << std::endl; @@ -730,9 +905,9 @@ Clave *BTree::ReplaceKeyInFather (uint node_num, uint padre, Clave *k) BTreeData *lchild = (*it++); - if (lchild->getChild () == node_num) { - Clave *ret = (*it)->getClave (); - (*it)->setClave (k); + if (lchild->GetChild () == node_num) { + Clave *ret = (*it)->GetKey (); + (*it)->SetKey (k); WriteKeys (node, node_header, node_keys); WriteNodoHeader (node, &node_header); @@ -744,14 +919,14 @@ Clave *BTree::ReplaceKeyInFather (uint node_num, uint padre, Clave *k) } while (it != node_keys.end ()) { - if ((*it)->getChild () == node_num) + if ((*it)->GetChild () == node_num) break; anterior = it; it++; } - Clave *ret = (*it)->getClave (); - (*it)->setClave (k); + Clave *ret = (*it)->GetKey (); + (*it)->SetKey (k); WriteKeys (node, node_header, node_keys); WriteNodoHeader (node, &node_header); @@ -769,7 +944,7 @@ void BTree::DelKeyFromNode (Clave *k, uint node_num, uint padre, uint left, uint BTreeNodeHeader node_header; std::list node_keys; - node = ReadBlock (padre); + node = ReadBlock (node_num); ReadNodoHeader (node, &node_header); node_keys = ReadKeys (node, node_header); @@ -789,7 +964,7 @@ void BTree::DelKeyFromNode (Clave *k, uint node_num, uint padre, uint left, uint node_keyr = ReadKeys (node_r, node_hr); data_r = *(node_keyr.begin ()); padre_hijo = right; - right = data_r->getChild (); + right = data_r->GetChild (); DeleteKeys (node_keyr); delete [] node_r; @@ -809,20 +984,31 @@ void BTree::DelKeyFromNode (Clave *k, uint node_num, uint padre, uint left, uint std::list::iterator it = node_keys.begin (); while (it != node_keys.end ()) { + std::string ss1, ss2; + ss1 = *data; + ss2 = *(*it); + std::cout << ss1 << " == " << ss2 << std::endl; if ((*data) == (*(*it))) { break; } it++; } - (*it)->setClave (reemplazar->getClave ()); - reemplazar->setClave (k->Clone ()); + if (it == node_keys.end ()) { + std::cout << "PANIC : No encontre la clave en el nodo!!!!\n"; + std::string s = *data; + std::cout << s << std::endl; + PrintNode (node_num); + exit (1); + } + (*it)->SetKey (reemplazar->GetKey ()); + reemplazar->SetKey (k->Clone ()); std::cout << "Tengo todo reemplazado ...\n"; /* Grabo los nodos */ WriteKeys (node, node_header, node_keys); WriteNodoHeader (node, &node_header); - WriteBlock (node, padre); + WriteBlock (node, node_num); DeleteKeys (node_keys); delete [] node; @@ -833,7 +1019,8 @@ void BTree::DelKeyFromNode (Clave *k, uint node_num, uint padre, uint left, uint delete [] node_r; std::cout << "Grabe todo en disco ...\n"; - + PrintNode (node_num); + PrintNode (right); /* Ahora debo eliminar la clave que puse en el nodo hoja */ std::cout << "Borro la clave desde la hoja!\n"; @@ -841,8 +1028,11 @@ void BTree::DelKeyFromNode (Clave *k, uint node_num, uint padre, uint left, uint std::cout << "Listo, Listo!\n"; } else if (left != 0) { + std::cout << "PANIC : Deberia poder reemplazar en la derecha!!!!!\n"; + exit (1); } else { std::cout << "PANIC : No tengo hijos para reemplazar!!!!\n"; + exit (1); } } @@ -888,26 +1078,54 @@ std::list BTree::ReadKeys (uchar *node, BTreeNodeHeader &node_heade } for (uint i=0; iSize (); keys.push_back (data); } + DeAbrevKey (keys); return keys; } +void BTree::AbrevKey (std::list &lst) +{ + /* Claves Fijas No se abrevian */ + if (header.key_type == KEY_FIXED) return; + + BTreeData *primera = NULL; + std::list::iterator it = lst.begin (); + + while (it != lst.end ()) { + if ((*it)->Abrev (primera) == false) + primera = (*it); + it++; + } +} + +void BTree::DeAbrevKey (std::list &lst) +{ + /* Claves Fijas No se abrevian */ + if (header.key_type == KEY_FIXED) return; + + BTreeData *primera = NULL; + std::list::iterator it = lst.begin (); + + while (it != lst.end ()) { + if ((*it)->DesAbrev (primera) == false) + primera = (*it); + it++; + } +} + void BTree::WriteKeys (uchar *node, BTreeNodeHeader &node_header, std::list &keys) { + AbrevKey (keys); + std::list::iterator it = keys.begin (); node += sizeof (BTreeNodeHeader); @@ -915,9 +1133,12 @@ void BTree::WriteKeys (uchar *node, BTreeNodeHeader &node_header, std::listToArray (); + acumulado += d->Size (); + //std::cout << "WriteKeys :: Acumulado = " << acumulado << std::endl; memcpy (node, n, d->Size ()); delete [] n; node += d->Size (); @@ -926,7 +1147,7 @@ void BTree::WriteKeys (uchar *node, BTreeNodeHeader &node_header, std::list::iterator it; - num = filelen/header.block_size - 1; + if (deleted_nodes.size ()) { + it = deleted_nodes.begin (); + num = *it; + deleted_nodes.erase (it); + } else { + fseek (fp, 0, SEEK_END); + filelen = ftell (fp); + num = filelen/header.block_size - 1; + } node = new uchar[header.block_size]; ReadNodoHeader (node, &nh); nh.level = 0; @@ -1003,18 +1231,20 @@ BTreeFindResult *BTree::FindKeyR (const Clave *k, uint node_num) BTreeData *data; if (node_header.level == 0) - data = new BTreeLeafData ((Clave *)k); + data = new BTreeLeafData (k->Clone ()); else - data = new BTreeData ((Clave *)k, 0); + data = new BTreeData (k->Clone (), 0); while (it != node_keys.end ()) { if ((*data) == (*(*it))) { /* La encontre!, retorno */ + delete data; delete [] node; DeleteKeys (node_keys); BTreeFindResult *result = new BTreeFindResult (); result->node = node_num; result->header = node_header; + return result; } @@ -1024,11 +1254,27 @@ BTreeFindResult *BTree::FindKeyR (const Clave *k, uint node_num) it++; } + delete data; + + /* Si llego aca y estoy en nivel 0 (una hoja) quiere + * decir que no lo encontré + */ + if (node_header.level == 0) { + DeleteKeys (node_keys); + delete [] node; + return NULL; + } + /* TODO: Aca faltaria liberar memoria */ + BTreeFindResult *ret; if (it == posterior) - return FindKeyR (k, lchild->getChild ()); - - return FindKeyR (k, (*ultima)->getChild ()); + ret = FindKeyR (k, lchild->GetChild ()); + else + ret = FindKeyR (k, (*ultima)->GetChild ()); + + DeleteKeys (node_keys); + delete [] node; + return ret; } void BTree::DeleteKeys (std::list &keys) @@ -1041,3 +1287,8 @@ void BTree::DeleteKeys (std::list &keys) it++; } } + +int BTree::type () const +{ + return header.key_type; +}