Poniendole forma al Agregar.

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

diff --git a/src/btree.cpp b/src/btree.cpp
index 8f18c66263cebb43ad55af4f9a3a14e4772d5f35..fc0a5e926f27973bb60c2c82619d4f4d8551e0a4 100644 (file)
--- a/src/btree.cpp
+++ b/src/btree.cpp
@@ -63,17 +63,36 @@ 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 ()) {
-               /* TODO : Insertar ordenado */
-               /* Siempre se agrega en una hoja */
-               node_keys.push_back (BTreeLeafData (k->Clone ()));
+       if (node_header.level != 0) {
+               /* No estoy en una hoja, asi que tengo que buscar
+                * para donde moverme para agregar la clave
+                */
+               /* TODO :) */
+       }

 
 

+
+       /* Estoy en una hoja, veo si lo puedo agregar */
+       BTreeLeafData data (k->Clone ());
+
+       if (node_header.free_space > data.Size ()) {
+               /* TODO : Insertar ordenado */
+               BTreeData datait;
+
+               node_keys = ReadKeys (node, node_header);
+               std::list<BTreeData>::iterator it = node_keys.begin ();
+
+               while (it != node_keys.end ()) {
+                       datait = (*it);
+                       if (data < datait)
+                               /* Me pase, lo agrego aca! */
+                               break;
+               }
+               node_keys.insert (it, 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;
+
+               PrintNode (node_num);

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


@@ -82,6 +101,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 +140,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);
        }


@@ -148,3 +172,23 @@ void BTree::WriteKeys (uchar *node, BTreeNodeHeader &node_header, std::list<BTre
 
        /* TODO : incrementar node_header.item_count aca o fuera de este metodo? */
 }
 
        /* TODO : incrementar node_header.item_count aca o fuera de este metodo? */
 }

+               
+void BTree::PrintNode (uint num)
+{
+       uchar *node = ReadBlock (num);
+       BTreeNodeHeader node_header;
+       ReadNodoHeader (node, &node_header);
+               
+       std::list<BTreeData> node_keys = ReadKeys (node, node_header);
+       std::list<BTreeData>::iterator it = node_keys.begin ();
+
+       std::cout << "Nodo  : " << num << std::endl;
+       std::cout << "Items : " << node_header.item_count << std::endl;
+       std::cout << "Free  : " << node_header.free_space << " (" << (header.block_size - sizeof (BTreeNodeHeader)) << ")" << std::endl;
+       while (it != node_keys.end ()) {
+               std::string s = (*it);
+               std::cout << "(" << s << ") "; 
+       }
+       std::cout << std::endl;
+}
+