Agrego Magic.

[z.facultad/75.52/treemulator.git] / src / btree.cpp

diff --git a/src/btree.cpp b/src/btree.cpp
index 3027c9a30d972b9efb7c0662bc9a3e7a5d53d733..ae68316e256a790dee91e9a888856b044310fe51 100644 (file)
--- a/src/btree.cpp
+++ b/src/btree.cpp
@@ -1,9 +1,8 @@
 
 #include "btree.h"
 
 
 #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;
 
        uchar *node;
        BTreeNodeHeader nh;
 


@@ -18,6 +17,11 @@ BTree::BTree (const std::string &name, unsigned int block_size, int kt, bool cre
        
        /* Inicializo el header */
        header.block_size = block_size;
        
        /* Inicializo el header */
        header.block_size = block_size;

+       header.tree_type = tt;
+       header.key_type = kt;
+       header.block_data_counter = 0;
+       strcpy (header.magic, "DILUMA");
+       header.magic[6] = '\0';

        WriteFileHeader ();
 
        /* Creo el primer bloque vacio */
        WriteFileHeader ();
 
        /* Creo el primer bloque vacio */


@@ -32,9 +36,75 @@ BTree::BTree (const std::string &name, unsigned int block_size, int kt, bool cre
        delete [] node;
 }
 
        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);
