Evito un par de loops infinitos.

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

diff --git a/src/btree.cpp b/src/btree.cpp
index 4d28e4989d4cb905d87bd8880ec808dabc6d9e58..093377bec0b00024fd9f6f38d07e991b78369b30 100644 (file)
--- a/src/btree.cpp
+++ b/src/btree.cpp
@@ -131,7 +131,6 @@ Clave* BTree::AddKeyR (const Clave *k, uint node_num, uint &left_child, uint &ri
                        if ((*data) < (*datait))
                                /* Me pase, lo agrego aca! */
                                break;
                        if ((*data) < (*datait))
                                /* Me pase, lo agrego aca! */
                                break;

-                       it++;

                }
                node_keys.insert (it, data);
                WriteKeys (node, node_header, node_keys);
                }
                node_keys.insert (it, data);
                WriteKeys (node, node_header, node_keys);


@@ -250,6 +249,7 @@ std::list<BTreeData *> BTree::ReadKeys (uchar *node, BTreeNodeHeader &node_heade
 {
        std::list<BTreeData *> keys;
        node += sizeof (BTreeNodeHeader);
 {
        std::list<BTreeData *> keys;
        node += sizeof (BTreeNodeHeader);

+       uint count = node_header.item_count;

 
        if (node_header.item_count == 0) return keys;
 
 
        if (node_header.item_count == 0) return keys;
 


@@ -258,9 +258,10 @@ std::list<BTreeData *> BTree::ReadKeys (uchar *node, BTreeNodeHeader &node_heade
                BTreeChildData *d = new BTreeChildData (node);
                node += d->Size ();
                keys.push_back (d);
                BTreeChildData *d = new BTreeChildData (node);
                node += d->Size ();
                keys.push_back (d);

+               count--;

        }
 
        }
 

-       for (uint i=0; i<node_header.item_count; i++) {
+       for (uint i=0; i<count; i++) {

                /* TODO : El tipo de clave deberia ser usado 
                 * dependiendo de algun dato en el header del
                 * arbol
                /* TODO : El tipo de clave deberia ser usado 
                 * dependiendo de algun dato en el header del
                 * arbol


@@ -314,9 +315,8 @@ void BTree::PrintNode (uint num)
        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::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 << " ";
-               it++;
+               std::string s = (*it);
+               std::cout << "(" << s << ") "; 

        }
        std::cout << std::endl;
 
        }
        std::cout << std::endl;