Cerrando el ciclo de llenar una hoja

diff --git a/src/btree.cpp b/src/btree.cpp
index 8f18c66263cebb43ad55af4f9a3a14e4772d5f35..dd0551d378af6bc84198bd5620139dc5bface11d 100644 (file)
--- a/src/btree.cpp
+++ b/src/btree.cpp
@@ -63,17 +63,16 @@ Clave* BTree::AddKeyR (const Clave *k, uint node_num)
        BTreeNodeHeader node_header;
        ReadNodoHeader (node, &node_header);
 
        BTreeNodeHeader node_header;
        ReadNodoHeader (node, &node_header);
 

-       node_keys = ReadKeys (node, node_header);
-       
-       if (node_header.free_space >= k->Size ()) {
+       BTreeLeafData data (k->Clone ());
+
+       if (node_header.free_space > data.Size ()) {

                /* TODO : Insertar ordenado */
                /* TODO : Insertar ordenado */

-               /* Siempre se agrega en una hoja */
-               node_keys.push_back (BTreeLeafData (k->Clone ()));
+               node_keys = ReadKeys (node, node_header);
+               node_keys.push_back (data);

 
                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);

-               delete [] node;

        } else {
                /* Split */
                /* Lo que debe pasar :
        } else {
                /* Split */
                /* Lo que debe pasar :


@@ -82,6 +81,7 @@ Clave* BTree::AddKeyR (const Clave *k, uint node_num)
                 *  3) kout = clave del medio y mandarla al padre
                 */
                std::cout << "SPLIT" << std::endl;
                 *  3) kout = clave del medio y mandarla al padre
                 */
                std::cout << "SPLIT" << std::endl;

+               delete [] node;

        }
 
        return kout;
        }
 
        return kout;


@@ -120,7 +120,11 @@ std::list<BTreeData> BTree::ReadKeys (uchar *node, BTreeNodeHeader &node_header)
                 * arbol
                 */
                /* TODO : Detectar si estoy en una hoja */
                 * arbol
                 */
                /* TODO : Detectar si estoy en una hoja */

-               BTreeData data(node);
+               BTreeData data;
+               if (node_header.level == 0)
+                       data = BTreeLeafData (node);
+               else
+                       data = BTreeData (node);

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

diff --git a/src/btree_data.h b/src/btree_data.h
index d920c9f208b58b064d0c856c360989c127a04bcb..b59004061f10d674da5d1346991f637fe2fd9956 100644 (file)
--- a/src/btree_data.h
+++ b/src/btree_data.h
@@ -25,6 +25,7 @@ class BTreeData {
 class BTreeLeafData:public BTreeData {
        public:
                BTreeLeafData (Clave *k):BTreeData () { clave = k; }
 class BTreeLeafData:public BTreeData {
        public:
                BTreeLeafData (Clave *k):BTreeData () { clave = k; }

+               BTreeLeafData (uchar *node) { clave = new ClaveFija (node); }

                virtual ~BTreeLeafData ();
 
                virtual uint Size ();
                virtual ~BTreeLeafData ();
 
                virtual uint Size ();