obitools/obitools3
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 66 Wiki Activity

Multiple AVLs with bloom filters (very raw test version)

Browse Source
This commit is contained in:
Celine Mercier
2016-03-18 11:06:02 +01:00
parent 545ed8111a
commit 3681cecb4d
12 changed files with 677 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/obidmscolumn.c
View File

@ -521,7 +521,6 @@ OBIDMS_column_p obi_create_column(OBIDMS_p dms,
OBIDMS_column_p new_column;
OBIDMS_column_directory_p column_directory;
OBIDMS_column_header_p header;
OBIDMS_avl_p* avl;
size_t file_size;
obiversion_t version_number;
char* column_file_name;
@ -723,16 +722,15 @@ OBIDMS_column_p obi_create_column(OBIDMS_p dms,
// If the data type is OBI_STR or OBI_SEQ, the associated obi_avl is opened or created
if ((returned_data_type == OBI_STR) || (returned_data_type == OBI_SEQ))
{
avl = obi_create_avl_in_64_parts(dms, avl_name);
if (avl == NULL)
{
obidebug(1, "\nError opening or creating the aVL tree associated with a column");
munmap(new_column->header, header_size);
close(column_file_descriptor);
free(new_column);
return NULL;
}
memcpy(new_column->avl, avl, 64*sizeof(OBIDMS_avl_p));
new_column->avl = obi_create_avl_group(dms, avl_name);
// if (avl == NULL) TODO
// {
// obidebug(1, "\nError opening or creating the aVL tree associated with a column");
// munmap(new_column->header, header_size);
// close(column_file_descriptor);
// free(new_column);
// return NULL;
// }
strncpy(header->avl_name, avl_name, AVL_MAX_NAME);
}
@ -756,11 +754,11 @@ OBIDMS_column_p obi_open_column(OBIDMS_p dms,
{
OBIDMS_column_p column;
OBIDMS_column_directory_p column_directory;
OBIDMS_avl_p avl;
char* column_file_name;
int column_file_descriptor;
size_t header_size;
size_t i;
OBIDMS_avl_p avl;
column = NULL;