Changeset: 4b2b65a5c8cb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4b2b65a5c8cb
Added Files:
ChangeLog.Nov2019
buildtools/ChangeLog.Nov2019
clients/ChangeLog.Nov2019
clients/Tests/exports.stable.out-noapprove
clients/mapilib/ChangeLog.Nov2019
common/stream/ChangeLog.Nov2019
gdk/ChangeLog.Nov2019
geom/ChangeLog.Nov2019
monetdb5/ChangeLog.Nov2019
sql/ChangeLog.Nov2019
sql/jdbc/tests/Tests/JdbcClient_create_tables.sql
sql/jdbc/tests/Tests/JdbcClient_drop_tables.sql
sql/jdbc/tests/Tests/JdbcClient_inserts_selects.sql
testing/ChangeLog.Nov2019
tools/merovingian/ChangeLog.Nov2019
Removed Files:
ChangeLog
buildtools/ChangeLog
clients/ChangeLog
clients/mapilib/ChangeLog
common/stream/ChangeLog
gdk/ChangeLog
geom/ChangeLog
monetdb5/ChangeLog
sql/ChangeLog
sql/jdbc/tests/JdbcClient_create_tables.sql
sql/jdbc/tests/JdbcClient_inserts_selects.sql
testing/ChangeLog
tools/merovingian/ChangeLog
Modified Files:
.hgtags
MonetDB.spec
NT/monetdb_config.h.in
NT/rules.msc
clients/mapiclient/mclient.c
clients/mapiclient/mhelp.c
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
configure.ag
gdk/gdk_system.c
gdk/gdk_utils.c
gdk/libbat.rc
monetdb5/modules/mal/tablet.c
monetdb5/tools/libmonetdb5.rc
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_upgrades.c
sql/jdbc/tests/Tests/Test_JdbcClient.SQL.bat
sql/jdbc/tests/Tests/Test_JdbcClient.SQL.sh
sql/jdbc/tests/Tests/Test_JdbcClient.stable.out
sql/server/rel_select.c
sql/test/BugDay_2005-11-09_2.9.3/Tests/hang_on_copy_into.SF-1100504.stable.err
sql/test/BugTracker-2010/Tests/incomplete-utf8-sequence.Bug-2575.stable.err
sql/test/BugTracker-2015/Tests/backslash_predecing_separator.Bug-3775.stable.err
sql/test/BugTracker-2018/Tests/sqlitelogictest-having-not-null-not-in.Bug-6557.stable.out
sql/test/BugTracker/Tests/authorization.SF-1430616.stable.out
sql/test/analytics/Tests/analytics09.sql
sql/test/analytics/Tests/analytics09.stable.out
sql/test/copy/Tests/columns.stable.err
sql/test/copy/Tests/incorrect_columns.stable.out
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/subquery/Tests/subquery.sql
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/dump.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/dump.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
testing/Mtest.py.in
testing/exportutils.py
vertoo.data
Branch: grouping-analytics
Log Message:
Merge with Nov2019
diffs (truncated from 39544 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -736,3 +736,4 @@ a6674f7048a13fe7dc53995a4f723d33a34bce23
6566d90185b83ed95129db9ea68baf52f2de5cc7 Apr2019_11
a6674f7048a13fe7dc53995a4f723d33a34bce23 Apr2019_SP1_release
6566d90185b83ed95129db9ea68baf52f2de5cc7 Apr2019_SP1_release
+d4c1a8c3cbcd965169f1836eaa635101436db81c Nov2019_root
diff --git a/ChangeLog b/ChangeLog.Nov2019
rename from ChangeLog
rename to ChangeLog.Nov2019
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
%global name MonetDB
-%global version 11.34.0
+%global version 11.35.0
%{!?buildno: %global buildno %(date +%Y%m%d)}
# Use bcond_with to add a --with option; i.e., "without" is default.
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
@@ -662,7 +662,7 @@
#define PACKAGE_URL "https://www.monetdb.org/";
/* Define to the version of this package. */
-#define PACKAGE_VERSION "11.34.0"
+#define PACKAGE_VERSION "11.35.0"
/* Path separator */
#define PATH_SEP ';'
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -6,7 +6,7 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2019 MonetDB B.V.
-VERSION=11.34.0
+VERSION=11.35.0
# ^^^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [email protected] for details and/or
assistance.
diff --git a/buildtools/ChangeLog b/buildtools/ChangeLog.Nov2019
rename from buildtools/ChangeLog
rename to buildtools/ChangeLog.Nov2019
diff --git a/clients/ChangeLog b/clients/ChangeLog.Nov2019
rename from clients/ChangeLog
rename to clients/ChangeLog.Nov2019
diff --git a/clients/Tests/exports.stable.out-noapprove
b/clients/Tests/exports.stable.out-noapprove
new file mode 100644
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -1933,9 +1933,7 @@ format_result(Mapi mid, MapiHdl hdl, boo
SQLqueryEcho(hdl);
if (formatter == TABLEformatter ||
formatter == ROWCOUNTformatter)
- mnstr_printf(toConsole,
- "auto commit mode: %s\n",
- mapi_get_autocommit(mid) ? "on" :
"off");
+ mnstr_printf(toConsole, "operation
successful\n");
timerHuman(sqloptimizer, maloptimizer, querytime,
singleinstr, false);
continue;
case Q_PREPARE:
diff --git a/clients/mapiclient/mhelp.c b/clients/mapiclient/mhelp.c
--- a/clients/mapiclient/mhelp.c
+++ b/clients/mapiclient/mhelp.c
@@ -444,9 +444,9 @@ SQLhelp sqlhelp1[] = {
"See also
https://www.monetdb.org/Documentation/SQLreference/TableExpressions"},
{"SET",
"Assign a value to a variable or column",
- "SET '=' simple_atom",
+ "SET ident '=' simple_atom",
"simple_atom",
- NULL},
+ "See also
https://www.monetdb.org/Documentation/Manuals/SQLreference/Variables"},
{"SET LOCAL TRANSACTION",
"",
"START LOCAL TRANSACTION transactionmode",
diff --git a/clients/mapilib/ChangeLog b/clients/mapilib/ChangeLog.Nov2019
rename from clients/mapilib/ChangeLog
rename to clients/mapilib/ChangeLog.Nov2019
diff --git a/clients/mapilib/mapi.rc b/clients/mapilib/mapi.rc
--- a/clients/mapilib/mapi.rc
+++ b/clients/mapilib/mapi.rc
@@ -3,8 +3,8 @@
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
1 VERSIONINFO
- FILEVERSION 11,34,0,1
- PRODUCTVERSION 11,34,0,1
+ FILEVERSION 11,35,0,1
+ PRODUCTVERSION 11,35,0,1
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -18,7 +18,7 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB Application Interface DLL\0"
- VALUE "FileVersion", "11.34.0\0"
+ VALUE "FileVersion", "11.35.0\0"
// ^^^^^^^^
// Maintained via vertoo. Please don't modify by hand!
// Contact [email protected] for details and/or
assistance.
@@ -28,7 +28,7 @@ BEGIN
VALUE "OriginalFilename", "Mapi.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Client Libraries\0"
- VALUE "ProductVersion", "11.34.0\0"
+ VALUE "ProductVersion", "11.35.0\0"
// ^^^^^^^^
// Maintained via vertoo. Please don't modify by hand!
// Contact [email protected] for details and/or
assistance.
diff --git a/clients/odbc/driver/driver.rc b/clients/odbc/driver/driver.rc
--- a/clients/odbc/driver/driver.rc
+++ b/clients/odbc/driver/driver.rc
@@ -3,8 +3,8 @@
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
1 VERSIONINFO
- FILEVERSION 11,34,0,1
- PRODUCTVERSION 11,34,0,1
+ FILEVERSION 11,35,0,1
+ PRODUCTVERSION 11,35,0,1
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -18,7 +18,7 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB ODBC Driver DLL\0"
- VALUE "FileVersion", "11.34.0\0"
+ VALUE "FileVersion", "11.35.0\0"
// ^^^^^^^^
// Maintained via vertoo. Please don't modify by hand!
// Contact [email protected] for details and/or
assistance.
@@ -28,7 +28,7 @@ BEGIN
VALUE "OriginalFilename", "libMonetODBC.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB SQL Server\0"
- VALUE "ProductVersion", "11.34.0\0"
+ VALUE "ProductVersion", "11.35.0\0"
// ^^^^^^^^
// Maintained via vertoo. Please don't modify by hand!
// Contact [email protected] for details and/or
assistance.
diff --git a/clients/odbc/winsetup/setup.rc b/clients/odbc/winsetup/setup.rc
--- a/clients/odbc/winsetup/setup.rc
+++ b/clients/odbc/winsetup/setup.rc
@@ -62,8 +62,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 11,34,0,1
- PRODUCTVERSION 11,34,0,1
+ FILEVERSION 11,35,0,1
+ PRODUCTVERSION 11,35,0,1
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -80,12 +80,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "MonetDB B.V."
VALUE "FileDescription", "MonetDB ODBC Setup DLL"
- VALUE "FileVersion", "11.34.0"
+ VALUE "FileVersion", "11.35.0"
VALUE "InternalName", "libMonetODBCs.dll"
VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2019"
VALUE "OriginalFilename", "libMonetODBCs.dll"
VALUE "ProductName", "MonetDB SQL Server"
- VALUE "ProductVersion", "11.34.0"
+ VALUE "ProductVersion", "11.35.0"
END
END
BLOCK "VarFileInfo"
diff --git a/common/stream/ChangeLog b/common/stream/ChangeLog.Nov2019
rename from common/stream/ChangeLog
rename to common/stream/ChangeLog.Nov2019
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -52,7 +52,7 @@ dnl configure file, whereas comments st
dnl (including their trailing newline).
AC_PREREQ([2.63b])
-AC_INIT([MonetDB], [11.34.0], [https://bugs.monetdb.org/], [MonetDB],
[https://www.monetdb.org/])
+AC_INIT([MonetDB], [11.35.0], [https://bugs.monetdb.org/], [MonetDB],
[https://www.monetdb.org/])
AC_COPYRIGHT([Copyright 1997 - July 2008 CWI, August 2008 - 2019 MonetDB B.V.])
AC_CONFIG_AUX_DIR([buildtools/conf])
AC_CONFIG_MACRO_DIR([buildtools/conf])
diff --git a/gdk/ChangeLog b/gdk/ChangeLog.Nov2019
rename from gdk/ChangeLog
rename to gdk/ChangeLog.Nov2019
diff --git a/gdk/gdk_system.c b/gdk/gdk_system.c
--- a/gdk/gdk_system.c
+++ b/gdk/gdk_system.c
@@ -870,15 +870,54 @@ MT_check_nr_cores(void)
if (ncpus <= 0)
ncpus = 1;
#if SIZEOF_SIZE_T == SIZEOF_INT
- /* On 32-bits systems with large amounts of cpus/cores, we quickly
- * run out of space due to the amount of threads in use. Since it
- * is questionable whether many cores on a 32-bits system are going
- * to beneficial due to this, we simply limit the auto-detected
- * cores to 16 on 32-bits systems. The user can always override
- * this via gdk_nr_threads. */
+ /* On 32-bits systems with large numbers of cpus/cores, we
+ * quickly run out of space due to the number of threads in
+ * use. Since it is questionable whether many cores on a
+ * 32-bits system are going to be beneficial due to this, we
+ * simply limit the auto-detected cores to 16 on 32-bits
+ * systems. The user can always override this via
+ * gdk_nr_threads. */
if (ncpus > 16)
ncpus = 16;
#endif
+#ifndef WIN32
+ /* get the number of allocated cpus from the cgroup settings */
+ FILE *f = fopen("/sys/fs/cgroup/cpuset/cpuset.cpus", "r");
+ if (f != NULL) {
+ char buf[512];
+ char *p = fgets(buf, 512, f);
+ fclose(f);
+ if (p != NULL) {
+ /* syntax is: ranges of CPU numbers separated
+ * by comma; a range is either a single CPU
+ * id, or two IDs separated by a minus; any
+ * deviation causes the file to be ignored */
+ int ncpu = 0;
+ for (;;) {
+ char *q;
+ unsigned fst = strtoul(p, &q, 10);
+ if (q == p)
+ return ncpus;
+ ncpu++;
+ if (*q == '-') {
+ p = q + 1;
+ unsigned lst = strtoul(p, &q, 10);
+ if (q == p || lst <= fst)
+ return ncpus;
+ ncpu += lst - fst;
+ }
+ if (*q == '\n')
+ break;
+ if (*q != ',')
+ return ncpus;
+ p = q + 1;
+ }
+ if (ncpu < ncpus)
+ return ncpu;
+ }
+ }
+#endif
+
return ncpus;
}
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -401,6 +401,8 @@ MT_init(void)
#else
# error "don't know how to get the amount of physical memory for your OS"
#endif
+
+#ifndef WIN32
/* limit values to whatever cgroups gives us */
FILE *f;
/* limit of memory usage */
@@ -434,6 +436,8 @@ MT_init(void)
}
fclose(f);
}
+#endif
+
#if defined(HAVE_SYS_RESOURCE_H) && defined(HAVE_GETRLIMIT) &&
defined(RLIMIT_AS)
struct rlimit l;
/* address space (virtual memory) limit */
diff --git a/gdk/libbat.rc b/gdk/libbat.rc
--- a/gdk/libbat.rc
+++ b/gdk/libbat.rc
@@ -3,8 +3,8 @@
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
1 VERSIONINFO
- FILEVERSION 11,34,0,1
- PRODUCTVERSION 11,34,0,1
+ FILEVERSION 11,35,0,1
+ PRODUCTVERSION 11,35,0,1
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -18,7 +18,7 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB Goblin Database Kernel DLL\0"
- VALUE "FileVersion", "11.34.0\0"
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
