Refactoring para unificar nomenclaturas.

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

diff --git a/src/btree_data.cpp b/src/btree_data.cpp
index a5d9b6805706311ca288279c5030f83f582adb22..70195fdb41e9650fda39faa413e30e883962cde8 100644 (file)
--- a/src/btree_data.cpp
+++ b/src/btree_data.cpp
@@ -24,6 +24,10 @@ BTreeData::BTreeData (Clave *k, uint child)
 
 BTreeData::~BTreeData ()
 {
+       if (clave) {
+               delete clave;
+               clave = NULL;
+       }
 }
 
 uint BTreeData::Size () const
@@ -38,8 +42,10 @@ uchar* BTreeData::ToArray () const
 {
        uchar *out = new uchar[Size()];
        if (clave) {
-               memcpy (out, clave->ToArray (), clave->Size ());
+               uchar *n = clave->ToArray ();
+               memcpy (out, n, clave->Size ());
                memcpy (out+clave->Size (), &hijo, sizeof (uint));
+               delete [] n;
        } else
                memcpy (out, &hijo, sizeof (uint));
        return out;
@@ -59,6 +65,22 @@ bool BTreeData::operator == (const BTreeData &data) const
        return (*clave) == (*(data.clave));
 }
 
+bool BTreeData::Abrev (BTreeData *anterior)
+{
+       if (anterior == NULL) return false;
+
+       ClaveVariable *c = (ClaveVariable *)clave;
+       return c->Abrev (dynamic_cast<ClaveVariable *>(anterior->GetKey ()));
+}
+
+bool BTreeData::DesAbrev (BTreeData *anterior)
+{
+       if (anterior == NULL) return false;
+
+       ClaveVariable *c = (ClaveVariable *)clave;
+       return c->DesAbrev (dynamic_cast<ClaveVariable *>(anterior->GetKey ()));
+}
+
 BTreeLeafData::BTreeLeafData (uchar *node, int key_type)
 {
        if (key_type == BTree::KEY_FIXED)
@@ -69,6 +91,10 @@ BTreeLeafData::BTreeLeafData (uchar *node, int key_type)
 
 BTreeLeafData::~BTreeLeafData ()
 {
+       if (clave) {
+               delete clave; 
+               clave = NULL;
+       }
 }
 
 uint BTreeLeafData::Size () const