X-Git-Url: https://git.llucax.com/z.facultad/75.06/emufs.git/blobdiff_plain/6aef50b3527d53caf1e701c665676deb8c2d79e0..3b1230d10dade60af8e3eb544efb66cce69719b4:/emufs/b_plus_test.c?ds=sidebyside

diff --git a/emufs/b_plus_test.c b/emufs/b_plus_test.c
index bf7a075..0dc7603 100644
--- a/emufs/b_plus_test.c
+++ b/emufs/b_plus_test.c
@@ -5,8 +5,8 @@ int main(int argc, char* argv[]) {
 
 /* Locals */
 INDEX_DAT querydata;
-/*NODO_B_PLUS *memnodo;
-int num_node, i;	*/
+/*NODO_B_PLUS *memnodo;*/
+int i;	
 /* Creamos un handler EMUFS, luego un Indice B+ y testing... */
 INDEXSPECS indice;
 indice.tam_bloque = SIZE_B_PLUS_HEADER + sizeof(int)*5 + sizeof(int)*6;
@@ -16,21 +16,35 @@ 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);
 	
-querydata.num_bloque = 9;
-querydata.clave.i_clave = 8;
+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;
@@ -46,7 +60,7 @@ memnodo = b_plus_leer_nodo(&indice, num_node);
 	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);