Unifico nomenclatura

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

diff --git a/src/btree.cpp b/src/btree.cpp
index d1fbab3b13281de444fd20858aef443b0785935f..c7d3b4bf4c456203435a8e231f94961fa9f395d8 100644 (file)
--- a/src/btree.cpp
+++ b/src/btree.cpp
@@ -17,7 +17,7 @@ BTree::BTree (const std::string &name, unsigned int block_size, bool create_new_
        
        /* Inicializo el header */
        header.block_size = block_size;
        
        /* Inicializo el header */
        header.block_size = block_size;

-       write_tree_header ();
+       WriteFileHeader ();

 
        /* Creo el primer bloque vacio */
        node = new uchar[block_size];
 
        /* Creo el primer bloque vacio */
        node = new uchar[block_size];


@@ -26,7 +26,7 @@ BTree::BTree (const std::string &name, unsigned int block_size, bool create_new_
        nh.free_space = block_size - sizeof (BTreeNodeHeader);
        nh.item_count = 0;
        WriteNodoHeader (node, &nh);
        nh.free_space = block_size - sizeof (BTreeNodeHeader);
        nh.item_count = 0;
        WriteNodoHeader (node, &nh);

-       write_block (node, 0);
+       WriteBlock (node, 0);

 
        delete [] node;
 }
 
        delete [] node;
 }


@@ -36,13 +36,13 @@ BTree::~BTree ()
        fclose (fp);
 }
 
        fclose (fp);
 }
 

-void BTree::write_tree_header ()
+void BTree::WriteFileHeader ()

 {
        fseek (fp, 0L, SEEK_SET);
        fwrite (&header, 1, sizeof (BTreeFileHeader), fp);
 }
 
 {
        fseek (fp, 0L, SEEK_SET);
        fwrite (&header, 1, sizeof (BTreeFileHeader), fp);
 }
 

-void BTree::write_block (uchar *block, uint num)
+void BTree::WriteBlock (uchar *block, uint num)

 {
        fseek (fp, num*header.block_size + sizeof (BTreeFileHeader), SEEK_SET);
        fwrite (block, 1, header.block_size, fp);
 {
        fseek (fp, num*header.block_size + sizeof (BTreeFileHeader), SEEK_SET);
        fwrite (block, 1, header.block_size, fp);


@@ -66,6 +66,11 @@ void BTree::AddKey (const Clave &k)
                std::cout << "__NO__ hay lugar para meter la clave" << std::endl;
        }
 
                std::cout << "__NO__ hay lugar para meter la clave" << std::endl;
        }
 

+       
+       WriteKeys (root, root_header, node_keys);
+       WriteNodoHeader (root, &root_header);
+       WriteBlock (root, 0);
+

        delete [] root;
 }
 
        delete [] root;
 }
 


@@ -109,3 +114,18 @@ std::list<Clave *> BTree::ReadKeys (uchar *node, BTreeNodeHeader &node_header)
        return keys;
 }
 
        return keys;
 }
 

+void BTree::WriteKeys (uchar *node, BTreeNodeHeader &node_header, std::list<Clave *> &keys)
+{
+       std::list<Clave *>::iterator it = keys.begin ();
+
+       node += sizeof (BTreeNodeHeader);
+
+       while (it != keys.end ()) {
+               Clave *c = (*it);
+               memcpy (node, c->ToArray(), c->Size ());
+               node += c->Size ();
+               it++;
+       }
+
+       /* TODO : incrementar node_header.item_count aca o fuera de este metodo? */
+}