From: Ricardo Markiewicz <rmarkie@fi.uba.ar>
Date: Tue, 13 Sep 2005 16:54:56 +0000 (+0000)
Subject: Dejando todo andando con BTreeData.
X-Git-Tag: 1_0-pre1~142
X-Git-Url: https://git.llucax.com/z.facultad/75.52/treemulator.git/commitdiff_plain/2c1d3ea3cf9a25e8f957587d4a1581fc292c831b?ds=sidebyside

Dejando todo andando con BTreeData.
---

diff --git a/src/btree.cpp b/src/btree.cpp
index 21609bf..cf01b2c 100644
--- a/src/btree.cpp
+++ b/src/btree.cpp
@@ -50,30 +50,36 @@ void BTree::WriteBlock (uchar *block, uint num)
 
 void BTree::AddKey (const Clave &k)
 {
-	std::list<Clave *> node_keys;
+	AddKeyR (&k, 0);
+}
+
+Clave* BTree::AddKeyR (const Clave *k, uint node_num)
+{
+	Clave *kout;
+	std::list<BTreeData> node_keys;
 
 	/* Leo el nodo raiz para empezar a agregar */
-	uchar *root = ReadBlock (0);
-	BTreeNodeHeader root_header;
-	ReadNodoHeader (root, &root_header);
+	uchar *node = ReadBlock (node_num);
+	BTreeNodeHeader node_header;
+	ReadNodoHeader (node, &node_header);
 
-	node_keys = ReadKeys (root, root_header);
-	std::cout << node_keys.size () << std::endl;
+	node_keys = ReadKeys (node, node_header);
 	
-	if (root_header.free_space >= k.Size ()) {
-		std::cout << "Hay lugar para meter la clave" << std::endl;
+	if (node_header.free_space >= k->Size ()) {
 		/* TODO : Insertar ordenado */
-		node_keys.push_back (k.Clone ());
+		//node_keys.push_back (BTreek->Clone ());
 	} else {
-		std::cout << "__NO__ hay lugar para meter la clave" << std::endl;
+		/* Split */
 	}
 
 	
-	WriteKeys (root, root_header, node_keys);
-	WriteNodoHeader (root, &root_header);
-	WriteBlock (root, 0);
+	WriteKeys (node, node_header, node_keys);
+	WriteNodoHeader (node, &node_header);
+	WriteBlock (node, node_num);
+
+	delete [] node;
 
-	delete [] root;
+	return kout;
 }
 
 void BTree::DelKey (const Clave &k) {}
@@ -98,9 +104,9 @@ uchar *BTree::ReadBlock (uint num)
 	return out;
 }
 
-std::list<Clave *> BTree::ReadKeys (uchar *node, BTreeNodeHeader &node_header)
+std::list<BTreeData> BTree::ReadKeys (uchar *node, BTreeNodeHeader &node_header)
 {
-	std::list<Clave *> keys;
+	std::list<BTreeData> keys;
 	node += sizeof (BTreeNodeHeader);
 
 	for (uint i=0; i<node_header.item_count; i++) {
@@ -108,24 +114,25 @@ std::list<Clave *> BTree::ReadKeys (uchar *node, BTreeNodeHeader &node_header)
 		 * dependiendo de algun dato en el header del
 		 * arbol
 		 */
-		ClaveFija *k = new ClaveFija (node);
-		node += k->Size ();
-		keys.push_back (k);
+		/* TODO : Detectar si estoy en una hoja */
+		BTreeData data(node);
+		node += data.Size ();
+		keys.push_back (data);
 	}
 
 	return keys;
 }
 
-void BTree::WriteKeys (uchar *node, BTreeNodeHeader &node_header, std::list<Clave *> &keys)
+void BTree::WriteKeys (uchar *node, BTreeNodeHeader &node_header, std::list<BTreeData> &keys)
 {
-	std::list<Clave *>::iterator it = keys.begin ();
+	std::list<BTreeData>::iterator it = keys.begin ();
 
 	node += sizeof (BTreeNodeHeader);
 
 	while (it != keys.end ()) {
-		Clave *c = (*it);
-		memcpy (node, c->ToArray(), c->Size ());
-		node += c->Size ();
+		BTreeData d = (*it);
+		memcpy (node, d.ToArray(), d.Size ());
+		node += d.Size ();
 		it++;
 	}
 
diff --git a/src/btree.h b/src/btree.h
index b001bef..467ed6f 100644
--- a/src/btree.h
+++ b/src/btree.h
@@ -93,6 +93,8 @@ class BTree {
 		void DelKey (const Clave &k);
 
 	private:
+		Clave* AddKeyR (const Clave *k, uint node_num);
+
 		void WriteFileHeader ();
 
 		void WriteBlock (uchar *block, uint num);
@@ -101,8 +103,8 @@ class BTree {
 		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;