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

Made the truncating of columns automatic when closing them (note:

Browse Source 
already the case for AVLs)
This commit is contained in:
Celine Mercier
2016-04-14 15:13:30 +02:00
parent 9d042f7bd0
commit 4cb52e1632
11 changed files with 17 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/obidmscolumn.c
View File

@ -989,6 +989,13 @@ int obi_close_column(OBIDMS_column_p column)
bool close_dir;
Opened_columns_list_p columns_list;
// Truncate the column to the number of lines used if it's not read-only
if (column->writable)
{
if (obi_truncate_column(column) < 0)
return -1;
}
columns_list = (column->dms)->opened_columns;
(column->counter)--;
@ -1049,7 +1056,7 @@ int obi_close_column(OBIDMS_column_p column)
}
int obi_truncate_column_to_lines_used(OBIDMS_column_p column) // TODO is it necessary to unmap/remap?
int obi_truncate_column(OBIDMS_column_p column) // TODO is it necessary to unmap/remap?
{
size_t file_size;
size_t data_size;
@ -1224,20 +1231,6 @@ int obi_enlarge_column(OBIDMS_column_p column)
}
int obi_truncate_and_close_column(OBIDMS_column_p column)
{
if (column->writable) // TODO discuss
{
if (obi_truncate_column_to_lines_used(column) < 0)
return -1;
}
if (obi_close_column(column) < 0)
return -1;
return 0;
}
void obi_ini_to_NA_values(OBIDMS_column_p column,
index_t first_line_nb,
index_t nb_lines)