Agrega Makefile a doc/.

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

diff --git a/src/btree.cpp b/src/btree.cpp
index 5b1c36dcd2ee7b3163805e7567fce8b533f22134..ddcb14c49e65f23a19845d77553235da5c9d75d9 100644 (file)
--- a/src/btree.cpp
+++ b/src/btree.cpp
@@ -1,9 +1,10 @@
 
 #include "btree.h"
 
-BTree::BTree (const std::string &name, unsigned int block_size, int kt, bool create_new_file)
+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;
 
@@ -53,7 +54,13 @@ void BTree::WriteBlock (uchar *block, uint num)
 void BTree::AddKey (const Clave &k)
 {
        uint left, right;
-       Clave *kout = AddKeyR (&k, 0, left, right);
+       Clave *kout;
+
+       try {
+               kout = AddKeyR (k.Clone (), 0, left, right);
+       } catch (Exception *e) {
+               throw e;
+       }
 
        if (kout) {
                unsigned short level;
@@ -102,10 +109,19 @@ Clave* BTree::AddKeyR (const Clave *k, uint node_num, uint &left_child, uint &ri
        ReadNodoHeader (node, &node_header);
        delete [] node;
 
-       if (node_header.level == 0)
-               return AddKeyLeafR (k, node_num, left_child, right_child);
+       if (node_header.level == 0) {
+               try {
+                       return AddKeyLeafR (k, node_num, left_child, right_child);
+               } catch (Exception *e) {
+                       throw e;
+               }
+       }
 
-       return AddKeyOtherR (k, node_num, left_child, right_child);
+       try {
+               return AddKeyOtherR (k, node_num, left_child, right_child);
+       } catch (Exception *e) {
+               throw e;
+       }
 }
 
 Clave* BTree::AddKeyLeafR (const Clave *k, uint node_num, uint &left_child, uint &right_child)
@@ -127,6 +143,14 @@ Clave* BTree::AddKeyLeafR (const Clave *k, uint node_num, uint &left_child, uint
 
                while (it != node_keys.end ()) {
                        datait = (*it);
+                       if (tree_type == TYPE_UNIQUE) {
+                               /* Verifico que la clave no existea ya en el arbol */
+                               if ((*data) == (*datait)) {
+                                       throw new AddException ();
+                                       return NULL;
+                               }
+                       }
+       
                        if ((*data) < (*datait))
                                /* Me pase, lo agrego aca! */
                                break;
@@ -160,6 +184,13 @@ 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_UNIQUE) {
+                               /* Verifico que la clave no existea ya en el arbol */
+                               if ((*data) == (*datait)) {
+                                       throw new AddException ();
+                                       return NULL;
+                               }
+                       }
                        if ((*data) < (*datait))
                                /* Me pase, lo agrego aca! */
                                break;
@@ -253,6 +284,13 @@ Clave* BTree::AddKeyOtherR (const Clave *k, uint node_num, uint &left_child, uin
        posterior = it;
 
        while (it != node_keys.end ()) {
+               if (tree_type == TYPE_UNIQUE) {
+                       /* Verifico que la clave no existea ya en el arbol */
+                       if ((*data) == (*(*it))) {
+                               throw new AddException ();
+                               return NULL;
+                       }
+               }
                if ((*data) < (*(*it)))
                        break;
                ultima = it;
@@ -282,6 +320,13 @@ Clave* BTree::AddKeyOtherR (const Clave *k, uint node_num, uint &left_child, uin
 
                while (it != node_keys.end ()) {
                        datait = (*it);
+                       if (tree_type == TYPE_UNIQUE) {
+                               /* Verifico que la clave no existea ya en el arbol */
+                               if ((*data) == (*datait)) {
+                                       throw new AddException ();
+                                       return NULL;
+                               }
+                       }
                        if ((*data) < (*datait))
                                /* Me pase, lo agrego aca! */
                                break;
@@ -317,6 +362,13 @@ 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_UNIQUE) {
+                               /* Verifico que la clave no existea ya en el arbol */
+                               if ((*data) == (*datait)) {
+                                       throw new AddException ();
+                                       return NULL;
+                               }
+                       }
                        if ((*data) < (*datait))
                                /* Me pase, lo agrego aca! */
                                break;