Fix Insertar con algunos datos que me estaban fantando.

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

diff --git a/src/btree.cpp b/src/btree.cpp
index e28bf9e8e6a21b489bcc6c4e8d690e127e0eb567..48f4937a1952e23b662645e9251f7c0cd4bfeb71 100644 (file)
--- a/src/btree.cpp
+++ b/src/btree.cpp
@@ -132,8 +132,9 @@ Clave* BTree::AddKeyR (const Clave *k, uint node_num, uint &left_child, uint &ri
                        std::cout << "==== Me voy al nodo " << (*ultima)->getChild () << std::endl;
                        k = AddKeyR (k, (*ultima)->getChild (), left_child, right_child);
                }
-               if (k)
+               if (k) {
                        data = new BTreeData (k->Clone (), right_child);
+               }
        }
 
 
@@ -170,19 +171,28 @@ Clave* BTree::AddKeyR (const Clave *k, uint node_num, uint &left_child, uint &ri
                uint new_node_num;
                uchar *new_node = NewBlock (new_node_num);
                ReadNodoHeader (new_node, &new_node_header);
+               new_node_header.level = node_header.level;
 
                node_keys = ReadKeys (node, node_header);
                new_node_keys = ReadKeys (new_node, new_node_header);
 
                /* Agrego la clave en la lista que ya tengo de manera ordenada */
                std::list<BTreeData *>::iterator it = node_keys.begin ();
+               std::list<BTreeData *>::iterator previt = node_keys.begin ();
 
+               if (node_header.level != 0) {
+                       /* La primera es ChildData */
+                       it++;
+                       previt = it;
+               }
+       
                while (it != node_keys.end ()) {
                        BTreeData *datait;
                        datait = (*it);
                        if ((*data) < (*datait))
                                /* Me pase, lo agrego aca! */
                                break;
+                       previt = it;
                        it++;
                }
                if (it != node_keys.end ())
@@ -218,7 +228,14 @@ Clave* BTree::AddKeyR (const Clave *k, uint node_num, uint &left_child, uint &ri
                        used += d->Size ();
                        it++;
                }
-               kout = (*it++)->getClave (); // Esta se retorna al "padre" para que se la agregue
+               kout = (*it)->getClave (); // Esta se retorna al "padre" para que se la agregue
+               if (node_header.level != 0) {
+                       new_node_keys.push_back ( new BTreeChildData ((*it)->getChild ()));
+               }
+               it++;
+
+               std::string s = *kout;
+               std::cout << "SPLIT Retorna : " << s << std::endl;
                while (it != node_keys.end ()) {
                        BTreeData *d = (*it);
                        new_node_keys.push_back (d);