Saco funcion repetida (obtener_clave) y reemplazo llamada con

[z.facultad/75.06/emufs.git] / emufs / b_plus_test.c

diff --git a/emufs/b_plus_test.c b/emufs/b_plus_test.c
index a06eaddd28605a30b210432cbbb20aca0b963cf6..0dc7603b2677fcdbe848d5e2848dbbd0fbe60716 100644 (file)
--- a/emufs/b_plus_test.c
+++ b/emufs/b_plus_test.c
@@ -3,12 +3,83 @@
 
 int main(int argc, char* argv[]) {
 
 
 int main(int argc, char* argv[]) {
 

+/* Locals */
+INDEX_DAT querydata;
+/*NODO_B_PLUS *memnodo;*/
+int i; 

 /* Creamos un handler EMUFS, luego un Indice B+ y testing... */
 /* Creamos un handler EMUFS, luego un Indice B+ y testing... */

-EMUFS *emu = emufs_crear("testbplus",T3,512, 128);
-INDICE *indice = emufs_indice_crear(emu,"principal",0,0,0,0,sizeof(int)*12);
-emufs_b_plus_crear(indice);
-printf ("Yeiiiii\n");
+INDEXSPECS indice;
+indice.tam_bloque = SIZE_B_PLUS_HEADER + sizeof(int)*5 + sizeof(int)*6;
+indice.size_claves = (indice.tam_bloque - SIZE_B_PLUS_HEADER - sizeof(int))/2;
+indice.size_hijos = indice.size_claves + sizeof(int);
+indice.filename = "idxbplus_primary.idx";
+printf("\nTam Nodo: %i  Size Claves: %i  Size_Hijos: %i\n",indice.tam_bloque,indice.size_claves,indice.size_hijos);
+emufs_b_plus_crear(&indice);
+       
+for (i=1;i<34;++i)
+{      
+querydata.num_bloque = i;
+querydata.clave.i_clave = i;
+b_plus_insertar(&indice,&querydata);
+}
+
+/*
+querydata.num_bloque = 2;
+querydata.clave.i_clave = 7;
+b_plus_insertar(&indice,&querydata);
+
+querydata.num_bloque = 7;
+<<<<<<< .mine
+querydata.clave.i_clave = 5;
+b_plus_insertar_clave(&indice,&querydata);
+=======
+querydata.clave.i_clave = 5;
+b_plus_insertar(&indice,&querydata);
+>>>>>>> .r497
+
+querydata.num_bloque = 5;
+<<<<<<< .mine
+querydata.clave.i_clave = 3;
+b_plus_insertar_clave(&indice,&querydata);
+=======
+querydata.clave.i_clave = 3;
+b_plus_insertar(&indice,&querydata);
+>>>>>>> .r497
+
+querydata.num_bloque = 8;
+querydata.clave.i_clave = 63;
+b_plus_insertar(&indice,&querydata);
+
+/*num_node = 0;
+memnodo = b_plus_leer_nodo(&indice, num_node);
+       printf("Dumping Node_%i\n",num_node);
+       printf("Nivel: %i  Cant Claves: %i\n",memnodo->nivel,memnodo->cant_claves);
+       printf("Claves:");
+       for (i = 0; i < indice.size_claves/sizeof(int); ++i) printf(" %i",memnodo->claves[i]);
+       printf("\nHijos:");
+       for (i = 0; i < indice.size_hijos/sizeof(int); ++i) printf(" %i",memnodo->hijos[i]);
+       printf("\nEnd Dump\n"); 
+free(memnodo);*/
+       /*
+querydata.num_bloque = 54;
+querydata.clave.i_clave = 1;
+b_plus_insertar(&indice, &querydata);
+
+querydata.num_bloque = 12;
+querydata.clave.i_clave = 2;
+b_plus_insertar(&indice, &querydata);
+
+querydata.num_bloque = 14;
+querydata.clave.i_clave = 0;
+b_plus_insertar(&indice, &querydata);
+
+querydata.num_bloque = 22;
+querydata.clave.i_clave = 4;
+b_plus_insertar(&indice, &querydata);

 
 

+/*querydata.num_bloque = 6;
+querydata.clave.i_clave = 100;
+b_plus_insertar(&indice, &querydata);*/

 return 0;
 
 }
 return 0;
 
 }