char* a std::string en constructor de BTree

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

diff --git a/src/btree.h b/src/btree.h
index 0ed4fbdcadae9625011998d3b37ac5e9dd50d900..081c43687c884a4b69fd00fdc3b5878409cc335b 100644 (file)
--- a/src/btree.h
+++ b/src/btree.h
@@ -44,18 +44,20 @@
  *    tomar una idea simimar)
  */
 
+#include <iostream>
 #include <string>
+#include "common.h"
+#include "clave.h"
 
 /* alias para codear menos :) */
-typedef unsigned char uchar;
 
 /** 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
@@ -71,7 +73,7 @@ typedef struct _btree_header_ {
 
        /** Cantidad de elementos en el nodo */
        unsigned int item_count;
-} BTreeNodeHeader;
+};
 
 /** Crea un nuevo arbol B
  *
@@ -81,15 +83,18 @@ 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 ();
-               void DelKey ();
+               void AddKey (Clave &k);
+               void DelKey (Clave &k);
 
        private:
                void write_tree_header ();
                void write_block (uchar *block, uint num);
+
+               uchar *ReadBlock (uint num);
+
                void ReadNodoHeader (uchar *node, BTreeNodeHeader *header);
                void WriteNodoHeader (uchar *node, BTreeNodeHeader *header);