Actualizacion de los headers del nodo

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

diff --git a/src/btree.cpp b/src/btree.cpp
index cf01b2c6ea1cba869f63b7969568ec4734189146..5df88a2dc4b6156afa1e39f14f1fc148c1a9770e 100644 (file)
--- a/src/btree.cpp
+++ b/src/btree.cpp
@@ -55,7 +55,7 @@ void BTree::AddKey (const Clave &k)
 
 Clave* BTree::AddKeyR (const Clave *k, uint node_num)
 {
 
 Clave* BTree::AddKeyR (const Clave *k, uint node_num)
 {

-       Clave *kout;
+       Clave *kout = NULL;

        std::list<BTreeData> node_keys;
 
        /* Leo el nodo raiz para empezar a agregar */
        std::list<BTreeData> node_keys;
 
        /* Leo el nodo raiz para empezar a agregar */


@@ -67,18 +67,23 @@ Clave* BTree::AddKeyR (const Clave *k, uint node_num)
        
        if (node_header.free_space >= k->Size ()) {
                /* TODO : Insertar ordenado */
        
        if (node_header.free_space >= k->Size ()) {
                /* TODO : Insertar ordenado */

-               //node_keys.push_back (BTreek->Clone ());
+               /* Siempre se agrega en una hoja */
+               node_keys.push_back (BTreeLeafData (k->Clone ()));
+
+               WriteKeys (node, node_header, node_keys);
+               WriteNodoHeader (node, &node_header);
+               WriteBlock (node, node_num);
+               delete [] node;

        } else {
                /* Split */
        } else {
                /* Split */

+               /* Lo que debe pasar :
+                *  1) Separar N/2 claves en "nodo"
+                *  2) Separar N/2-1 claves en un nuevo nodo
+                *  3) kout = clave del medio y mandarla al padre
+                */
+               std::cout << "SPLIT" << std::endl;

        }
 
        }
 

-       
-       WriteKeys (node, node_header, node_keys);
-       WriteNodoHeader (node, &node_header);
-       WriteBlock (node, node_num);
-
-       delete [] node;
-

        return kout;
 }
 
        return kout;
 }
 


@@ -129,10 +134,15 @@ void BTree::WriteKeys (uchar *node, BTreeNodeHeader &node_header, std::list<BTre
 
        node += sizeof (BTreeNodeHeader);
 
 
        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 ();
        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++;
        }
 
                it++;
        }