Lectura de claves desde un nodo a memoria.

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

diff --git a/src/btree.cpp b/src/btree.cpp
index 464c93b1e1ebf825f899061da111610cc8f5f202..d1fbab3b13281de444fd20858aef443b0785935f 100644 (file)
--- a/src/btree.cpp
+++ b/src/btree.cpp
@@ -1,12 +1,12 @@
 
 #include "btree.h"
 
 
 #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;
 
 {
        uchar *node;
        BTreeNodeHeader nh;
 

-       fp = fopen (name, "wb");
+       fp = fopen (name.c_str(), "wb");

        if (!fp) {
                /* TODO : mandar una exception ? */
                return;
        if (!fp) {
                /* TODO : mandar una exception ? */
                return;


@@ -48,13 +48,18 @@ void BTree::write_block (uchar *block, uint num)
        fwrite (block, 1, header.block_size, fp);
 }
 
        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);
 
        /* 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 {
        if (root_header.free_space >= k.Size ()) {
                std::cout << "Hay lugar para meter la clave" << std::endl;
        } else {


@@ -64,7 +69,7 @@ void BTree::AddKey (Clave &k)
        delete [] root;
 }
 
        delete [] root;
 }
 

-void BTree::DelKey (Clave &k) {}
+void BTree::DelKey (const Clave &k) {}

 
 void BTree::ReadNodoHeader (uchar *node, BTreeNodeHeader *header)
 {
 
 void BTree::ReadNodoHeader (uchar *node, BTreeNodeHeader *header)
 {


@@ -86,3 +91,21 @@ uchar *BTree::ReadBlock (uint num)
        return out;
 }
 
        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;
+}
+