Changeset: 6ce49316d14f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6ce49316d14f
Modified Files:
clients/Tests/exports.stable.out
clients/mapiclient/dump.c
common/options/monet_options.c
common/utils/msabaoth.c
common/utils/msabaoth.h
gdk/gdk.h
gdk/gdk_logger.c
gdk/gdk_logger.h
gdk/gdk_utils.c
monetdb5/ChangeLog
monetdb5/NT/M5server.bat
monetdb5/mal/Tests/tst605.stable.out
monetdb5/mal/mal_box.c
monetdb5/mal/mal_sabaoth.c
monetdb5/mal/mal_sabaoth.h
monetdb5/mal/mal_session.c
monetdb5/modules/kernel/logger.c
monetdb5/modules/kernel/logger.mal
monetdb5/modules/mal/Tests/remote99.mal
monetdb5/modules/mal/Tests/remote99.stable.out
monetdb5/modules/mal/bbp.mal
monetdb5/modules/mal/const.c
monetdb5/modules/mal/mal_io.mal
monetdb5/modules/mal/trader.c
monetdb5/tests/BugsViaSourgeforce/Tests/ID.905495s
monetdb5/tests/BugsViaSourgeforce/Tests/ID.905495s.bat
monetdb5/tools/Tests/mserver5--help.stable.err
sql/backends/monet5/embeddedclient.h
sql/backends/monet5/prog.c
sql/backends/monet5/sql_optimizer.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/vaults/vault.c
sql/server/sql_mvc.c
sql/server/sql_mvc.h
sql/storage/bat/bat_logger.c
sql/storage/restrict/restrict_logger.c
sql/storage/sql_storage.h
sql/storage/store.c
sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err
sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out
testing/Mtest.py.in
testing/process.py
tools/merovingian/daemon/forkmserver.c
tools/merovingian/daemon/merovingian.c
tools/mserver/mserver5.1
tools/mserver/mserver5.c
Branch: default
Log Message:
The --dbname and --dbpath options have been replaced by --dbpath.
Only the mserver5 program is affected, the interfaces of all client
programs and monetdb/monetdbd are unaffected.
diffs (truncated from 1223 to 300 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -415,7 +415,7 @@ int log_tstart(logger *lg);
log_bid logger_add_bat(logger *lg, BAT *b, char *name);
size_t logger_changes(logger *lg);
int logger_cleanup(logger *lg);
-logger *logger_create(int debug, char *fn, char *logdir, char *dbname, int
version, preversionfix_fptr prefuncp, postversionfix_fptr postfuncp);
+logger *logger_create(int debug, char *fn, char *logdir, int version,
preversionfix_fptr prefuncp, postversionfix_fptr postfuncp);
void logger_del_bat(logger *lg, log_bid bid);
void logger_destroy(logger *lg);
int logger_exit(logger *lg);
@@ -429,6 +429,8 @@ char *mo_find_option(opt *set, int setle
void mo_free_options(opt *set, int setlen);
void mo_print_options(opt *set, int setlen);
int mo_system_config(opt **Set, int setlen);
+void msab_dbfarminit(const char *dbfarm);
+void msab_dbpathinit(const char *dbpath);
char *msab_deserialise(sabdb **ret, char *sabdb);
char *msab_freeStatus(sabdb **ret);
char *msab_getDBfarm(char **ret);
@@ -436,7 +438,6 @@ char *msab_getDBname(char **ret);
char *msab_getMyStatus(sabdb **ret);
char *msab_getStatus(sabdb **ret, char *dbname);
char *msab_getUplogInfo(sabuplog *ret, const sabdb *db);
-void msab_init(char *dbfarm, char *dbname);
char *msab_marchConnection(const char *host, const int port);
char *msab_marchScenario(const char *lang);
char *msab_registerStarted(void);
@@ -2146,7 +2147,6 @@ str SABAOTHgetLocalConnection(str *ret);
str SABAOTHgetMyStatus(sabdb **ret);
str SABAOTHgetStatus(sabdb **ret, str dbname);
str SABAOTHgetUplogInfo(sabuplog *ret, sabdb *db);
-void SABAOTHinit(str dbfarm, str dbname);
str SABAOTHmarchConnection(int *ret, str *host, int *port);
str SABAOTHmarchScenario(int *ret, str *lang);
str SABAOTHretreatScenario(int *ret, str *lang);
@@ -2790,7 +2790,7 @@ int log_tstart_wrap(logger *L);
int logger_add_bat_wrap(int *bid, logger *L, BAT *b, str nme);
int logger_changes_wrap(int *r, logger *L);
int logger_cleanup_wrap(logger *L);
-str logger_create_wrap(logger *L, int *debug, str *fn, str *dirname, str
*dbname, int *version);
+str logger_create_wrap(logger *L, int *debug, str *fn, str *dirname, int
*version);
int logger_del_bat_wrap(logger *L, int *bid);
str logger_destroy_wrap(logger *L);
int logger_exit_wrap(logger *L);
diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c
--- a/clients/mapiclient/dump.c
+++ b/clients/mapiclient/dump.c
@@ -1934,9 +1934,9 @@ dump_version(Mapi mid, stream *toConsole
"SELECT \"name\", \"value\" "
"FROM sys.env() AS env "
"WHERE \"name\" IN ('gdk_dbname', "
- "'monet_version', "
- "'monet_release', "
- "'merovingian_uri')")) == NULL ||
+ "'monet_version', "
+ "'monet_release', "
+ "'merovingian_uri')")) == NULL ||
mapi_error(mid))
goto cleanup;
diff --git a/common/options/monet_options.c b/common/options/monet_options.c
--- a/common/options/monet_options.c
+++ b/common/options/monet_options.c
@@ -232,19 +232,16 @@ mo_builtin_settings(opt **Set)
if (Set == NULL)
return 0;
-#define N_OPTIONS 11 /*MUST MATCH # OPTIONS BELOW */
+#define N_OPTIONS 10 /*MUST MATCH # OPTIONS BELOW */
set = malloc(sizeof(opt) * N_OPTIONS);
if (set == NULL)
return 0;
set[i].kind = opt_builtin;
- set[i].name = strdup("gdk_dbname");
- set[i].value = strdup("demo");
- i++;
- set[i].kind = opt_builtin;
- set[i].name = strdup("gdk_dbfarm");
- snprintf(buf, BUFSIZ, "%s%c%s%c%s",
- LOCALSTATEDIR, DIR_SEP, "monetdb5", DIR_SEP, "dbfarm");
+ set[i].name = strdup("gdk_dbpath");
+ snprintf(buf, BUFSIZ, "%s%c%s%c%s%c%s",
+ LOCALSTATEDIR, DIR_SEP, "monetdb5", DIR_SEP, "dbfarm",
+ DIR_SEP, "demo");
set[i].value = strdup(buf);
i++;
set[i].kind = opt_builtin;
diff --git a/common/utils/msabaoth.c b/common/utils/msabaoth.c
--- a/common/utils/msabaoth.c
+++ b/common/utils/msabaoth.c
@@ -51,6 +51,8 @@
#define unlink _unlink
#endif
+#define PATHLENGTH 4096
+
/** the directory where the databases are (aka dbfarm) */
char *_sabaoth_internal_dbfarm = NULL;
/** the database which is "active" */
@@ -106,8 +108,8 @@ getDBPath(char **ret, size_t size, const
* dbname may be NULL to indicate that there is no active database. The
* arguments are copied for internal use.
*/
-void
-msab_init(char *dbfarm, char *dbname)
+static void
+msab_init(const char *dbfarm, const char *dbname)
{
size_t len;
@@ -143,6 +145,23 @@ msab_init(char *dbfarm, char *dbname)
_sabaoth_internal_dbname = strdup(dbname);
}
}
+void
+msab_dbpathinit(const char *dbpath)
+{
+ char dbfarm[PATHLENGTH];
+ const char *p;
+
+ p = strrchr(dbpath, DIR_SEP);
+ assert(p != NULL);
+ strncpy(dbfarm, dbpath, p - dbpath);
+ dbfarm[p - dbpath] = 0;
+ msab_init(dbfarm, p + 1);
+}
+void
+msab_dbfarminit(const char *dbfarm)
+{
+ msab_init(dbfarm, NULL);
+}
/**
* Returns the dbfarm as received during msab_init. Returns an
@@ -172,8 +191,6 @@ msab_getDBname(char **ret)
return(NULL);
}
-#define PATHLENGTH 4096
-
#define SCENARIOFILE ".scen"
/**
diff --git a/common/utils/msabaoth.h b/common/utils/msabaoth.h
--- a/common/utils/msabaoth.h
+++ b/common/utils/msabaoth.h
@@ -67,7 +67,8 @@ typedef struct Ssabuplog {
#define msab_export extern
#endif
-msab_export void msab_init(char *dbfarm, char *dbname);
+msab_export void msab_dbpathinit(const char *dbpath);
+msab_export void msab_dbfarminit(const char *dbfarm);
msab_export char *msab_getDBfarm(char **ret);
msab_export char *msab_getDBname(char **ret);
msab_export char *msab_marchScenario(const char *lang);
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -437,7 +437,7 @@
* @- GDK session handling
* @multitable @columnfractions 0.08 0.7
* @item int
- * @tab GDKinit (char *db, char *dbfarm, int allocmap)
+ * @tab GDKinit (char *db, char *dbpath, int allocmap)
* @item int
* @tab GDKexit (int status)
* @end multitable
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -947,7 +947,7 @@ check_version(logger *lg, FILE *fp)
(*lg->prefuncp)(version, lg->version) != 0) {
GDKerror("Incompatible database version %06d, "
"this server supports version %06d\n"
- "Please move away %s and its corresponding
dbfarm.",
+ "Please move away %s.",
version, lg->version, lg->dir);
return -1;
@@ -1029,7 +1029,7 @@ logger_fatal(const char *format, const c
}
static logger *
-logger_new(int debug, char *fn, char *logdir, char *dbname, int version,
preversionfix_fptr prefuncp, postversionfix_fptr postfuncp)
+logger_new(int debug, char *fn, char *logdir, int version, preversionfix_fptr
prefuncp, postversionfix_fptr postfuncp)
{
int id = LOG_SID;
logger *lg = (struct logger *) GDKmalloc(sizeof(struct logger));
@@ -1057,8 +1057,8 @@ logger_new(int debug, char *fn, char *lo
* logger_create/logger_new "manually" */
assert(!MT_path_absolute(logdir));
- snprintf(filename, BUFSIZ, "%s%c%s%c%s%c%s%c",
- GDKgetenv("gdk_dbfarm"), DIR_SEP, dbname, DIR_SEP,
+ snprintf(filename, BUFSIZ, "%s%c%s%c%s%c",
+ GDKgetenv("gdk_dbpath"), DIR_SEP,
logdir, DIR_SEP, fn, DIR_SEP);
lg->fn = GDKstrdup(fn);
lg->dir = GDKstrdup(filename);
@@ -1202,7 +1202,7 @@ logger_new(int debug, char *fn, char *lo
if (fp != NULL) {
logger_fatal("logger_new: there is no logger catalog,
but there is a log file.\n"
"Are you sure you are using the correct
combination of database\n"
- "(--dbfarm / --dbname) and log directory
(--set %s_logdir)?\n",
+ "(--dbpath) and log directory (--set
%s_logdir)?\n",
fn, 0, 0);
goto error;
}
@@ -1266,7 +1266,7 @@ logger_new(int debug, char *fn, char *lo
if (fp == NULL) {
logger_fatal("logger_new: there is a logger catalog,
but no log file.\n"
"Are you sure you are using the correct
combination of database\n"
- "(--dbfarm / --dbname) and log directory
(--set %s_logdir)?\n"
+ "(--dbpath) and log directory (--set
%s_logdir)?\n"
"If you have done a recent update of the
server, it may be that your\n"
"logs are in an old location. You should
then either use\n"
"--set %s_logdir=<path to old log
directory> or move the old log\n"
@@ -1352,7 +1352,7 @@ logger_new(int debug, char *fn, char *lo
}
#if SIZEOF_OID == 8
- /* When a file *_32-64-convert exists in the dbfarm,
+ /* When a file *_32-64-convert exists in the database,
* it was left there by the BBP initialization code
* when it did a conversion of 32-bit OIDs to 64 bits
* (see the comment above fixoidheapcolumn and
@@ -1360,18 +1360,18 @@ logger_new(int debug, char *fn, char *lo
* first create a file called convert-32-64 in the log
* directory and we write the current log ID into that
* file. After this file is created, we delete the
- * *_32-64-convert file in the dbfarm. We then know
+ * *_32-64-convert file in the database. We then know
* that while reading the logs, we have to read OID
* values as 32 bits (this is indicated by setting the
* read32bitoid flag). When we're done reading the
* logs, we remove the file (and reset the flag). If
* we get interrupted before we have written this
- * file, the file in the dbfarm will still exist, so
+ * file, the file in the database will still exist, so
* the next time we're started, BBPinit will not
* convert OIDs (that was done before we got
* interrupted), but we will still know to convert the
* OIDs ourselves. If we get interrupted after we
- * have deleted the file from the dbfarm, we check
+ * have deleted the file from the database, we check
* whether the file convert-32-64 exists and if it
* contains the expected ID. If it does, we again
* know that we have to convert. If the ID is not
@@ -1379,8 +1379,8 @@ logger_new(int debug, char *fn, char *lo
* already, and so we can delete the file. */
snprintf(cvfile, sizeof(cvfile),
- "%s%c%s%c%s%c%s%cconvert-32-64",
- GDKgetenv("gdk_dbfarm"), DIR_SEP, dbname,
+ "%s%c%s%c%s%cconvert-32-64",
+ GDKgetenv("gdk_dbpath"),
DIR_SEP, logdir, DIR_SEP, fn, DIR_SEP);
snprintf(bak, sizeof(bak), "%s_32-64-convert", fn);
{
@@ -1459,9 +1459,9 @@ logger_new(int debug, char *fn, char *lo
}
logger *
-logger_create(int debug, char *fn, char *logdir, char *dbname, int version,
preversionfix_fptr prefuncp, postversionfix_fptr postfuncp)
+logger_create(int debug, char *fn, char *logdir, int version,
preversionfix_fptr prefuncp, postversionfix_fptr postfuncp)
{
- logger *lg = logger_new(debug, fn, logdir, dbname, version, prefuncp,
postfuncp);
+ logger *lg = logger_new(debug, fn, logdir, version, prefuncp,
postfuncp);
if (!lg)
return NULL;
diff --git a/gdk/gdk_logger.h b/gdk/gdk_logger.h
--- a/gdk/gdk_logger.h
+++ b/gdk/gdk_logger.h
@@ -99,7 +99,7 @@ typedef int log_bid;
/* the sequence identifier for frontend objects */
#define OBJ_SID 1
-gdk_export logger *logger_create(int debug, char *fn, char *logdir, char
*dbname, int version, preversionfix_fptr prefuncp, postversionfix_fptr
postfuncp);
+gdk_export logger *logger_create(int debug, char *fn, char *logdir, int
version, preversionfix_fptr prefuncp, postversionfix_fptr postfuncp);
gdk_export void logger_destroy(logger *lg);
gdk_export int logger_exit(logger *lg);
gdk_export int logger_restart(logger *lg);
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -31,8 +31,7 @@
#include "gdk_private.h"
#include "mutils.h"
-static char GDKdbfarmStr[PATHLENGTH] = { "dbfarm" };
-static char GDKdbnameStr[PATHLENGTH] = { 0 };
+static char GDKdbpathStr[PATHLENGTH] = { "dbpath" };
BAT *GDKkey = NULL;
BAT *GDKval = NULL;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
