Mas codigo de AddKey

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

diff --git a/src/btree.cpp b/src/btree.cpp
index a2853927f3221f41c149ba4bd56511d5011c1a8a..38873c683b368bb0e39d3ff58f248d21a4a5448b 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,35 +36,58 @@ 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);
 }
 

-void BTree::AddKey (Clave &k)
+void BTree::AddKey (const Clave &k)

 {
 {

+       AddKeyR (&k, 0);
+}
+
+Clave* BTree::AddKeyR (const Clave *k, uint node_num)
+{
+       Clave *kout = NULL;
+       std::list<BTreeData> node_keys;
+

        /* Leo el nodo raiz para empezar a agregar */
        /* Leo el nodo raiz para empezar a agregar */

-       uchar *root = ReadBlock (0);
-       BTreeNodeHeader root_header;
-       ReadNodoHeader (root, &root_header);
+       uchar *node = ReadBlock (node_num);
+       BTreeNodeHeader node_header;
+       ReadNodoHeader (node, &node_header);

 
 

-       if (root_header.free_space >= k.Size ()) {
-               std::cout << "Hay lugar para meter la clave" << std::endl;
+       node_keys = ReadKeys (node, node_header);
+       
+       if (node_header.free_space >= k->Size ()) {
+               /* TODO : Insertar ordenado */
+               /* Siempre se agrega en una hoja */
+               node_keys.push_back (BTreeLeafData (k->Clone ()));
+
+               WriteKeys (node, node_header, node_keys);
+               WriteNodoHeader (node, &node_header);
+               WriteBlock (node, node_num);
+               delete [] node;

        } else {
        } else {

-               std::cout << "__NO__ hay lugar para meter la clave" << std::endl;
+               /* Split */
+               /* Lo que debe pasar :
+                *  1) Separar N/2 claves en "nodo"
+                *  2) Separar N/2-1 claves en un nuevo nodo
+                *  3) kout = clave del medio y mandarla al padre
+                */
+               std::cout << "SPLIT" << std::endl;

        }
 
        }
 

-       delete [] root;
+       return kout;

 }
 
 }
 

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

+std::list<BTreeData> BTree::ReadKeys (uchar *node, BTreeNodeHeader &node_header)
+{
+       std::list<BTreeData> 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
+                */
+               /* TODO : Detectar si estoy en una hoja */
+               BTreeData data(node);
+               node += data.Size ();
+               keys.push_back (data);
+       }
+
+       return keys;
+}
+
+void BTree::WriteKeys (uchar *node, BTreeNodeHeader &node_header, std::list<BTreeData> &keys)
+{
+       std::list<BTreeData>::iterator it = keys.begin ();
+
+       node += sizeof (BTreeNodeHeader);
+
+       while (it != keys.end ()) {
+               BTreeData d = (*it);
+               memcpy (node, d.ToArray(), d.Size ());
+               node += d.Size ();
+               it++;
+       }
+
+       /* TODO : incrementar node_header.item_count aca o fuera de este metodo? */
+}