Clave *kout = AddKeyR (&k, 0, left, right);
if (kout) {
- std::cout << "Raiz fue spliteada!!" << std::endl;
+ unsigned short level;
+ /* Debo dejar la raiz en el nodo 0, por lo que paso el nodo
+ * que esta usando el hijo izquierdo a un nuevo nodo */
+ std::list<BTreeData *> node_keys;
+ BTreeNodeHeader node_header;
+ uchar *node = ReadBlock (left);
+ ReadNodoHeader (node, &node_header);
+ node_keys = ReadKeys (node, node_header);
+ level = node_header.level + 1;
+
+ uchar *new_node = NewBlock (left);
+ delete [] new_node; /* No me interesa, voy a usar lo leio antes */
+
+ WriteKeys (node, node_header, node_keys);
+ WriteNodoHeader (node, &node_header);
+ WriteBlock (node, left);
+ delete [] node;
+
+ /* Leo y actualizo la Raiz */
+ node = ReadBlock (0);
+ ReadNodoHeader (node, &node_header);
+ node_keys = std::list<BTreeData *>();
+
+ node_keys.push_back (new BTreeChildData (left));
+ node_keys.push_back (new BTreeData (kout, right));
+
+ node_header.level = level;
+ node_header.item_count = 1;
+
+ WriteKeys (node, node_header, node_keys);
+ WriteNodoHeader (node, &node_header);
+ WriteBlock (node, 0);
+ PrintNode (0);
}
}
Clave* BTree::AddKeyR (const Clave *k, uint node_num, uint &left_child, uint &right_child)
{
Clave *kout = NULL;
- std::list<BTreeData> node_keys;
+ std::list<BTreeData *> node_keys;
- BTreeLeafData data (k->Clone ());
+ BTreeData *data = new BTreeLeafData (k->Clone ());
/* Leo el nodo raiz para empezar a agregar */
uchar *node = ReadBlock (node_num);
ReadNodoHeader (node, &node_header);
if (node_header.level != 0) {
+ std::cout << "Entrando nodo level = " << node_header.level << std::endl;
/* No estoy en una hoja, asi que tengo que buscar
* para donde moverme para agregar la clave
*/
- /* TODO :) */
+ std::cout << "Leo Claves" << std::endl;
+ node_keys = ReadKeys (node, node_header);
+
+ std::list<BTreeData *>::iterator it = node_keys.begin ();
+ std::list<BTreeData *>::iterator posterior;
+ std::list<BTreeData *>::iterator ultima;
+
+ /* Se supone que la primera es un hijo :) */
+ BTreeData *lchild = (*it++);
+ posterior = it;
+
+ while (it != node_keys.end ()) {
+ if ((*data) < (*(*it)))
+ break;
+ ultima = it;
+ it++;
+ }
+
+ if (it == posterior) {
+ std::cout << "==== Me voy al nodo " << lchild->getChild () << std::endl;
+ k = AddKeyR (k, lchild->getChild (), left_child, right_child);
+ } else {
+ std::cout << "==== Me voy al nodo " << (*ultima)->getChild () << std::endl;
+ k = AddKeyR (k, (*ultima)->getChild (), left_child, right_child);
+ }
+ if (k) {
+ data = new BTreeData (k->Clone (), right_child);
+ }
}
+ /* Nada que hacer */
+ if (!k) return NULL;
+
/* Estoy en una hoja, veo si lo puedo agregar */
- if (node_header.free_space > data.Size ()) {
+ if (node_header.free_space > data->Size ()) {
/* TODO : Insertar ordenado */
- BTreeData datait;
-
+ BTreeData *datait;
node_keys = ReadKeys (node, node_header);
- std::list<BTreeData>::iterator it = node_keys.begin ();
+ std::list<BTreeData *>::iterator it = node_keys.begin ();
while (it != node_keys.end ()) {
datait = (*it);
- if (data < datait)
+ if ((*data) < (*datait))
/* Me pase, lo agrego aca! */
break;
it++;
} else {
std::cout << "=============== SPLIT ================" << std::endl;
/* Split : Creo e inicializo el nuevo nodo */
- std::list<BTreeData> new_node_keys;
- std::list<BTreeData> old_node_keys;
+ std::list<BTreeData *> new_node_keys;
+ std::list<BTreeData *> old_node_keys;
BTreeNodeHeader new_node_header;
uint new_node_num;
uchar *new_node = NewBlock (new_node_num);
ReadNodoHeader (new_node, &new_node_header);
+ new_node_header.level = node_header.level;
node_keys = ReadKeys (node, node_header);
new_node_keys = ReadKeys (new_node, new_node_header);
/* Agrego la clave en la lista que ya tengo de manera ordenada */
- std::list<BTreeData>::iterator it = node_keys.begin ();
+ std::list<BTreeData *>::iterator it = node_keys.begin ();
+ std::list<BTreeData *>::iterator previt = node_keys.begin ();
+ if (node_header.level != 0) {
+ /* La primera es ChildData */
+ it++;
+ previt = it;
+ }
+
while (it != node_keys.end ()) {
- BTreeData datait;
+ BTreeData *datait;
datait = (*it);
- if (data < datait)
+ if ((*data) < (*datait))
/* Me pase, lo agrego aca! */
break;
+ previt = it;
it++;
}
if (it != node_keys.end ())
uint total_size = 0;
it = node_keys.begin ();
while (it != node_keys.end ()) {
- BTreeData datait;
+ BTreeData *datait;
datait = (*it);
- total_size += datait.Size ();
+ total_size += datait->Size ();
it++;
/* Hack : Si me quedo con todas las claves, en el caso de ser
* del mismo tama#o se desbalancea. Hay que ver que efecto
* puede tener en el caso de claves de long. variable
*/
if (it == node_keys.end ())
- total_size -= datait.Size ();
+ total_size -= datait->Size ();
}
it = node_keys.begin ();
uint used = 0;
while (used < total_size/2) {
- BTreeData d = (*it);
- std::cout << used << " " << total_size << std::endl;
+ BTreeData *d = (*it);
old_node_keys.push_back (d);
- used += d.Size ();
+ used += d->Size ();
it++;
}
- kout = (*it++).getClave (); // Esta se retorna al "padre" para que se la agregue
+ kout = (*it)->getClave (); // Esta se retorna al "padre" para que se la agregue
+ if (node_header.level != 0) {
+ new_node_keys.push_back ( new BTreeChildData ((*it)->getChild ()));
+ }
+ it++;
+
+ std::string s = *kout;
+ std::cout << "SPLIT Retorna : " << s << std::endl;
while (it != node_keys.end ()) {
- BTreeData d = (*it);
+ BTreeData *d = (*it);
new_node_keys.push_back (d);
it++;
}
return out;
}
-std::list<BTreeData> BTree::ReadKeys (uchar *node, BTreeNodeHeader &node_header)
+std::list<BTreeData *> BTree::ReadKeys (uchar *node, BTreeNodeHeader &node_header)
{
- std::list<BTreeData> keys;
+ std::list<BTreeData *> keys;
node += sizeof (BTreeNodeHeader);
+ uint count = node_header.item_count;
- for (uint i=0; i<node_header.item_count; i++) {
+ if (node_header.item_count == 0) return keys;
+
+ if (node_header.level != 0) {
+ /* Si no es una hoja, lo primero que tengo es un BTreeChildData */
+ BTreeChildData *d = new BTreeChildData (node);
+ node += d->Size ();
+ keys.push_back (d);
+ count--;
+ }
+
+ for (uint i=0; i<count; i++) {
/* TODO : El tipo de clave deberia ser usado
* dependiendo de algun dato en el header del
* arbol
*/
/* TODO : Detectar si estoy en una hoja */
- BTreeData data;
- if (node_header.level == 0)
- data = BTreeLeafData (node);
- else
- data = BTreeData (node);
- node += data.Size ();
+ BTreeData *data;
+ if (node_header.level == 0) {
+ data = new BTreeLeafData (node);
+ } else {
+ data = new BTreeData (node);
+ }
+ node += data->Size ();
keys.push_back (data);
}
return keys;
}
-void BTree::WriteKeys (uchar *node, BTreeNodeHeader &node_header, std::list<BTreeData> &keys)
+void BTree::WriteKeys (uchar *node, BTreeNodeHeader &node_header, std::list<BTreeData *> &keys)
{
- std::list<BTreeData>::iterator it = keys.begin ();
+ std::list<BTreeData *>::iterator it = keys.begin ();
node += sizeof (BTreeNodeHeader);
node_header.free_space = header.block_size - sizeof (BTreeNodeHeader);
while (it != keys.end ()) {
- BTreeData d = (*it);
- memcpy (node, d.ToArray(), d.Size ());
- node += d.Size ();
- node_header.free_space -= d.Size ();
+ BTreeData *d = (*it);
+ memcpy (node, d->ToArray(), d->Size ());
+ node += d->Size ();
+ node_header.free_space -= d->Size ();
node_header.item_count++;
it++;
}
BTreeNodeHeader node_header;
ReadNodoHeader (node, &node_header);
- std::list<BTreeData> node_keys = ReadKeys (node, node_header);
- std::list<BTreeData>::iterator it = node_keys.begin ();
+ std::list<BTreeData *> node_keys = ReadKeys (node, node_header);
+ std::list<BTreeData *>::iterator it = node_keys.begin ();
std::cout << "Nodo : " << num << std::endl;
+ std::cout << "Level : " << node_header.level << std::endl;
std::cout << "Items : " << node_header.item_count << std::endl;
std::cout << "Free : " << node_header.free_space << " (" << (header.block_size - sizeof (BTreeNodeHeader)) << ")" << std::endl;
while (it != node_keys.end ()) {
- std::string s = (*it);
- std::cout << "(" << s << ") ";
+ std::string s = *(*it);
+ std::cout << s << " ";
it++;
}
std::cout << std::endl;
projects / z.facultad / 75.52 / treemulator.git / blobdiff