diff --git a/.gitignore b/.gitignore index d9e6619ff3bfa975676255ec177904cfec9567fb..55acbec79e6163d5c4fd6d586e36680ef71522e4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *.o main -.vscode \ No newline at end of file +.vscode +*.dat \ No newline at end of file diff --git a/b-tree.c b/b-tree.c index 98049c67ad0954509a9817fa2db2e9268503286d..e0e0b75d190eebc9e345918d57c7a7fe58a7bca2 100644 --- a/b-tree.c +++ b/b-tree.c @@ -194,12 +194,13 @@ b_tree insert_into_tree(b_tree tree, uint64_t key, record_t* record){ record_t* search(b_tree tree, uint64_t key){ int index = find_insertion_index(tree->keys, tree->count, key); - printf("%d\n", index); + //printf("%d\n", index); if(!is_leaf(tree)){ return search(tree->children[index], key); } else{ - printf("leaf: %lu, %lu\n", tree->keys[index-1], key); + //printf("leaf: %lu, %lu\n", tree->keys[index-1], key); + // gerer collisions ? if(tree->keys[index-1] == key){ return tree->children[index]; } diff --git a/main.c b/main.c index f045f7c911938607165456c24c31488e6c4712d7..7c2afb4417dd7635d2df686b208e200e87719bb1 100644 --- a/main.c +++ b/main.c @@ -4,7 +4,6 @@ #include <stdlib.h> #include <string.h> #include <assert.h> -#include <sys/types.h> #include "b-tree.h" #include "record.h" @@ -28,6 +27,28 @@ uint64_t record_hash(record_t* r){ return hash(r->phone); } +void write_database_to_disk(char* fileName, record_t* database, int size){ + FILE* f; + f = fopen(fileName, "wb"); + if(f == NULL){ + assert(false); + } + + fwrite(database, sizeof(record_t), size, f); + fclose(f); +} + +void read_database_from_disk(char* fileName, record_t* database, int size){ + FILE* f; + f = fopen(fileName, "rb"); + if(f == NULL){ + assert(false); + } + + fread(database, sizeof(record_t), size, f); + fclose(f); +} + int main(){ //hash("essdfuihfs"); b_tree node = create_node(); @@ -50,8 +71,14 @@ int main(){ uint64_t a[4] = {0, 2, 4, 5}; printf("%d\n", find_insertion_index(a, 4, 2)); + + //write_database_to_disk("test.dat", r, 1); + record_t* test = malloc(sizeof(record_t)); + read_database_from_disk("test.dat", test, 1); + print_record(*test); free_b(node); free(r); + free(test); return EXIT_SUCCESS; } \ No newline at end of file