Cerrando el ciclo de llenar una hoja

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

diff --git a/src/btree.cpp b/src/btree.cpp
index 38873c683b368bb0e39d3ff58f248d21a4a5448b..dd0551d378af6bc84198bd5620139dc5bface11d 100644 (file)
--- a/src/btree.cpp
+++ b/src/btree.cpp
@@ -6,7 +6,7 @@ BTree::BTree (const std::string &name, unsigned int block_size, bool create_new_
        uchar *node;
        BTreeNodeHeader nh;
 
-       fp = fopen (name.c_str(), "wb");
+       fp = fopen (name.c_str(), "wb+");
        if (!fp) {
                /* TODO : mandar una exception ? */
                return;
@@ -63,17 +63,16 @@ Clave* BTree::AddKeyR (const Clave *k, uint node_num)
        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 */
-               /* 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);
-               delete [] node;
        } 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;
+               delete [] node;
        }
 
        return kout;
@@ -120,7 +120,11 @@ std::list<BTreeData> BTree::ReadKeys (uchar *node, BTreeNodeHeader &node_header)
                 * 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);
        }
@@ -134,10 +138,15 @@ void BTree::WriteKeys (uchar *node, BTreeNodeHeader &node_header, std::list<BTre
 
        node += sizeof (BTreeNodeHeader);
 
+       node_header.item_count = 0;
+       node_header.free_space = header.block_size - sizeof (BTreeNodeHeader);
+
        while (it != keys.end ()) {
                BTreeData d = (*it);
                memcpy (node, d.ToArray(), d.Size ());
                node += d.Size ();
+               node_header.free_space -= d.Size ();
+               node_header.item_count++;
                it++;
        }