Unifico nomenclatura

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

diff --git a/src/btree.cpp b/src/btree.cpp
index 464c93b1e1ebf825f899061da111610cc8f5f202..c7d3b4bf4c456203435a8e231f94961fa9f395d8 100644 (file)
--- a/src/btree.cpp
+++ b/src/btree.cpp
@@ -1,12 +1,12 @@
 
 #include "btree.h"
 
-BTree::BTree (const char *name, unsigned int block_size, bool create_new_file)
+BTree::BTree (const std::string &name, unsigned int block_size, bool create_new_file)
 {
        uchar *node;
        BTreeNodeHeader nh;
 
-       fp = fopen (name, "wb");
+       fp = fopen (name.c_str(), "wb");
        if (!fp) {
                /* TODO : mandar una exception ? */
                return;
@@ -17,7 +17,7 @@ BTree::BTree (const char *name, unsigned int block_size, bool create_new_file)
        
        /* Inicializo el header */
        header.block_size = block_size;
-       write_tree_header ();
+       WriteFileHeader ();
 
        /* Creo el primer bloque vacio */
        node = new uchar[block_size];
@@ -26,7 +26,7 @@ BTree::BTree (const char *name, unsigned int block_size, bool create_new_file)
        nh.free_space = block_size - sizeof (BTreeNodeHeader);
        nh.item_count = 0;
        WriteNodoHeader (node, &nh);
-       write_block (node, 0);
+       WriteBlock (node, 0);
 
        delete [] node;
 }
@@ -36,35 +36,45 @@ BTree::~BTree ()
        fclose (fp);
 }
 
-void BTree::write_tree_header ()
+void BTree::WriteFileHeader ()
 {
        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);
 }
 
-void BTree::AddKey (Clave &k)
+void BTree::AddKey (const Clave &k)
 {
+       std::list<Clave *> node_keys;
+
        /* Leo el nodo raiz para empezar a agregar */
        uchar *root = ReadBlock (0);
        BTreeNodeHeader root_header;
        ReadNodoHeader (root, &root_header);
 
+       node_keys = ReadKeys (root, root_header);
+       std::cout << node_keys.size () << std::endl;
+       
        if (root_header.free_space >= k.Size ()) {
                std::cout << "Hay lugar para meter la clave" << std::endl;
        } else {
                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;
 }
 
-void BTree::DelKey (Clave &k) {}
+void BTree::DelKey (const Clave &k) {}
 
 void BTree::ReadNodoHeader (uchar *node, BTreeNodeHeader *header)
 {
@@ -86,3 +96,36 @@ uchar *BTree::ReadBlock (uint num)
        return out;
 }
 
+std::list<Clave *> BTree::ReadKeys (uchar *node, BTreeNodeHeader &node_header)
+{
+       std::list<Clave *> keys;
+       node += sizeof (BTreeNodeHeader);
+
+       for (uint i=0; i<node_header.item_count; i++) {
+               /* TODO : El tipo de clave deberia ser usado 
+                * dependiendo de algun dato en el header del
+                * arbol
+                */
+               ClaveFija *k = new ClaveFija (node);
+               node += k->Size ();
+               keys.push_back (k);
+       }
+
+       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? */
+}