Fixes y mucho verbose.

diff --git a/src/btree.cpp b/src/btree.cpp
index 7a3daafd49a7dcac85d2565013d7503c0e7a9f4e..38de680d6356bbc600046914b1e1b23717964b31 100644 (file)
--- a/src/btree.cpp
+++ b/src/btree.cpp
@@ -391,6 +391,8 @@ Clave* BTree::AddKeyOtherR (const Clave *k, uint node_num, uint &left_child, uin
 
 void BTree::DelKey (const Clave &k) 
 {
+       std::string s = k;
+       std::cout << "========= Borrando " << s << " =================\n";
        DelKeyR (new BTreeLeafData (k.Clone ()), 0, 0);
 }
 
@@ -444,7 +446,7 @@ 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;
        }
 
@@ -489,7 +491,8 @@ void BTree::DelKeyFromLeaf (Clave *k, uint node_num, uint padre)
        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;
@@ -514,9 +517,11 @@ void BTree::DelKeyFromLeaf (Clave *k, uint node_num, uint padre)
                        std::cout << "NADIE ME PUEDE PRESTAR, FUNDIR NODOS\n";
                        uint join1, join2;
                        if (hi != 0) {
+                               std::cout << "Join con Hermano Izquierdo\n";
                                join1 = hi;
                                join2 = node_num;
                        } else {
+                               std::cout << "Join con Hermano Derecho\n";
                                join1 = node_num;
                                join2 = hd;
                        }
@@ -550,12 +555,21 @@ 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 */
        std::list<BTreeData *>::iterator it = nkpadre.begin ();
+       std::list<BTreeData *>::iterator borrar_padre;
        std::list<BTreeData *>::iterator sig;
        
        Clave *cpadre;
@@ -563,7 +577,8 @@ void BTree::JoinNodes (uint node1, uint node2, uint padre)
 
        if (lchild->getChild () == node1) {
                cpadre = (*it)->getClave ();
-               nkpadre.erase (it);
+               //nkpadre.erase (it);
+               borrar_padre = it;
        } else {
                while (it != nkpadre.end ()) {
                        if ((*it)->getChild () == node1)
@@ -571,9 +586,15 @@ void BTree::JoinNodes (uint node1, uint node2, uint padre)
                        it++;
                }
                cpadre = (*it)->getClave ();
-               nkpadre.erase (it);
+               //nkpadre.erase (it);
+               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<BTreeData *> newkeys;
        std::list<BTreeData *>::iterator i;
@@ -591,13 +612,19 @@ void BTree::JoinNodes (uint node1, uint node2, uint padre)
                i++;
        }
 
+       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);
+       }
+
        if (padre == 0) {
                nhp.level = 0;
                WriteKeys (npadre, nhp, newkeys);
                WriteNodoHeader (npadre, &nhp);
                WriteBlock (npadre, padre);
 
-               /* TODO: Recuperar nodo1 y nodo2 */
+        /* TODO: Recuperar nodo1 y nodo2 */
        } else {
                WriteKeys (n1, nh1, newkeys);
                WriteNodoHeader (n1, &nh1);
@@ -606,6 +633,8 @@ void BTree::JoinNodes (uint node1, uint node2, uint padre)
                /* TODO : Recuperar node2 */
                /* Actualizo punero al padre */
                (*sig)->setChild (node1);
+       
+               nkpadre.erase (borrar_padre);
                WriteKeys (npadre, nhp, nkpadre);
                WriteNodoHeader (npadre, &nhp);
                WriteBlock (npadre, padre);
@@ -623,7 +652,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 +670,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);
@@ -814,6 +849,13 @@ void BTree::DelKeyFromNode (Clave *k, uint node_num, uint padre, uint left, uint
                        }
                        it++;
                }
+               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)->setClave (reemplazar->getClave ());
                reemplazar->setClave (k->Clone ());
 
@@ -841,8 +883,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);
        }
 }
 
