tagged 1.1

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

diff --git a/src/btree.cpp b/src/btree.cpp
index 26224a515547a10dac3c2689e3d7b59f7d66ccc2..cce07595dbae924ffd7fdd431c014c031e350758 100644 (file)
--- a/src/btree.cpp
+++ b/src/btree.cpp
@@ -19,6 +19,9 @@ BTree::BTree (const std::string &name, unsigned int block_size, int tt, int kt,
        header.block_size = block_size;
        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 */
@@ -49,11 +52,25 @@ BTree::BTree (const std::string &name)
                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;
        }
+       filename = name;
        ReadFileHeader ();
 }
 
@@ -72,6 +89,16 @@ BTree::~BTree ()
                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);
 }
 
@@ -97,14 +124,19 @@ void BTree::WriteBlock (uchar *block, uint num)
 void BTree::AddKey (const Clave &k)
 {
        uint left, right;
-       Clave *kout;
+       Clave *kout, *in;
+
+       in = k.Clone ();
+       in->SetBlockData ( GetNextBlockData () );
 
        try {
-               kout = AddKeyR (k.Clone (), 0, left, right);
+               kout = AddKeyR (in->Clone (), 0, left, right);
        } catch (Exception *e) {
                throw e;
        }
 
+       delete in;
+
        if (kout) {
                unsigned short level;
                /* Debo dejar la raiz en el nodo 0, por lo que paso el nodo
@@ -576,6 +608,7 @@ void BTree::DelKeyFromLeaf (Clave *k, uint node_num, uint padre)
                if ((*data) == (*(*it))) {
                        BTreeData *aborrar = (*it);
                        node_keys.erase (it);
+                       deleted_block_data.push_back (aborrar->GetKey ()->GetBlockData ());
                        delete aborrar;
                        break;
                }
@@ -1181,9 +1214,9 @@ uchar *BTree::NewBlock (uint &num)
        BTreeNodeHeader nh;
 
        std::list<uint>::iterator it;
-       it = deleted_nodes.begin ();
 
-       if (it != deleted_nodes.end ()) {
+       if (deleted_nodes.size ()) {
+               it = deleted_nodes.begin ();
                num = *it;
                deleted_nodes.erase (it);
        } else {
@@ -1292,3 +1325,18 @@ int BTree::type () const
 {
        return header.key_type;
 }
+
+uint BTree::GetNextBlockData ()
+{
+       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;
+}
+