tagged 1.1

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

diff --git a/src/btree.cpp b/src/btree.cpp
index fc62f5ba108079ad1de6177848f5ad49e1ba88f6..cce07595dbae924ffd7fdd431c014c031e350758 100644 (file)
--- a/src/btree.cpp
+++ b/src/btree.cpp
@@ -20,6 +20,8 @@ BTree::BTree (const std::string &name, unsigned int block_size, int tt, int kt,
        header.tree_type = tt;
        header.key_type = kt;
        header.block_data_counter = 0;
        header.tree_type = tt;
        header.key_type = kt;
        header.block_data_counter = 0;

+       strcpy (header.magic, "DILUMA");
+       header.magic[6] = '\0';

        WriteFileHeader ();
 
        /* Creo el primer bloque vacio */
        WriteFileHeader ();
 
        /* Creo el primer bloque vacio */


@@ -50,11 +52,25 @@ BTree::BTree (const std::string &name)
                fclose (fp);
        }
 
                fclose (fp);
        }
 

+       del = filename + ".blockdel";
+
+       fp = fopen (del.c_str (), "wb");
+       if (fp != NULL) {
+               uint i;
+
+               while (fread (&i, 1, sizeof (uint), fp)) {
+                       deleted_block_data.push_back (i);
+               }
+
+               fclose (fp);
+       }
+

        fp = fopen (name.c_str(), "rb+");
        if (!fp) {
                /* TODO : mandar una exception ? */
                return;
        }
        fp = fopen (name.c_str(), "rb+");
        if (!fp) {
                /* TODO : mandar una exception ? */
                return;
        }

+       filename = name;

        ReadFileHeader ();
 }
 
        ReadFileHeader ();
 }
 


@@ -73,6 +89,16 @@ BTree::~BTree ()
                it++;
        }
 
                it++;
        }
 

+       del = filename + ".del";
+
+       fp = fopen (del.c_str (), "wb");
+       it = deleted_block_data.begin ();
+
+       while (it != deleted_block_data.end ()) {
+               uint i = *it;
+               fwrite (&i, 1, sizeof (uint), fp);
+               it++;
+       }

        fclose (fp);
 }
 
        fclose (fp);
 }
 


@@ -582,6 +608,7 @@ void BTree::DelKeyFromLeaf (Clave *k, uint node_num, uint padre)
                if ((*data) == (*(*it))) {
                        BTreeData *aborrar = (*it);
                        node_keys.erase (it);
                if ((*data) == (*(*it))) {
                        BTreeData *aborrar = (*it);
                        node_keys.erase (it);

+                       deleted_block_data.push_back (aborrar->GetKey ()->GetBlockData ());

                        delete aborrar;
                        break;
                }
                        delete aborrar;
                        break;
                }


@@ -1301,7 +1328,15 @@ int BTree::type () const
 
 uint BTree::GetNextBlockData ()
 {
 
 uint BTree::GetNextBlockData ()
 {

-       /* TODO : Implementar recuperacion */
-       return header.block_data_counter++;
+       uint n;
+       if (deleted_block_data.size ()) {
+               std::list<uint>::iterator it = deleted_block_data.begin ();
+               n = *it;
+               deleted_block_data.erase (it);
+       } else {
+               n = header.block_data_counter++;
+       }
+
+       return n;

 }
 
 }