Muevo datos al header.

diff --git a/src/btree.cpp b/src/btree.cpp
index 81af642041af8670b6d9105e016af3cae521eee5..6771746f1971b7b7aa8aa61ece6f580c01c52b01 100644 (file)
--- a/src/btree.cpp
+++ b/src/btree.cpp
@@ -3,8 +3,6 @@
 
 BTree::BTree (const std::string &name, unsigned int block_size, int tt, int kt, bool create_new_file)
 {
-       key_type = kt;
-       tree_type = tt;
        uchar *node;
        BTreeNodeHeader nh;
 
@@ -19,6 +17,8 @@ BTree::BTree (const std::string &name, unsigned int block_size, int tt, int kt,
        
        /* Inicializo el header */
        header.block_size = block_size;
+       header.tree_type = tt;
+       header.key_type = kt;
        WriteFileHeader ();
 
        /* Creo el primer bloque vacio */
@@ -143,7 +143,7 @@ Clave* BTree::AddKeyLeafR (const Clave *k, uint node_num, uint &left_child, uint
 
                while (it != node_keys.end ()) {
                        datait = (*it);
-                       if (tree_type == TYPE_IDENTIFICACION) {
+                       if (header.tree_type == TYPE_IDENTIFICACION) {
                                /* Verifico que la clave no existea ya en el arbol */
                                if ((*data) == (*datait)) {
                                        throw new AddException ();
@@ -184,7 +184,7 @@ Clave* BTree::AddKeyLeafR (const Clave *k, uint node_num, uint &left_child, uint
                while (it != node_keys.end ()) {
                        BTreeData *datait;
                        datait = (*it);
-                       if (tree_type == TYPE_IDENTIFICACION) {
+                       if (header.tree_type == TYPE_IDENTIFICACION) {
                                /* Verifico que la clave no existea ya en el arbol */
                                if ((*data) == (*datait)) {
                                        throw new AddException ();
@@ -284,7 +284,7 @@ Clave* BTree::AddKeyOtherR (const Clave *k, uint node_num, uint &left_child, uin
        posterior = it;
 
        while (it != node_keys.end ()) {
-               if (tree_type == TYPE_IDENTIFICACION) {
+               if (header.tree_type == TYPE_IDENTIFICACION) {
                        /* Verifico que la clave no existea ya en el arbol */
                        if ((*data) == (*(*it))) {
                                throw new AddException ();
@@ -320,7 +320,7 @@ Clave* BTree::AddKeyOtherR (const Clave *k, uint node_num, uint &left_child, uin
 
                while (it != node_keys.end ()) {
                        datait = (*it);
-                       if (tree_type == TYPE_IDENTIFICACION) {
+                       if (header.tree_type == TYPE_IDENTIFICACION) {
                                /* Verifico que la clave no existea ya en el arbol */
                                if ((*data) == (*datait)) {
                                        throw new AddException ();
@@ -362,7 +362,7 @@ Clave* BTree::AddKeyOtherR (const Clave *k, uint node_num, uint &left_child, uin
                while (it != node_keys.end ()) {
                        BTreeData *datait;
                        datait = (*it);
-                       if (tree_type == TYPE_IDENTIFICACION) {
+                       if (header.tree_type == TYPE_IDENTIFICACION) {
                                /* Verifico que la clave no existea ya en el arbol */
                                if ((*data) == (*datait)) {
                                        throw new AddException ();
@@ -1037,9 +1037,9 @@ std::list<BTreeData *> BTree::ReadKeys (uchar *node, BTreeNodeHeader &node_heade
        for (uint i=0; i<count; i++) {
                BTreeData *data;
                if (node_header.level == 0) {
-                       data = new BTreeLeafData (node, key_type);
+                       data = new BTreeLeafData (node, header.key_type);
                } else {
-                       data = new BTreeData (node, key_type);
+                       data = new BTreeData (node, header.key_type);
                }
                node += data->Size ();
                keys.push_back (data);
@@ -1052,7 +1052,7 @@ std::list<BTreeData *> BTree::ReadKeys (uchar *node, BTreeNodeHeader &node_heade
 void BTree::AbrevKey (std::list<BTreeData *> &lst)
 {
        /* Claves Fijas No se abrevian */
-       if (key_type == KEY_FIXED) return;
+       if (header.key_type == KEY_FIXED) return;
 
        BTreeData *primera = NULL;
        std::list<BTreeData *>::iterator it = lst.begin ();
@@ -1067,7 +1067,7 @@ void BTree::AbrevKey (std::list<BTreeData *> &lst)
 void BTree::DeAbrevKey (std::list<BTreeData *> &lst)
 {
        /* Claves Fijas No se abrevian */
-       if (key_type == KEY_FIXED) return;
+       if (header.key_type == KEY_FIXED) return;
 
        BTreeData *primera = NULL;
        std::list<BTreeData *>::iterator it = lst.begin ();
@@ -1247,5 +1247,5 @@ void BTree::DeleteKeys (std::list<BTreeData *> &keys)
 
 int BTree::type () const
 {
-       return key_type;
+       return header.key_type;
 }

diff --git a/src/btree.h b/src/btree.h
index 2026eb018f904e27c0d834cba869365370a24f93..3860d385e1e88cf0f488eae73a879ca9e3d8aa9a 100644 (file)
--- a/src/btree.h
+++ b/src/btree.h
@@ -208,6 +208,8 @@
  */
 struct BTreeFileHeader {
        uint block_size;
+       int tree_type;
+       int key_type;
 };
 
 /** Encabezado de un bloque */
@@ -313,8 +315,6 @@ class BTree {
 
                std::string filename;
                BTreeFileHeader header;
-               int key_type;
-               int tree_type;
 
                /** Apunta al archivo de datos, asi se abre solo 1 vez
                 *