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

changed 'column groups' to be called 'column directories' for now.

Browse Source
This commit is contained in:
Celine Mercier
2015-06-26 17:53:03 +02:00
parent 71cd59f775
commit c454f9612e
4 changed files with 104 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
src/obidmscolumn.c
View File

@ -20,10 +20,11 @@
#include <sys/mman.h> /* mmap() is defined in this header */
#include "obidmscolumn.h"
#include "obidmscolumngroup.h"
#include "obidmscolumndir.h"
#include "obidms.h"
#include "obitypes.h"
#include "obierrno.h"
#include "obidebug.h"
#include "obilittlebigman.h"
#include "private_at_functions.h"
@ -93,7 +94,7 @@ static char *build_version_file_name(const char *column_name);
* @since May 2015
* @author Eric Coissac (eric.coissac@metabarcoding.org)
*/
static obiversion_t obi_get_new_version_number(OBIDMS_column_group_p column_group, bool block);
static obiversion_t obi_get_new_version_number(OBIDMS_column_directory_p column_directory, bool block);
/**
@ -111,7 +112,7 @@ static obiversion_t obi_get_new_version_number(OBIDMS_column_group_p column_grou
* @since May 2015
* @author Eric Coissac (eric.coissac@metabarcoding.org)
*/
static int create_version_file(OBIDMS_column_group_p column_group);
static int create_version_file(OBIDMS_column_directory_p column_directory);
/************************************************************************
@ -120,14 +121,17 @@ static int create_version_file(OBIDMS_column_group_p column_group);
*
************************************************************************/
#define DEBUG_LEVEL 0
static char *build_column_file_name(const char *column_name, obiversion_t version_number)
{
char *filename;
// Build the database directory name
if (asprintf(&filename,"%s@%d.odc", column_name, version_number) < 0)
if (asprintf(&filename,"%s@%d.odc", column_name, version_number) > 0)
{
obi_set_errno(OBICOL_MEMORY_ERROR);
obidebug(1, "\nasprintf() function failed");
return NULL;
}
@ -150,7 +154,7 @@ static char *build_version_file_name(const char *column_name)
}
static obiversion_t obi_get_new_version_number(OBIDMS_column_group_p column_group, bool block)
static obiversion_t obi_get_new_version_number(OBIDMS_column_directory_p column_directory, bool block)
{
off_t loc_size;
obiversion_t new_version_number;
@ -170,12 +174,12 @@ static obiversion_t obi_get_new_version_number(OBIDMS_column_group_p column_grou
lock_mode=F_TLOCK;
// Build the version file name
version_file_name = build_version_file_name(column_group->column_name);
version_file_name = build_version_file_name(column_directory->column_name);
if (version_file_name == NULL)
return -1;
// Get the file descriptor associated to the column group directory
column_dir_file_descriptor = dirfd(column_group->directory);
// Get the file descriptor associated to the column directory
column_dir_file_descriptor = dirfd(column_directory->directory);
if (column_dir_file_descriptor < 0)
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
@ -188,9 +192,8 @@ static obiversion_t obi_get_new_version_number(OBIDMS_column_group_p column_grou
if (version_file_descriptor < 0)
{
free(version_file_name);
//close(column_dir_file_descriptor);
if (errno == ENOENT)
return create_version_file(column_group);
return create_version_file(column_directory);
else
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
@ -300,14 +303,13 @@ static obiversion_t obi_get_new_version_number(OBIDMS_column_group_p column_grou
}
close(version_file_descriptor);
//close(column_dir_file_descriptor);
free(version_file_name);
return new_version_number;
}
static int create_version_file(OBIDMS_column_group_p column_group)
static int create_version_file(OBIDMS_column_directory_p column_directory)
{
off_t loc_size;
obiversion_t version_number;
@ -319,12 +321,12 @@ static int create_version_file(OBIDMS_column_group_p column_group)
loc_size = sizeof(bool) + sizeof(obiversion_t);
version_number = 0;
version_file_name = build_version_file_name(column_group->column_name);
version_file_name = build_version_file_name(column_directory->column_name);
if (version_file_name == NULL)
return -1;
// Get the file descriptor associated to the column group directory
column_dir_file_descriptor = dirfd(column_group->directory);
// Get the file descriptor associated to the column directory
column_dir_file_descriptor = dirfd(column_directory->directory);
if (column_dir_file_descriptor < 0)
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
@ -415,7 +417,6 @@ static int create_version_file(OBIDMS_column_group_p column_group)
}
close(version_file_descriptor);
//close(column_dir_file_descriptor);
free(version_file_name);
return version_number;
@ -428,7 +429,7 @@ static int create_version_file(OBIDMS_column_group_p column_group)
*
**********************************************************************/
obiversion_t obi_get_latest_version_number(OBIDMS_column_group_p column_group)
obiversion_t obi_get_latest_version_number(OBIDMS_column_directory_p column_directory)
{
off_t loc_size;
obiversion_t latest_version_number;
@ -440,12 +441,12 @@ obiversion_t obi_get_latest_version_number(OBIDMS_column_group_p column_group)
loc_size = sizeof(bool) + sizeof(obiversion_t);
latest_version_number = 0;
version_file_name = build_version_file_name(column_group->column_name);
version_file_name = build_version_file_name(column_directory->column_name);
if (version_file_name==NULL)
return -1;
// Get the file descriptor associated to the column group directory
column_dir_file_descriptor = dirfd(column_group->directory);
// Get the file descriptor associated to the column directory
column_dir_file_descriptor = dirfd(column_directory->directory);
if (column_dir_file_descriptor < 0)
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
@ -515,7 +516,6 @@ obiversion_t obi_get_latest_version_number(OBIDMS_column_group_p column_group)
free(version_file_name);
close(version_file_descriptor);
//close(column_dir_file_descriptor);
return latest_version_number;
}
@ -533,7 +533,7 @@ OBIDMS_column_p obi_create_column(OBIDMS_p dms,
size_t nb_elements)
{
OBIDMS_column_p new_column;
OBIDMS_column_group_p column_group;
OBIDMS_column_directory_p column_directory;
OBIDMS_column_header_p header;
size_t file_size;
obiversion_t version_number;
@ -545,17 +545,17 @@ OBIDMS_column_p obi_create_column(OBIDMS_p dms,
new_column = NULL;
// Get the column group structure associated to the column
column_group = obi_column_group(dms, column_name);
if (column_group == NULL)
// Get the column directory structure associated to the column
column_directory = obi_column_directory(dms, column_name);
if (column_directory == NULL)
return NULL;
// Get the file descriptor associated to the column group directory
column_dir_file_descriptor = dirfd(column_group->directory);
// Get the file descriptor associated to the column directory
column_dir_file_descriptor = dirfd(column_directory->directory);
if (column_dir_file_descriptor < 0)
{
obi_set_errno(OBICOLDIR_UNKNOWN_ERROR);
obi_close_column_group(column_group);
obi_close_column_directory(column_directory);
return NULL;
}
@ -565,10 +565,10 @@ OBIDMS_column_p obi_create_column(OBIDMS_p dms,
file_size = header_size + data_size;
// Get the latest version number
version_number = obi_get_new_version_number(column_group, true);
version_number = obi_get_new_version_number(column_directory, true);
if (version_number < 0)
{
obi_close_column_group(column_group);
obi_close_column_directory(column_directory);
close(column_dir_file_descriptor);
return NULL;
}
@ -577,7 +577,7 @@ OBIDMS_column_p obi_create_column(OBIDMS_p dms,
column_file_name = build_column_file_name(column_name, version_number);
if (column_file_name == NULL)
{
obi_close_column_group(column_group);
obi_close_column_directory(column_directory);
close(column_dir_file_descriptor);
return NULL;
}
@ -587,7 +587,7 @@ OBIDMS_column_p obi_create_column(OBIDMS_p dms,
if (column_file_descriptor < 0)
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obi_close_column_group(column_group);
obi_close_column_directory(column_directory);
close(column_dir_file_descriptor);
free(column_file_name);
return NULL;
@ -597,7 +597,7 @@ OBIDMS_column_p obi_create_column(OBIDMS_p dms,
if (ftruncate(column_file_descriptor, file_size) < 0)
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obi_close_column_group(column_group);
obi_close_column_directory(column_directory);
close(column_dir_file_descriptor);
close(column_file_descriptor);
free(column_file_name);
@ -609,7 +609,7 @@ OBIDMS_column_p obi_create_column(OBIDMS_p dms,
if (new_column == NULL)
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obi_close_column_group(column_group);
obi_close_column_directory(column_directory);
close(column_dir_file_descriptor);
close(column_file_descriptor);
free(column_file_name);
@ -618,7 +618,7 @@ OBIDMS_column_p obi_create_column(OBIDMS_p dms,
// Fill the column structure
new_column->dms = dms;
new_column->column_group = column_group;
new_column->column_directory = column_directory;
new_column->header = mmap(NULL,
header_size,
PROT_READ | PROT_WRITE,
@ -630,7 +630,7 @@ OBIDMS_column_p obi_create_column(OBIDMS_p dms,
if (new_column->header == MAP_FAILED)
{
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obi_close_column_group(column_group);
obi_close_column_directory(column_directory);
close(column_dir_file_descriptor);
close(column_file_descriptor);
free(column_file_name);
@ -650,7 +650,7 @@ OBIDMS_column_p obi_create_column(OBIDMS_p dms,
{
munmap(new_column->header, header_size);
obi_set_errno(OBICOL_UNKNOWN_ERROR);
obi_close_column_group(column_group);
obi_close_column_directory(column_directory);
close(column_dir_file_descriptor);
close(column_file_descriptor);
free(column_file_name);
@ -672,7 +672,6 @@ OBIDMS_column_p obi_create_column(OBIDMS_p dms,
strncpy(header->name, column_name, OBIDMS_MAX_COLNAME);
free(column_file_name);
//close(column_dir_file_descriptor);
close(column_file_descriptor);
return new_column;