+       }
+
+       del = filename + ".blockdel";
+
+       fp = fopen (del.c_str (), "wb");
+       if (fp != NULL) {
+               uint i;
+
+               while (fread (&i, 1, sizeof (uint), fp)) {
+                       deleted_block_data.push_back (i);
+               }
+
+               fclose (fp);
+       }
+
+       fp = fopen (name.c_str(), "rb+");
+       if (!fp) {
+               /* TODO : mandar una exception ? */
+               return;
+       }
+       ReadFileHeader ();
+}
+

 BTree::~BTree ()
 {
        fclose (fp);
 BTree::~BTree ()
 {
        fclose (fp);

+
+       std::string del = filename + ".del";
+
+       fp = fopen (del.c_str (), "wb");
+       std::list<uint>::iterator it = deleted_nodes.begin ();
+
+       while (it != deleted_nodes.end ()) {
+               uint i = *it;
+               fwrite (&i, 1, sizeof (uint), fp);
+               it++;
+       }
+
+       del = filename + ".del";
+
+       fp = fopen (del.c_str (), "wb");
+       it = deleted_block_data.begin ();
+
+       while (it != deleted_block_data.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 ()
 }
 
 void BTree::WriteFileHeader ()


@@ -53,7 +123,18 @@ void BTree::WriteBlock (uchar *block, uint num)
 void BTree::AddKey (const Clave &k)
 {
        uint left, right;
 void BTree::AddKey (const Clave &k)
 {
        uint left, right;

-       Clave *kout = AddKeyR (k.Clone (), 0, left, right);
+       Clave *kout, *in;
+
+       in = k.Clone ();
+       in->SetBlockData ( GetNextBlockData () );
+
+       try {
+               kout = AddKeyR (in->Clone (), 0, left, right);
+       } catch (Exception *e) {
+               throw e;
+       }
+
+       delete in;

 
        if (kout) {
                unsigned short level;
 
        if (kout) {
                unsigned short level;


@@ -102,10 +183,19 @@ Clave* BTree::AddKeyR (const Clave *k, uint node_num, uint &left_child, uint &ri
        ReadNodoHeader (node, &node_header);
        delete [] node;
 
        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)
 }
 
 Clave* BTree::AddKeyLeafR (const Clave *k, uint node_num, uint &left_child, uint &right_child)


@@ -127,6 +217,14 @@ Clave* BTree::AddKeyLeafR (const Clave *k, uint node_num, uint &left_child, uint
 
                while (it != node_keys.end ()) {
                        datait = (*it);
 
                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;
                        if ((*data) < (*datait))
                                /* Me pase, lo agrego aca! */
                                break;


@@ -160,6 +258,13 @@ Clave* BTree::AddKeyLeafR (const Clave *k, uint node_num, uint &left_child, uint
                while (it != node_keys.end ()) {
                        BTreeData *datait;
                        datait = (*it);
                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;
                        if ((*data) < (*datait))
                                /* Me pase, lo agrego aca! */
                                break;


@@ -199,7 +304,7 @@ Clave* BTree::AddKeyLeafR (const Clave *k, uint node_num, uint &left_child, uint
                        used += d->Size ();
                        it++;
                }
                        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);
 
                while (it != node_keys.end ()) {
                        BTreeData *d = (*it);


@@ -253,6 +358,13 @@ Clave* BTree::AddKeyOtherR (const Clave *k, uint node_num, uint &left_child, uin
        posterior = it;
 
        while (it != node_keys.end ()) {
        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;
                if ((*data) < (*(*it)))
                        break;
                ultima = it;


@@ -260,9 +372,9 @@ Clave* BTree::AddKeyOtherR (const Clave *k, uint node_num, uint &left_child, uin
        }
 
        if (it == posterior) {
        }
 
        if (it == posterior) {

-               k = AddKeyR (k, lchild->getChild (), left_child, right_child);
+               k = AddKeyR (k, lchild->GetChild (), left_child, right_child);

        } else {
        } else {

-               k = AddKeyR (k, (*ultima)->getChild (), left_child, right_child);
+               k = AddKeyR (k, (*ultima)->GetChild (), left_child, right_child);

        }
        DeleteKeys (node_keys);
 
        }
        DeleteKeys (node_keys);
 


@@ -282,6 +394,13 @@ Clave* BTree::AddKeyOtherR (const Clave *k, uint node_num, uint &left_child, uin
 
                while (it != node_keys.end ()) {
                        datait = (*it);
 
                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;
                        if ((*data) < (*datait))
                                /* Me pase, lo agrego aca! */
                                break;


@@ -317,6 +436,13 @@ Clave* BTree::AddKeyOtherR (const Clave *k, uint node_num, uint &left_child, uin
                while (it != node_keys.end ()) {
                        BTreeData *datait;
                        datait = (*it);
                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;
                        if ((*data) < (*datait))
                                /* Me pase, lo agrego aca! */
                                break;


@@ -356,9 +482,9 @@ Clave* BTree::AddKeyOtherR (const Clave *k, uint node_num, uint &left_child, uin
                        used += d->Size ();
                        it++;
                }
                        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);
                it++;
                while (it != node_keys.end ()) {
                        BTreeData *d = (*it);


@@ -393,7 +519,9 @@ void BTree::DelKey (const Clave &k)
 {
        std::string s = k;
        std::cout << "========= Borrando " << s << " =================\n";
 {
        std::string s = k;
        std::cout << "========= Borrando " << s << " =================\n";

-       DelKeyR (new BTreeLeafData (k.Clone ()), 0, 0);
+       BTreeData *b = new BTreeLeafData (k.Clone ());
+       DelKeyR (b, 0, 0);
+       delete b;

 }
 
 void BTree::DelKeyR (BTreeData *k, uint node_num, uint padre)
 }
 
 void BTree::DelKeyR (BTreeData *k, uint node_num, uint padre)


@@ -420,19 +548,21 @@ void BTree::DelKeyR (BTreeData *k, uint node_num, uint padre)
                if ((*k) == (*(*it))) {
                        /* La encontre!, retorno */
                        if (node_header.level == 0) {
                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) {
                        } else {
                                uint left, right;
                                if (it == posterior) {

-                                       left = lchild->getChild ();
-                                       right = (*it)->getChild ();
+                                       left = lchild->GetChild ();
+                                       right = (*it)->GetChild ();

                                } else {
                                } 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;
                                }
                                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;
                }
 
                        return;
                }
 


@@ -452,9 +582,9 @@ void BTree::DelKeyR (BTreeData *k, uint node_num, uint padre)
 
        /* TODO: Aca faltaria liberar memoria */
        if (it == posterior) {
 
        /* TODO: Aca faltaria liberar memoria */
        if (it == posterior) {

-               DelKeyR (k, lchild->getChild (), node_num);
+               DelKeyR (k, lchild->GetChild (), node_num);

        } else {
        } else {

-               DelKeyR (k, (*ultima)->getChild (), node_num);
+               DelKeyR (k, (*ultima)->GetChild (), node_num);

        }
 }
 
        }
 }
 


@@ -469,13 +599,16 @@ void BTree::DelKeyFromLeaf (Clave *k, uint node_num, uint padre)
        ReadNodoHeader (node, &node_header);
        node_keys = ReadKeys (node, node_header);
 
        ReadNodoHeader (node, &node_header);
        node_keys = ReadKeys (node, node_header);
 

-       data = new BTreeLeafData (k);
+       data = new BTreeLeafData (k->Clone ());

 
        std::list<BTreeData *>::iterator it;
        it = node_keys.begin ();
        while (it != node_keys.end ()) {
                if ((*data) == (*(*it))) {
 
        std::list<BTreeData *>::iterator it;
        it = node_keys.begin ();
        while (it != node_keys.end ()) {
                if ((*data) == (*(*it))) {

+                       BTreeData *aborrar = (*it);

                        node_keys.erase (it);
                        node_keys.erase (it);

+                       deleted_block_data.push_back (aborrar->GetKey ()->GetBlockData ());
+                       delete aborrar;

                        break;
                }
                it++;
                        break;
                }
                it++;


@@ -483,9 +616,6 @@ void BTree::DelKeyFromLeaf (Clave *k, uint node_num, uint padre)
 
        delete data;
 
 
        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);
        WriteKeys (node, node_header, node_keys);
        WriteNodoHeader (node, &node_header);
        WriteBlock (node, node_num);


@@ -516,17 +646,23 @@ void BTree::DelKeyFromLeaf (Clave *k, uint node_num, uint padre)
                } else {
                        std::cout << "NADIE ME PUEDE PRESTAR, FUNDIR NODOS\n";
                        uint join1, join2;
                } 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;
                        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;
                        } 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;
                }
 
                        return;
                }
 


@@ -540,12 +676,29 @@ void BTree::DelKeyFromLeaf (Clave *k, uint node_num, uint padre)
        std::cout << "Borrado de una hoja listo\n";
 }
 
        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<BTreeData *> nk1, nk2, nkpadre;
 
 {
        uchar *n1, *n2, *npadre;
        BTreeNodeHeader nh1, nh2, nhp;
        std::list<BTreeData *> 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);
        /* Leo los nodos */
        n1 = ReadBlock (node1);
        n2 = ReadBlock (node2);


@@ -567,26 +720,31 @@ void BTree::JoinNodes (uint node1, uint node2, uint padre)
        nk2 = ReadKeys (n2, nh2);
        nkpadre = ReadKeys (npadre, nhp);
 
        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<BTreeData *>::iterator it = nkpadre.begin ();
        std::list<BTreeData *>::iterator borrar_padre;
        std::list<BTreeData *>::iterator sig;
        std::list<BTreeData *>::iterator it = nkpadre.begin ();
        std::list<BTreeData *>::iterator borrar_padre;
        std::list<BTreeData *>::iterator sig;

+       std::list<BTreeData *>::iterator anterior = it;

        
        Clave *cpadre;
        BTreeData *lchild = (*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 ()) {
                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++;
                }
                        it++;
                }

-               cpadre = (*it)->getClave ();
-               //nkpadre.erase (it);
+               cpadre = (*it)->GetKey ();

                borrar_padre = it;
        }
        if (it == nkpadre.end ()) {
                borrar_padre = it;
        }
        if (it == nkpadre.end ()) {


@@ -601,14 +759,14 @@ void BTree::JoinNodes (uint node1, uint node2, uint padre)
 
        i = nk1.begin ();
        while (i != nk1.end ()) {
 
        i = nk1.begin ();
        while (i != nk1.end ()) {

-               newkeys.push_back ( new BTreeLeafData ((*i)->getClave ()->Clone ()));
+               newkeys.push_back ( new BTreeLeafData ((*i)->GetKey ()->Clone ()));

                i++;
        }
                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 (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++;
        }
 
                i++;
        }
 


@@ -618,27 +776,41 @@ void BTree::JoinNodes (uint node1, uint node2, uint padre)
                exit (1);
        }
 
                exit (1);
        }
 

-/*     if (padre == 0) {
+       /* 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);
                nhp.level = 0;
                WriteKeys (npadre, nhp, newkeys);
                WriteNodoHeader (npadre, &nhp);

-               WriteBlock (npadre, padre);*/
+               WriteBlock (npadre, padre);

 
 

-        /* TODO: Recuperar nodo1 y nodo2 */
-//     } else {
+               deleted_nodes.push_back (node1);
+               deleted_nodes.push_back (node2);
+       } else {

                WriteKeys (n1, nh1, newkeys);
                WriteNodoHeader (n1, &nh1);
                WriteBlock (n1, node1);
 
                WriteKeys (n1, nh1, newkeys);
                WriteNodoHeader (n1, &nh1);
                WriteBlock (n1, node1);
 

-               /* TODO : Recuperar node2 */
+               deleted_nodes.push_back (node2);
+

                /* Actualizo punero al padre */
                /* Actualizo punero al padre */

-               (*sig)->setChild (node1);
+               (*anterior)->SetChild (node1);

        
                nkpadre.erase (borrar_padre);
                WriteKeys (npadre, nhp, nkpadre);
                WriteNodoHeader (npadre, &nhp);
                WriteBlock (npadre, padre);
        
                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 (nk1);
        DeleteKeys (nk2);


@@ -686,12 +858,12 @@ Clave *BTree::GetKey (uint node_num, char maxmin)
        }
 
        if (maxmin == 0) {
        }
 
        if (maxmin == 0) {

-               k = (*it)->getClave ()->Clone ();
+               k = (*it)->GetKey ()->Clone ();

                node_keys.erase (it);
        } else {
                it = node_keys.end ();
                it--;
                node_keys.erase (it);
        } else {
                it = node_keys.end ();
                it--;

-               k = (*it)->getClave ()->Clone ();
+               k = (*it)->GetKey ()->Clone ();

                node_keys.erase (it);
        }
 
                node_keys.erase (it);
        }
 


@@ -721,28 +893,28 @@ void BTree::FindBrothers (uint node_num, uint padre, uint &left, uint &right)
 
        BTreeData *lchild = (*it++);
 
 
        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;
                /* 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 ()) {
                return;
        }
 
        while (it != node_keys.end ()) {

-               if ((*it)->getChild () == node_num)
+               if ((*it)->GetChild () == node_num)

                        break;
                anterior = it;
                it++;
        }
        siguiente = it++;
 
                        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 ()) {
        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;
        } else {
                right = 0;
                std::cout << "Hermano Derecho   : NO TENGO" << std::endl;


@@ -765,9 +937,9 @@ Clave *BTree::ReplaceKeyInFather (uint node_num, uint padre, Clave *k)
 
        BTreeData *lchild = (*it++);
 
 
        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);
 
                WriteKeys (node, node_header, node_keys);
                WriteNodoHeader (node, &node_header);


@@ -779,14 +951,14 @@ Clave *BTree::ReplaceKeyInFather (uint node_num, uint padre, Clave *k)
        }
 
        while (it != node_keys.end ()) {
        }
 
        while (it != node_keys.end ()) {

-               if ((*it)->getChild () == node_num)
+               if ((*it)->GetChild () == node_num)

                        break;
                anterior = it;
                it++;
        }
 
                        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);
 
        WriteKeys (node, node_header, node_keys);
        WriteNodoHeader (node, &node_header);


@@ -804,7 +976,7 @@ void BTree::DelKeyFromNode (Clave *k, uint node_num, uint padre, uint left, uint
        BTreeNodeHeader node_header;
        std::list<BTreeData *> node_keys;
 
        BTreeNodeHeader node_header;
        std::list<BTreeData *> node_keys;
 

-       node = ReadBlock (padre);
+       node = ReadBlock (node_num);

        ReadNodoHeader (node, &node_header);
        node_keys = ReadKeys (node, node_header);
 
        ReadNodoHeader (node, &node_header);
        node_keys = ReadKeys (node, node_header);
 


@@ -824,7 +996,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;
                                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;
 
                                DeleteKeys (node_keyr);
                                delete [] node_r;


@@ -844,6 +1016,10 @@ void BTree::DelKeyFromNode (Clave *k, uint node_num, uint padre, uint left, uint
 
                std::list<BTreeData *>::iterator it = node_keys.begin ();
                while (it != node_keys.end ()) {
 
                std::list<BTreeData *>::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;
                        }
                        if ((*data) == (*(*it))) {
                                break;
                        }


@@ -856,15 +1032,15 @@ void BTree::DelKeyFromNode (Clave *k, uint node_num, uint padre, uint left, uint
                        PrintNode (node_num);
                        exit (1);
                }
                        PrintNode (node_num);
                        exit (1);
                }

-               (*it)->setClave (reemplazar->getClave ());
-               reemplazar->setClave (k->Clone ());
+               (*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);
 
                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;
 
                DeleteKeys (node_keys);
                delete [] node;
 


@@ -875,7 +1051,8 @@ void BTree::DelKeyFromNode (Clave *k, uint node_num, uint padre, uint left, uint
                delete [] node_r;
 
                std::cout << "Grabe todo en disco ...\n";
                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";
 
                /* Ahora debo eliminar la clave que puse en el nodo hoja */
                std::cout << "Borro la clave desde la hoja!\n";
 


@@ -933,26 +1110,54 @@ std::list<BTreeData *> BTree::ReadKeys (uchar *node, BTreeNodeHeader &node_heade
        }
 
        for (uint i=0; i<count; i++) {
        }
 
        for (uint i=0; i<count; i++) {

-               /* TODO : El tipo de clave deberia ser usado 
-                * dependiendo de algun dato en el header del
-                * arbol
-                */
-               /* TODO : Detectar si estoy en una hoja */

                BTreeData *data;
                if (node_header.level == 0) {
                BTreeData *data;
                if (node_header.level == 0) {

-                       data = new BTreeLeafData (node, key_type);
+                       data = new BTreeLeafData (node, header.key_type);

                } else {
                } else {

-                       data = new BTreeData (node, key_type);
+                       data = new BTreeData (node, header.key_type);

                }
                node += data->Size ();
                keys.push_back (data);
        }
 
                }
                node += data->Size ();
                keys.push_back (data);
        }
 

+       DeAbrevKey (keys);

        return keys;
 }
 
        return keys;
 }
 

