Unifico nomenclatura

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

diff --git a/src/btree.h b/src/btree.h
index 8d865833992706afad65a6dda0ef031ac5d30634..7d279f5b589e3d4fedaa99a325a996a4bb41327d 100644 (file)
--- a/src/btree.h
+++ b/src/btree.h
@@ -46,18 +46,20 @@
 
 #include <iostream>
 #include <string>
+#include <list>
 #include "common.h"
 #include "clave.h"
+#include "clave_fija.h"
 
 /* alias para codear menos :) */
 
 /** Encabezado del archivo BTree */
-typedef struct _btree_file_ {
+struct BTreeFileHeader {
        uint block_size;
-} BTreeFileHeader;
+};
 
 /** Encabezado de un bloque */
-typedef struct _btree_header_ {
+struct BTreeNodeHeader {
        /** Indica a que nivel corresponde un bloque
         *
         *  nivel == 0 : una hoja
@@ -73,7 +75,7 @@ typedef struct _btree_header_ {
 
        /** Cantidad de elementos en el nodo */
        unsigned int item_count;
-} BTreeNodeHeader;
+};
 
 /** Crea un nuevo arbol B
  *
@@ -83,21 +85,24 @@ typedef struct _btree_header_ {
  */
 class BTree {
        public:
-               BTree (const char *filename, unsigned int block_size, bool create_new_file = false);
+               BTree (const std::string &filename, unsigned int block_size, bool create_new_file = false);
                ~BTree ();
 
-               void AddKey (Clave &k);
-               void DelKey (Clave &k);
+               void AddKey (const Clave &k);
+               void DelKey (const Clave &k);
 
        private:
-               void write_tree_header ();
-               void write_block (uchar *block, uint num);
+               void WriteFileHeader ();
 
+               void WriteBlock (uchar *block, uint num);
                uchar *ReadBlock (uint num);
 
                void ReadNodoHeader (uchar *node, BTreeNodeHeader *header);
                void WriteNodoHeader (uchar *node, BTreeNodeHeader *header);
 
+               std::list<Clave *> ReadKeys (uchar *node, BTreeNodeHeader &node_header);
+               void WriteKeys (uchar *node, BTreeNodeHeader &node_header, std::list<Clave *> &keys);
+
                std::string filename;
                BTreeFileHeader header;