Changeset: 9332fff52a16 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9332fff52a16
Modified Files:
NT/monetdb_config.h.in
clients/mapiclient/mclient.c
clients/mapiclient/msqldump.c
clients/odbc/driver/SQLGetInfo.c
configure.ag
monetdb5/mal/mal_linker.c
tools/merovingian/client/monetdb.c
tools/merovingian/daemon/argvcmds.c
tools/merovingian/daemon/controlrunner.c
tools/merovingian/daemon/merovingian.c
tools/mserver/monet_version.c.in
tools/mserver/mserver5.c
Branch: default
Log Message:
Merge with Apr2019 branch.
diffs (truncated from 327 to 300 lines):
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -636,7 +636,7 @@
#define MONETDB5_PASSWDHASH_TOKEN SHA512
/* Release name or "unreleased" */
-#define MONETDB_RELEASE "unreleased"
+/* #define MONETDB_RELEASE "unreleased" */
/* Define if you do not want assertions */
/* #undef NDEBUG */
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -3430,16 +3430,16 @@ main(int argc, char **argv)
user_set_as_flag = true;
break;
case 'v': {
- const char *rev = mercurial_revision();
mnstr_printf(toConsole,
"mclient, the MonetDB interactive "
"terminal, version %s", VERSION);
- /* coverity[pointless_string_compare] */
- if (strcmp(MONETDB_RELEASE, "unreleased") != 0)
- mnstr_printf(toConsole, " (%s)",
- MONETDB_RELEASE);
- else if (strcmp(rev, "Unknown") != 0)
+#ifdef MONETDB_RELEASE
+ mnstr_printf(toConsole, " (%s)", MONETDB_RELEASE);
+#else
+ const char *rev = mercurial_revision();
+ if (strcmp(rev, "Unknown") != 0)
mnstr_printf(toConsole, " (hg id: %s)", rev);
+#endif
mnstr_printf(toConsole, "\n");
#ifdef HAVE_LIBREADLINE
mnstr_printf(toConsole,
@@ -3605,7 +3605,13 @@ main(int argc, char **argv)
mnstr_printf(toConsole,
"Welcome to mclient, the MonetDB%s "
"interactive terminal (%s)\n",
- lang, MONETDB_RELEASE);
+ lang,
+#ifdef MONETDB_RELEASE
+ MONETDB_RELEASE
+#else
+ "unreleased"
+#endif
+ );
if (mode == SQL)
dump_version(mid, toConsole, "Database:");
diff --git a/clients/mapiclient/msqldump.c b/clients/mapiclient/msqldump.c
--- a/clients/mapiclient/msqldump.c
+++ b/clients/mapiclient/msqldump.c
@@ -129,14 +129,15 @@ main(int argc, char **argv)
trace = true;
break;
case 'v': {
- const char *rev = mercurial_revision();
printf("msqldump, the MonetDB interactive database "
"dump tool, version %s", VERSION);
- /* coverity[pointless_string_compare] */
- if (strcmp(MONETDB_RELEASE, "unreleased") != 0)
- printf(" (%s)", MONETDB_RELEASE);
- else if (strcmp(rev, "Unknown") != 0)
+#ifdef MONETDB_RELEASE
+ printf(" (%s)", MONETDB_RELEASE);
+#else
+ const char *rev = mercurial_revision();
+ if (strcmp(rev, "Unknown") != 0)
printf(" (hg id: %s)", rev);
+#endif
printf("\n");
return 0;
}
@@ -197,7 +198,6 @@ main(int argc, char **argv)
char buf[27];
time_t t = time(0);
char *p;
- const char *rev = mercurial_revision();
#ifdef HAVE_CTIME_R3
ctime_r(&t, buf, sizeof(buf));
@@ -213,12 +213,13 @@ main(int argc, char **argv)
mnstr_printf(out,
"-- msqldump version %s", VERSION);
- /* coverity[pointless_string_compare] */
- if (strcmp(MONETDB_RELEASE, "unreleased") != 0)
- mnstr_printf(out, " (%s)",
- MONETDB_RELEASE);
- else if (strcmp(rev, "Unknown") != 0)
+#ifdef MONETDB_RELEASE
+ mnstr_printf(out, " (%s)", MONETDB_RELEASE);
+#else
+ const char *rev = mercurial_revision();
+ if (strcmp(rev, "Unknown") != 0)
mnstr_printf(out, " (hg id: %s)", rev);
+#endif
mnstr_printf(out, " %s %s%s\n",
describe ? "describe" : "dump",
functions ? "functions" : table ? "table " :
"database",
diff --git a/clients/odbc/driver/SQLGetInfo.c b/clients/odbc/driver/SQLGetInfo.c
--- a/clients/odbc/driver/SQLGetInfo.c
+++ b/clients/odbc/driver/SQLGetInfo.c
@@ -442,7 +442,12 @@ MNDBGetInfo(ODBCDbc *dbc,
int maj = 0, min = 0, pat = 0;
sscanf(PACKAGE_VERSION, "%d.%d.%d", &maj, &min, &pat);
snprintf(buf, sizeof(buf), "%02d.%02d.%04d %s", maj, min, pat,
- MONETDB_RELEASE);
+#ifdef MONETDB_RELEASE
+ MONETDB_RELEASE
+#else
+ "unreleased"
+#endif
+ );
sValue = buf;
break;
}
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -67,7 +67,8 @@ AC_SUBST([CONFIG_H], [monetdb_config.h])
HOST=[$target]
AC_DEFINE_UNQUOTED([HOST], ["$HOST"], [Host identifier])
-AC_DEFINE([MONETDB_RELEASE], ["unreleased"], [Release name or "unreleased"])
+dnl The next line is modified for a release and commented between releases
+dnl AC_DEFINE([MONETDB_RELEASE], ["unreleased"], [Release name])
AS_VAR_IF([target_os], [cygwin],
[AC_DEFINE([WIN32], 1, [Define on Microsoft Windows (also under
Cygwin)])])
diff --git a/monetdb5/mal/mal_linker.c b/monetdb5/mal/mal_linker.c
--- a/monetdb5/mal/mal_linker.c
+++ b/monetdb5/mal/mal_linker.c
@@ -200,7 +200,7 @@ loadLibrary(str filename, int flag)
handle = dlopen(nme, mode);
if (handle == NULL && fileexists(nme))
throw(LOADER, "loadLibrary", RUNTIME_LOAD_ERROR "
failed to open library %s (from within file '%s'): %s", s, nme, dlerror());
- if (handle == NULL && strcmp(SO_EXT, ".so") != 0) {
+ if (handle == NULL && strcmp(SO_EXT, ".so") != /* DISABLES CODE
*/ (0)) {
/* try .so */
len = snprintf(nme, FILENAME_MAX, "%.*s%c%s_%s.so",
(int) (p - mod_path),
diff --git a/tools/merovingian/client/monetdb.c
b/tools/merovingian/client/monetdb.c
--- a/tools/merovingian/client/monetdb.c
+++ b/tools/merovingian/client/monetdb.c
@@ -177,13 +177,14 @@ command_help(int argc, char *argv[])
static void
command_version(void)
{
+ printf("MonetDB Database Server Toolkit v%s", VERSION);
+#ifdef MONETDB_RELEASE
+ printf(" (%s)", MONETDB_RELEASE);
+#else
const char *rev = mercurial_revision();
- printf("MonetDB Database Server Toolkit v%s", VERSION);
- /* coverity[pointless_string_compare] */
- if (strcmp(MONETDB_RELEASE, "unreleased") != 0)
- printf(" (%s)", MONETDB_RELEASE);
- else if (strcmp(rev, "Unknown") != 0)
+ if (strcmp(rev, "Unknown") != 0)
printf(" (hg id: %s)", rev);
+#endif
printf("\n");
}
diff --git a/tools/merovingian/daemon/argvcmds.c
b/tools/merovingian/daemon/argvcmds.c
--- a/tools/merovingian/daemon/argvcmds.c
+++ b/tools/merovingian/daemon/argvcmds.c
@@ -65,13 +65,15 @@ command_help(int argc, char *argv[])
int
command_version(void)
{
- const char *rev = mercurial_revision();
printf("MonetDB Database Server v%s", VERSION);
/* coverity[pointless_string_compare] */
- if (strcmp(MONETDB_RELEASE, "unreleased") != 0)
- printf(" (%s)", MONETDB_RELEASE);
- else if (strcmp(rev, "Unknown") != 0)
+#ifdef MONETDB_RELEASE
+ printf(" (%s)", MONETDB_RELEASE);
+#else
+ const char *rev = mercurial_revision();
+ if (strcmp(rev, "Unknown") != 0)
printf(" (hg id: %s)", rev);
+#endif
printf("\n");
return 0;
}
diff --git a/tools/merovingian/daemon/controlrunner.c
b/tools/merovingian/daemon/controlrunner.c
--- a/tools/merovingian/daemon/controlrunner.c
+++ b/tools/merovingian/daemon/controlrunner.c
@@ -789,7 +789,13 @@ static void ctl_handle_client(
len = snprintf(buf2, sizeof(buf2), "OK\n");
send_client("=");
len = snprintf(buf2, sizeof(buf2), "%s (%s)\n",
- VERSION, MONETDB_RELEASE);
+ VERSION,
+#ifdef MONETDB_RELEASE
+ MONETDB_RELEASE
+#else
+ "unreleased"
+#endif
+ );
send_client("=");
break;
} else if (strcmp(p, "mserver") == 0) {
diff --git a/tools/merovingian/daemon/merovingian.c
b/tools/merovingian/daemon/merovingian.c
--- a/tools/merovingian/daemon/merovingian.c
+++ b/tools/merovingian/daemon/merovingian.c
@@ -884,13 +884,14 @@ main(int argc, char *argv[])
fclose(pidfile);
{
+ Mfprintf(stdout, "Merovingian %s", VERSION);
+#ifdef MONETDB_RELEASE
+ Mfprintf(stdout, " (%s)", MONETDB_RELEASE);
+#else
const char *rev = mercurial_revision();
- Mfprintf(stdout, "Merovingian %s", VERSION);
- /* coverity[pointless_string_compare] */
- if (strcmp(MONETDB_RELEASE, "unreleased") != 0)
- Mfprintf(stdout, " (%s)", MONETDB_RELEASE);
- else if (strcmp(rev, "Unknown") != 0)
+ if (strcmp(rev, "Unknown") != 0)
Mfprintf(stdout, " (hg id: %s)", rev);
+#endif
Mfprintf(stdout, " starting\n");
}
Mfprintf(stdout, "monitoring dbfarm %s\n", dbfarm);
diff --git a/tools/mserver/monet_version.c.in b/tools/mserver/monet_version.c.in
--- a/tools/mserver/monet_version.c.in
+++ b/tools/mserver/monet_version.c.in
@@ -48,13 +48,14 @@ monet_version(void)
sz_mem_gb = (dbl)(MT_npages() * MT_pagesize()) / (1024.0 * 1024.0 *
1024.0);
cores = MT_check_nr_cores();
+ printf("MonetDB 5 server %s", GDKversion());
+#ifdef MONETDB_RELEASE
+ printf(" (%s)", MONETDB_RELEASE);
+#else
const char *rev = mercurial_revision();
- printf("MonetDB 5 server %s", GDKversion());
- /* coverity[pointless_string_compare] */
- if (strcmp(MONETDB_RELEASE, "unreleased") != 0)
- printf(" (%s)", MONETDB_RELEASE);
- else if (strcmp(rev, "Unknown") != 0)
+ if (strcmp(rev, "Unknown") != 0)
printf(" (hg id: %s)", rev);
+#endif
printf(" (%zu-bit%s)\n",
(size_t) (sizeof(ptr) * 8),
#ifdef HAVE_HGE
@@ -63,9 +64,9 @@ monet_version(void)
""
#endif
);
- /* coverity[pointless_string_compare] */
- if (strcmp(MONETDB_RELEASE, "unreleased") == 0)
- printf("This is an unreleased version\n");
+#ifndef MONETDB_RELEASE
+ printf("This is an unreleased version\n");
+#endif
printf("Copyright (c) 1993 - July 2008 CWI\n"
"Copyright (c) August 2008 - 2019 MonetDB B.V., all rights
reserved\n");
printf("Visit https://www.monetdb.org/ for further information\n");
diff --git a/tools/mserver/mserver5.c b/tools/mserver/mserver5.c
--- a/tools/mserver/mserver5.c
+++ b/tools/mserver/mserver5.c
@@ -140,16 +140,17 @@ monet_hello(void)
printf("# MonetDB 5 server v%s", GDKversion());
{
+#ifdef MONETDB_RELEASE
+ printf(" (%s)", MONETDB_RELEASE);
+#else
const char *rev = mercurial_revision();
- /* coverity[pointless_string_compare] */
- if (strcmp(MONETDB_RELEASE, "unreleased") != 0)
- printf(" (%s)", MONETDB_RELEASE);
- else if (strcmp(rev, "Unknown") != 0)
+ if (strcmp(rev, "Unknown") != 0)
printf(" (hg id: %s)", rev);
+#endif
}
- /* coverity[pointless_string_compare] */
- if (strcmp(MONETDB_RELEASE, "unreleased") == 0)
- printf("\n# This is an unreleased version");
+#ifndef MONETDB_RELEASE
+ printf("\n# This is an unreleased version");
+#endif
printf("\n# Serving database '%s', using %d thread%s\n",
GDKgetenv("gdk_dbname"),
GDKnr_threads, (GDKnr_threads != 1) ? "s" : "");
@@ -185,7 +186,13 @@ monet_hello(void)
"\"huge\""
#endif
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