+void BTree::AbrevKey (std::list<BTreeData *> &lst)
+{
+       /* Claves Fijas No se abrevian */
+       if (header.key_type == KEY_FIXED) return;
+
+       BTreeData *primera = NULL;
+       std::list<BTreeData *>::iterator it = lst.begin ();
+
+       while (it != lst.end ()) {
+               if ((*it)->Abrev (primera) == false)
+                       primera = (*it);
+               it++;
+       }
+}
+
+void BTree::DeAbrevKey (std::list<BTreeData *> &lst)
+{
+       /* Claves Fijas No se abrevian */
+       if (header.key_type == KEY_FIXED) return;
+
+       BTreeData *primera = NULL;
+       std::list<BTreeData *>::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<BTreeData *> &keys)
 {
 void BTree::WriteKeys (uchar *node, BTreeNodeHeader &node_header, std::list<BTreeData *> &keys)
 {

+       AbrevKey (keys);
+

        std::list<BTreeData *>::iterator it = keys.begin ();
 
        node += sizeof (BTreeNodeHeader);
        std::list<BTreeData *>::iterator it = keys.begin ();
 
        node += sizeof (BTreeNodeHeader);


@@ -974,7 +1179,7 @@ void BTree::WriteKeys (uchar *node, BTreeNodeHeader &node_header, std::list<BTre
                it++;
        }
 
                it++;
        }
 

-       /* TODO : incrementar node_header.item_count aca o fuera de este metodo? */
+       DeAbrevKey (keys);

 }
                
 void BTree::PrintNode (uint num)
 }
                
 void BTree::PrintNode (uint num)


