Agrego clave variable.

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

diff --git a/src/btree.h b/src/btree.h
index 9dbfc547f7082e4fde493e5f76a4fdddc7ea6faf..a67fa4c4b9d1e086458f80e2cd367869411f448d 100644 (file)
--- a/src/btree.h
+++ b/src/btree.h
@@ -50,6 +50,8 @@
 #include "common.h"
 #include "clave.h"
 #include "clave_fija.h"
 #include "common.h"
 #include "clave.h"
 #include "clave_fija.h"

+#include "clave_variable.h"
+#include "btree_data.h"

 
 /* alias para codear menos :) */
 
 
 /* alias para codear menos :) */
 


@@ -85,32 +87,48 @@ struct BTreeNodeHeader {
  */
 class BTree {
        public:
  */
 class BTree {
        public:

-               BTree (const std::string &filename, unsigned int block_size, bool create_new_file = false);
+               BTree (const std::string &filename, unsigned int block_size, int k_t = KEY_FIXED, bool create_new_file = false);

                ~BTree ();
 
                ~BTree ();
 

+               /** Tipos de clave a usar */
+               enum {
+                       KEY_FIXED,
+                       KEY_VARIABLE
+               };
+

                void AddKey (const Clave &k);
                void DelKey (const Clave &k);
 
                void AddKey (const Clave &k);
                void DelKey (const Clave &k);
 

-       private:
-               void write_tree_header ();
-               void write_block (uchar *block, uint num);
+       protected:
+               Clave* AddKeyR (const Clave *k, uint node_num, uint &left_child, uint &right_child);
+               Clave* AddKeyOtherR (const Clave *k, uint node_num, uint &left_child, uint &right_child);
+               Clave* AddKeyLeafR (const Clave *k, uint node_num, uint &left_child, uint &right_child);
+
+               void WriteFileHeader ();

 
 

+               void WriteBlock (uchar *block, uint num);

                uchar *ReadBlock (uint num);
                uchar *ReadBlock (uint num);

+               uchar *NewBlock (uint &num);

 
                void ReadNodoHeader (uchar *node, BTreeNodeHeader *header);
                void WriteNodoHeader (uchar *node, BTreeNodeHeader *header);
 
 
                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::list<BTreeData *> ReadKeys (uchar *node, BTreeNodeHeader &node_header);
+               void WriteKeys (uchar *node, BTreeNodeHeader &node_header, std::list<BTreeData *> &keys);

 
                std::string filename;
                BTreeFileHeader header;
 
                std::string filename;
                BTreeFileHeader header;

+               int key_type;

 
                /** Apunta al archivo de datos, asi se abre solo 1 vez
                 *
                 *  \TODO Ver si vale la pena
                 */
                FILE *fp;
 
                /** Apunta al archivo de datos, asi se abre solo 1 vez
                 *
                 *  \TODO Ver si vale la pena
                 */
                FILE *fp;

+
+
+               /* DEBUG */
+               void PrintNode (uint num);

 };
 
 #endif // _B_TREE_H
 };
 
 #endif // _B_TREE_H