@@ -915,9 +960,12 @@ void BTree::WriteKeys (uchar *node, BTreeNodeHeader &node_header, std::list<BTre
        node_header.item_count = 0;
        node_header.free_space = header.block_size - sizeof (BTreeNodeHeader);
 
+       uint acumulado = 0;
        while (it != keys.end ()) {
                BTreeData *d = (*it);
                uchar *n = d->ToArray ();
+               acumulado += d->Size ();
+               //std::cout << "WriteKeys :: Acumulado = " << acumulado << std::endl;
                memcpy (node, n, d->Size ());
                delete [] n;
                node += d->Size ();

diff --git a/src/main.cpp b/src/main.cpp
index 1eedc01920b41da513b7f3166e35514ec0b742c5..266ba1db03325096792a0f0f85311261e8226e70 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2,61 +2,61 @@
 
 #include "btree.h"
 #include "clave_fija.h"
-
-void generar_random (std::list<int> &lst, uint n);
+#include "random.h"
 
 int main  (int argc, char *argv[])
 {
-       std::list<int> lst;
+       int bloque, altas, bajas;
 
-       BTree tree ("test.idx", 64);
-       
-       if (argc != 2) {
-               printf ("Falta parametro cantidad de elementos a agregar\n");
+       if (argc != 4) {
+               printf ("Uso : %s <block size> <cantidad de altas> <cantidad de bajas>\n", argv[0]);
                return 1;
        }
 
-       generar_random (lst, atoi(argv[1]));
+       bloque = atoi (argv[1]);
+       altas = atoi (argv[2]);
+       bajas = atoi (argv[3]);
 
-       std::list<int>::iterator it = lst.begin ();
-       while (it != lst.end ()) {
-               ClaveFija c(*it);
+       BTree tree ("test.idx", bloque);
+       
+       std::list<int> lst;
+       std::list<int>::iterator it;
+       Random::Init ();
+       Random::Ints (lst, altas);
 
-               std::cout << "Agregando " << (*it) << std::endl;
-               tree.AddKey (c);
-               it++;
-       }
+       double paltas = bajas / (double)altas;
 
        it = lst.begin ();
+       uint i = 0;
        while (it != lst.end ()) {
                ClaveFija c(*it);
 
-               if (tree.FindKey (c))
-                       std::cout << (*it) << " encontrada\n";
-               else
-                       std::cout << (*it) << " NO encontrada\n";
+               double l = Random::Double (0.0f, 1.0f);
+               std::cout << l << " >= " << paltas << std::endl;
+               if (l >= paltas) {
+                       tree.AddKey (c);
+                       i++;
+               } else {
+                       /* Tengo que borrar una clave entre 0 e "i" de la lista
+                        * porque son las que ya agregue. */
+                       int aborrar = (int)Random::Double (0, i) - 1;
+                       std::list<int>::iterator otro = lst.begin ();
+                       int j = 0;
+                       while (j < aborrar) {
+                               otro++;
+                               j++;
+                       }
+                       ClaveFija c(*otro);
+
+                       tree.DelKey (c);
+                       std::string sss = c;
+                       std::cout << "Clave Borrada " << sss << std::endl;
+               }
+
                it++;
        }
 
+       /* TODO : Hacer verificacion de claves :) */
        return 0;
 }
 
-void generar_random (std::list<int> &lst, uint n)
-{
-       /* Genero N numeros aleatorios entre -3*n y 3*n */
-       bool *numeros = new bool [6*n+1];
-       int random;
-
-       memset (numeros, 0, (6*n+1)*sizeof (bool));
-
-       srand (time (NULL));
-       for (uint i=0; i < n; i++) {
-               do {
-                       random = 1 + (int)(6.0f * n * rand () / (RAND_MAX + 1.0f) - 3.0f * n);
-                       std::cout << random << std::endl;
-               } while (numeros[random + 3 * n] == true);
-               numeros[random + 3 * n] = true;
-               lst.push_back (random);
-       }
-}
-

diff --git a/src/main_con_delete.cpp b/src/main_con_delete.cpp
index 79c4717076e4329dfc2014e6f5487f65c28d3fb1..baa1d785c130a06a90dde704d448d874d77ef5b1 100644 (file)
--- a/src/main_con_delete.cpp
+++ b/src/main_con_delete.cpp
@@ -31,11 +31,11 @@ int main  (int argc, char *argv[])
        tree.PrintNode (1);
        std::cout << "\n\n";
        tree.PrintNode (2);
+       std::cout << "\n\n";
        {
-               ClaveFija c(5);
+               ClaveFija c(6);
                tree.DelKey (c);
        }
-       std::cout << "\n\n";
        tree.PrintNode (0);
        std::cout << "\n\n";
        tree.PrintNode (1);