Changeset: 7171e72faef8 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7171e72faef8
Modified Files:
gdk/gdk.h
gdk/gdk_logger.c
gdk/gdk_logger.h
Branch: default
Log Message:
Removed some remnants from the shared log directories.
See changeset 697c79aa0596.
diffs (144 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1316,7 +1316,6 @@ gdk_export restrict_t BATgetaccess(BAT *
#define PERSISTENT 0
#define TRANSIENT 1
-#define LOG_DIR 2
#define BATcapacity(b) (b)->batCapacity
/*
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -946,7 +946,7 @@ logger_open(logger *lg)
char *filename;
snprintf(id, sizeof(id), LLFMT, lg->id);
- filename = GDKfilepath(BBPselectfarm(lg->dbfarm_role, 0, offheap),
lg->dir, LOGFILE, id);
+ filename = GDKfilepath(BBPselectfarm(PERSISTENT, 0, offheap), lg->dir,
LOGFILE, id);
lg->log = open_wstream(filename);
if (lg->log) {
@@ -1523,49 +1523,6 @@ bm_subcommit(logger *lg, BAT *list_bid,
return res;
}
-/* Set the logdir path, add a dbfarm if needed.
- * Returns the role of the dbfarm containing the logdir.
- */
-static int
-logger_set_logdir_path(char *filename, const char *fn, const char *logdir)
-{
- int role = PERSISTENT; /* default role is persistent, i.e. the default
dbfarm */
-
- if (MT_path_absolute(logdir)) {
- char logdir_parent_path[FILENAME_MAX] = "";
- char logdir_name[FILENAME_MAX] = "";
-
- /* split the logdir string into absolute parent dir
- * path and (relative) log dir name */
- if (GDKextractParentAndLastDirFromPath(logdir,
logdir_parent_path, logdir_name) == GDK_SUCCEED) {
- /* set the new relative logdir location
- * including the logger function name
- * subdir */
- snprintf(filename, FILENAME_MAX, "%s%c%s%c",
- logdir_name, DIR_SEP, fn, DIR_SEP);
-
- /* add a new dbfarm for the logger directory
- * using the parent dir path, assuming it is
- * set, s.t. the logs are stored in a location
- * other than the default dbfarm, or at least
- * it appears so to (multi)dbfarm aware
- * functions */
- role = LOG_DIR;
- BBPaddfarm(logdir_parent_path, 1 << role);
- } else {
- fprintf(stderr, "logger_set_logdir_path: logdir path is
not correct (%s).\n"
- "Make sure you specify a valid absolute or
relative path.\n", logdir);
- return -1;
- }
- } else {
- /* just concat the logdir and fn with appropriate separators */
- snprintf(filename, FILENAME_MAX, "%s%c%s%c",
- logdir, DIR_SEP, fn, DIR_SEP);
- }
-
- return role;
-}
-
/* Load data from the logger logdir
* Initialize new directories and catalog files if none are present,
* unless running in read-only mode
@@ -1578,7 +1535,7 @@ logger_load(int debug, const char *fn, c
str filenamestr = NULL;
log_bid snapshots_bid = 0;
bat catalog_bid, catalog_nme, catalog_tpe, catalog_oid, dcatalog, bid;
- int farmid = BBPselectfarm(lg->dbfarm_role, 0, offheap);
+ int farmid = BBPselectfarm(PERSISTENT, 0, offheap);
bool needcommit = false;
int dbg = GDKdebug;
@@ -2153,9 +2110,15 @@ logger_load(int debug, const char *fn, c
static logger *
logger_new(int debug, const char *fn, const char *logdir, int version,
preversionfix_fptr prefuncp, postversionfix_fptr postfuncp)
{
- logger *lg = GDKmalloc(sizeof(struct logger));
+ logger *lg;
char filename[FILENAME_MAX];
+ if (!MT_path_absolute(logdir)) {
+ fprintf(stderr, "!ERROR: logger_new: logdir must be relative
path\n");
+ return NULL;
+ }
+
+ lg = GDKmalloc(sizeof(struct logger));
if (lg == NULL) {
fprintf(stderr, "!ERROR: logger_new: allocating logger
structure failed\n");
return NULL;
@@ -2173,12 +2136,13 @@ logger_new(int debug, const char *fn, co
lg->convert_nil_nan = false;
#endif
- lg->dbfarm_role = logger_set_logdir_path(filename, fn, logdir);
+ snprintf(filename, sizeof(filename), "%s%c%s%c",
+ logdir, DIR_SEP, fn, DIR_SEP);
lg->fn = GDKstrdup(fn);
lg->dir = GDKstrdup(filename);
lg->bufsize = 64*1024;
lg->buf = GDKmalloc(lg->bufsize);
- if (lg->dbfarm_role < 0 || lg->fn == NULL || lg->dir == NULL || lg->buf
== NULL) {
+ if (lg->fn == NULL || lg->dir == NULL || lg->buf == NULL) {
fprintf(stderr, "!ERROR: logger_new: strdup failed\n");
GDKfree(lg->fn);
GDKfree(lg->dir);
@@ -2304,7 +2268,7 @@ logger_exit(logger *lg)
{
FILE *fp;
char filename[FILENAME_MAX];
- int farmid = BBPselectfarm(lg->dbfarm_role, 0, offheap);
+ int farmid = BBPselectfarm(PERSISTENT, 0, offheap);
logger_close(lg);
if (GDKmove(farmid, lg->dir, LOGFILE, NULL, lg->dir, LOGFILE, "bak") !=
GDK_SUCCEED) {
@@ -2396,7 +2360,7 @@ logger_cleanup(logger *lg)
{
char buf[BUFSIZ];
FILE *fp = NULL;
- int farmid = BBPselectfarm(lg->dbfarm_role, 0, offheap);
+ int farmid = BBPselectfarm(PERSISTENT, 0, offheap);
snprintf(buf, sizeof(buf), "%s%s.bak-" LLFMT, lg->dir, LOGFILE, lg->id);
diff --git a/gdk/gdk_logger.h b/gdk/gdk_logger.h
--- a/gdk/gdk_logger.h
+++ b/gdk/gdk_logger.h
@@ -52,7 +52,6 @@ typedef struct logger {
char *fn;
char *dir;
char *local_dir; /* the directory in which the log is written */
- int dbfarm_role; /* role for the dbfarm used for the logdir, PERSISTENT
by default */
preversionfix_fptr prefuncp;
postversionfix_fptr postfuncp;
stream *log;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
