X-Git-Url: https://git.llucax.com/z.facultad/75.52/treemulator.git/blobdiff_plain/6d49476dc3816c4ba38637bc21f44693ca66af32..78d8bc6c001cb877d8c7daf3868835815a97ce21:/src/btree.h?ds=sidebyside

diff --git a/src/btree.h b/src/btree.h
index 8d86583..b001bef 100644
--- a/src/btree.h
+++ b/src/btree.h
@@ -46,18 +46,21 @@
 
 #include <iostream>
 #include <string>
+#include <list>
 #include "common.h"
 #include "clave.h"
+#include "clave_fija.h"
+#include "btree_data.h"
 
 /* alias para codear menos :) */
 
 /** Encabezado del archivo BTree */
-typedef struct _btree_file_ {
+struct BTreeFileHeader {
 	uint block_size;
-} BTreeFileHeader;
+};
 
 /** Encabezado de un bloque */
-typedef struct _btree_header_ {
+struct BTreeNodeHeader {
 	/** Indica a que nivel corresponde un bloque
 	 *
 	 *  nivel == 0 : una hoja
@@ -73,7 +76,7 @@ typedef struct _btree_header_ {
 
 	/** Cantidad de elementos en el nodo */
 	unsigned int item_count;
-} BTreeNodeHeader;
+};
 
 /** Crea un nuevo arbol B
  *
@@ -83,21 +86,24 @@ typedef struct _btree_header_ {
  */
 class BTree {
 	public:
-		BTree (const char *filename, unsigned int block_size, bool create_new_file = false);
+		BTree (const std::string &filename, unsigned int block_size, bool create_new_file = false);
 		~BTree ();
 
-		void AddKey (Clave &k);
-		void DelKey (Clave &k);
+		void AddKey (const Clave &k);
+		void DelKey (const Clave &k);
 
 	private:
-		void write_tree_header ();
-		void write_block (uchar *block, uint num);
+		void WriteFileHeader ();
 
+		void WriteBlock (uchar *block, uint num);
 		uchar *ReadBlock (uint num);
 
 		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::string filename;
 		BTreeFileHeader header;