@@ -1007,11 +1212,18 @@ uchar *BTree::NewBlock (uint &num)
        uchar *node;
        BTreeNodeHeader nh;
 
        uchar *node;
        BTreeNodeHeader nh;
 

-       fseek (fp, 0, SEEK_END);
-       filelen = ftell (fp);
+       std::list<uint>::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;
        node = new uchar[header.block_size];
        ReadNodoHeader (node, &nh);
        nh.level = 0;


@@ -1051,18 +1263,20 @@ BTreeFindResult *BTree::FindKeyR (const Clave *k, uint node_num)
 
        BTreeData *data;
        if (node_header.level == 0)
 
        BTreeData *data;
        if (node_header.level == 0)

-               data = new BTreeLeafData ((Clave *)k);
+               data = new BTreeLeafData (k->Clone ());

        else
        else

-               data = new BTreeData ((Clave *)k, 0);
+               data = new BTreeData (k->Clone (), 0);

 
        while (it != node_keys.end ()) {
                if ((*data) == (*(*it))) {
                        /* La encontre!, retorno */
 
        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;
                        delete [] node;
                        DeleteKeys (node_keys);
                        BTreeFindResult *result = new BTreeFindResult ();
                        result->node = node_num;
                        result->header = node_header;

+

                        return result;
                }
 
                        return result;
                }
 


@@ -1072,11 +1286,27 @@ BTreeFindResult *BTree::FindKeyR (const Clave *k, uint node_num)
                it++;
        }
 
                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 */
        /* TODO: Aca faltaria liberar memoria */

+       BTreeFindResult *ret;

        if (it == posterior)
        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<BTreeData *> &keys)
 }
 
 void BTree::DeleteKeys (std::list<BTreeData *> &keys)


@@ -1089,3 +1319,23 @@ void BTree::DeleteKeys (std::list<BTreeData *> &keys)
                it++;
        }
 }
                it++;
        }
 }

+
+int BTree::type () const
+{
+       return header.key_type;
+}
+
+uint BTree::GetNextBlockData ()
+{
+       uint n;
+       if (deleted_block_data.size ()) {
+               std::list<uint>::iterator it = deleted_block_data.begin ();
+               n = *it;
+               deleted_block_data.erase (it);
+       } else {
+               n = header.block_data_counter++;
+       }
+
+       return n;
+}
+