Changeset: 3bd6002e24a3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3bd6002e24a3
Removed Files:
sql/test/miscellaneous/README
sql/test/miscellaneous/Tests/now.sql
sql/test/miscellaneous/Tests/now.stable.err
Modified Files:
NT/monetdb_config.h.in
clients/mapiclient/mhelp.c
common/utils/mutils.c
configure.ag
gdk/gdk_posix.c
gdk/gdk_private.h
gdk/gdk_system.c
gdk/gdk_system.h
gdk/gdk_utils.c
monetdb5/mal/mal_module.c
monetdb5/modules/atoms/mtime.c
sql/backends/monet5/sql_cat.c
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_upgrades.c
sql/scripts/Makefile.ag
sql/server/rel_psm.c
sql/server/rel_schema.c
sql/server/sql_parser.y
sql/test/BugTracker-2012/Tests/create_function.Bug-3172.sql
sql/test/BugTracker-2012/Tests/create_function.Bug-3172.stable.err
sql/test/BugTracker-2012/Tests/create_function.Bug-3172.stable.out
sql/test/BugTracker-2012/Tests/table_function_with_column_subselects.Bug-3172.sql
sql/test/BugTracker-2012/Tests/table_function_with_column_subselects.Bug-3172.stable.err
sql/test/BugTracker-2019/Tests/disallow_duplicate_column_aliases.Bug-6723.stable.out
sql/test/BugTracker-2019/Tests/prepare-types.Bug-6724.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/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/miscellaneous/Tests/All
sql/test/miscellaneous/Tests/select_groupby.sql
sql/test/miscellaneous/Tests/select_groupby.stable.err
sql/test/miscellaneous/Tests/select_groupby.stable.out
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/upgrade.stable.out.int128
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
tools/merovingian/daemon/merovingian.c
Branch: default
Log Message:
Merge with Nov2019
diffs (truncated from 1849 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
@@ -508,9 +508,6 @@
/* Define to 1 if you have the <sys/stat.h> header file. */
#define HAVE_SYS_STAT_H 1
-/* Define to 1 if you have the <sys/sysctl.h> header file. */
-/* #undef HAVE_SYS_SYSCTL_H */
-
/* Define to 1 if you have the <sys/times.h> header file. */
/* #undef HAVE_SYS_TIMES_H */
diff --git a/clients/mapiclient/mhelp.c b/clients/mapiclient/mhelp.c
--- a/clients/mapiclient/mhelp.c
+++ b/clients/mapiclient/mhelp.c
@@ -87,7 +87,7 @@ SQLhelp sqlhelp1[] = {
{"ANALYZE",
"Collect column/table/schema data statistics for analysis and
optimizer usage",
"ANALYZE ident [ . ident [ column_list ] ] [SAMPLE size] [MINMAX]",
- "column_list",
+ "ident,column_list",
"See also
https://www.monetdb.org/Documentation/Cookbooks/SQLrecipes/statistics"},
{"CALL",
"",
@@ -163,10 +163,10 @@ SQLhelp sqlhelp1[] = {
"qname,param,data_type,function_return,statement,ident,language_keyword,external_code",
"See also
https://www.monetdb.org/Documentation/Manuals/SQLreference/Functions"},
{"CREATE INDEX",
- "",
+ "Create a hint for a secondary index on a column or set of columns of
a table",
"CREATE [ UNIQUE | ORDERED | IMPRINTS ] INDEX ident ON qname '('
ident_list ')'",
NULL,
- NULL},
+ "See also
https://www.monetdb.org/Documentation/Manuals/SQLreference/Indices"},
{"CREATE PROCEDURE",
"Create a user-defined procedure",
"CREATE [ OR REPLACE ] PROCEDURE qname '(' { '*' | [ param [',' ...]]
} ')'\n"
@@ -203,12 +203,12 @@ SQLhelp sqlhelp1[] = {
"ident",
"See also https://www.monetdb.org/Documentation/SQLreference/Roles"},
{"CREATE SCHEMA",
- "",
+ "Create a new schema",
"CREATE SCHEMA [ IF NOT EXISTS ] schema_name [default_char_set]
[path_spec] [schema_element]",
"schema_name,default_char_set,path_spec,schema_element",
"See also https://www.monetdb.org/Documentation/SQLreference/Schema"},
{"CREATE SEQUENCE",
- "Define a new sequence generator",
+ "Define a new integer number sequence generator",
"CREATE SEQUENCE ident [ AS data_type] [ START [WITH start]]
[INCREMENT BY increment]\n"
"[MINVALUE minvalue | NO MINVALUE] [MAXVALUE maxvalue | NO MAXVALUE]
[CACHE cachevalue] [[NO] CYCLE]",
"ident,data_type",
@@ -219,17 +219,18 @@ SQLhelp sqlhelp1[] = {
"table_source",
NULL},
{"CREATE TABLE",
- "",
+ "Create a new table",
"CREATE TABLE [ IF NOT EXISTS ] qname table_source [STORAGE ident
string]\n"
"CREATE TABLE [ IF NOT EXISTS ] qname FROM LOADER function_ref\n"
"CREATE [ LOCAL | GLOBAL ] { TEMPORARY | TEMP } TABLE [ IF NOT EXISTS
] qname table_source [on_commit]",
"table_source,on_commit,function_ref",
"See also
https://www.monetdb.org/Documentation/Manuals/SQLreference/Tables"},
{"CREATE TRIGGER",
- "",
- "CREATE [ OR REPLACE ] TRIGGER qname { BEFORE | AFTER } { INSERT |
DELETE | TRUNCATE ...\n"
- " | UPDATE [ OF ident [',' ident]] } ON qname REFERENCING
trigger_reference... triggered_action",
- "qname,trigger_reference,triggered_action",
+ "Define a triggered action for a table data update event",
+ "CREATE [ OR REPLACE ] TRIGGER qname { BEFORE | AFTER }\n"
+ " { INSERT | DELETE | TRUNCATE | UPDATE [ OF ident_list ] }\n"
+ " ON qname [ REFERENCING trigger_reference [...] ] triggered_action",
+ "qname,ident_list,trigger_reference,triggered_action",
"See also
https://www.monetdb.org/Documentation/SQLreference/Triggers"},
{"CREATE TYPE",
"Add user defined type to the type system ",
@@ -237,12 +238,12 @@ SQLhelp sqlhelp1[] = {
NULL,
NULL},
{"CREATE USER",
- "Create a new user",
+ "Create a new database user",
"CREATE USER ident WITH [ENCRYPTED | UNENCRYPTED] PASSWORD string NAME
string SCHEMA ident",
"ident",
"See also https://www.monetdb.org/Documentation/SQLreference/Users"},
{"CREATE VIEW",
- "",
+ "Create a new view",
"CREATE [ OR REPLACE ] VIEW qname [ column_list ] AS {
query_expression | '(' query_expression ')' }\n"
"[ WITH CHECK OPTION ]",
"qname,column_list,query_expression",
@@ -850,7 +851,7 @@ SQLhelp sqlhelp2[] = {
NULL},
{"trigger_reference",
NULL,
- "OLD [ROW] [AS] ident | NEW [ROW] [AS] ident",
+ "{ OLD | NEW } { [ROW] | TABLE } [AS] ident",
NULL,
NULL},
{"update_statement",
@@ -860,8 +861,9 @@ SQLhelp sqlhelp2[] = {
NULL},
{"triggered_action",
NULL,
- "[ FOR EACH { ROW | STATEMENT } ] [ WHEN '(' search_condition ')'\n"
- " BEGIN ATOMIC trigger_statement ... END ",
+ "[ FOR [EACH] { ROW | STATEMENT } ]\n"
+ "[ WHEN '(' search_condition ')' ]\n"
+ "{ trigger_statement | BEGIN ATOMIC trigger_statement [ ; ... ] END }",
"trigger_statement,search_condition",
NULL},
{"trigger_statement",
diff --git a/common/utils/mutils.c b/common/utils/mutils.c
--- a/common/utils/mutils.c
+++ b/common/utils/mutils.c
@@ -25,10 +25,10 @@
#include <limits.h> /* PATH_MAX on Solaris */
#ifdef HAVE_SYS_PARAM_H
-# include <sys/param.h> /* realpath on OSX, prerequisite of sys/sysctl on
OpenBSD */
+# include <sys/param.h> /* realpath on OSX */
#endif
-#ifdef HAVE_SYS_SYSCTL_H
+#ifdef BSD /* BSD macro is defined in sys/param.h */
# include <sys/sysctl.h> /* KERN_PROC_PATHNAME on BSD */
#endif
@@ -454,7 +454,7 @@ get_bin_path(void)
if (_NSGetExecutablePath(buf, &size) == 0 &&
realpath(buf, _bin_path) != NULL)
return _bin_path;
-#elif defined(HAVE_SYS_SYSCTL_H) && defined(KERN_PROC_PATHNAME) /* BSD */
+#elif defined(BSD) && defined(KERN_PROC_PATHNAME) /* BSD */
int mib[4];
size_t cb = sizeof(_bin_path);
mib[0] = CTL_KERN;
diff --git a/gdk/gdk_posix.c b/gdk/gdk_posix.c
--- a/gdk/gdk_posix.c
+++ b/gdk/gdk_posix.c
@@ -34,7 +34,7 @@
#ifdef HAVE_MACH_MACH_INIT_H
# include <mach/mach_init.h>
#endif
-#if defined(HAVE_KVM_H) && defined(HAVE_SYS_SYSCTL_H)
+#if defined(HAVE_KVM_H)
# include <kvm.h>
# include <sys/param.h>
# include <sys/sysctl.h>
@@ -297,7 +297,7 @@ MT_getrss(void)
if (task_info(task, TASK_BASIC_INFO_64, (task_info_t)&t_info,
&t_info_count) != KERN_INVALID_POLICY)
return t_info.resident_size; /* bytes */
-#elif defined(HAVE_KVM_H) && defined(HAVE_SYS_SYSCTL_H)
+#elif defined(HAVE_KVM_H)
/* get RSS on FreeBSD and NetBSD */
struct kinfo_proc *ki;
int ski = 1;
@@ -795,8 +795,7 @@ MT_mmap(const char *path, int mode, size
(void) SetFileAttributes(path, FILE_ATTRIBUTE_NORMAL);
h1 = CreateFile(path, mode0, mode1, &sa, OPEN_ALWAYS, mode2,
NULL);
if (h1 == INVALID_HANDLE_VALUE) {
- errno = winerror(GetLastError());
- GDKsyserror("MT_mmap: CreateFile('%s', %lu, %lu, &sa,
%lu, %lu, NULL) failed\n",
+ GDKwinerror("MT_mmap: CreateFile('%s', %lu, %lu, &sa,
%lu, %lu, NULL) failed\n",
path, mode0, mode1, (DWORD) OPEN_ALWAYS,
mode2);
return NULL;
}
@@ -804,8 +803,7 @@ MT_mmap(const char *path, int mode, size
h2 = CreateFileMapping(h1, &sa, mode3, (DWORD) (((__int64) len >> 32) &
LL_CONSTANT(0xFFFFFFFF)), (DWORD) (len & LL_CONSTANT(0xFFFFFFFF)), NULL);
if (h2 == NULL) {
- errno = winerror(GetLastError());
- GDKsyserror("MT_mmap: CreateFileMapping(%p, &sa, %lu, %lu, %lu,
NULL) failed\n",
+ GDKwinerror("MT_mmap: CreateFileMapping(%p, &sa, %lu, %lu, %lu,
NULL) failed\n",
h1, mode3,
(DWORD) (((__int64) len >> 32) &
LL_CONSTANT(0xFFFFFFFF)),
(DWORD) (len & LL_CONSTANT(0xFFFFFFFF)));
@@ -832,8 +830,7 @@ MT_munmap(void *p, size_t dummy)
* while Unix's munmap returns success==0, error==-1. */
ret = UnmapViewOfFile(p);
if (ret == 0) {
- errno = winerror(GetLastError());
- GDKsyserror("MT_munmap failed\n");
+ GDKwinerror("MT_munmap failed\n");
return -1;
}
return 0;
@@ -882,8 +879,7 @@ MT_msync(void *p, size_t len)
* while Unix's munmap returns success==0, error==-1. */
ret = FlushViewOfFile(p, len);
if (ret == 0) {
- errno = winerror(GetLastError());
- GDKsyserror("MT_msync: FlushViewOfFile failed\n");
+ GDKwinerror("MT_msync: FlushViewOfFile failed\n");
return -1;
}
return 0;
diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -156,6 +156,11 @@ void BBPdump(void) /* never called: for
__attribute__((__visibility__("hidden")));
__hidden gdk_return GDKunlink(int farmid, const char *dir, const char *nme,
const char *extension)
__attribute__((__visibility__("hidden")));
+#ifdef NATIVE_WIN32
+__hidden void GDKwinerror(_In_z_ _Printf_format_string_ const char *format,
...)
+ __attribute__((__format__(__printf__, 1, 2)))
+ __attribute__((__visibility__("hidden")));
+#endif
__hidden void HASHfree(BAT *b)
__attribute__((__visibility__("hidden")));
__hidden bool HASHgonebad(BAT *b, const void *v)
diff --git a/gdk/gdk_system.c b/gdk/gdk_system.c
--- a/gdk/gdk_system.c
+++ b/gdk/gdk_system.c
@@ -847,7 +847,7 @@ MT_check_nr_cores(void)
#if defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_ONLN)
/* this works on Linux, Solaris and AIX */
ncpus = sysconf(_SC_NPROCESSORS_ONLN);
-#elif defined(HAVE_SYS_SYSCTL_H) && defined(HW_NCPU) /* BSD */
+#elif defined(HW_NCPU) /* BSD */
size_t len = sizeof(int);
int mib[3];
diff --git a/gdk/gdk_system.h b/gdk/gdk_system.h
--- a/gdk/gdk_system.h
+++ b/gdk/gdk_system.h
@@ -98,7 +98,7 @@
#ifdef HAVE_SYS_PARAM_H
# include <sys/param.h> /* prerequisite of sys/sysctl on OpenBSD */
#endif
-#ifdef HAVE_SYS_SYSCTL_H
+#ifdef BSD /* BSD macro is defined in sys/param.h */
# include <sys/sysctl.h>
#endif
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -39,7 +39,7 @@ int GDKverbose = 0;
#ifdef HAVE_SYS_PARAM_H
# include <sys/param.h> /* prerequisite of sys/sysctl on OpenBSD */
#endif
-#ifdef HAVE_SYS_SYSCTL_H
+#ifdef BSD /* BSD macro is defined in sys/param.h */
# include <sys/sysctl.h>
#endif
#if defined(HAVE_SYS_RESOURCE_H) && defined(HAVE_GETRLIMIT)
@@ -317,7 +317,7 @@ MT_init(void)
GetSystemInfo(&sysInfo);
_MT_pagesize = sysInfo.dwPageSize;
}
-#elif defined(HAVE_SYS_SYSCTL_H) && defined(HW_PAGESIZE)
+#elif defined(BSD) && defined(HW_PAGESIZE)
{
int size;
size_t len = sizeof(int);
@@ -344,7 +344,7 @@ MT_init(void)
if (GlobalMemoryStatusEx(&memStatEx))
_MT_npages = (size_t) (memStatEx.ullTotalPhys /
_MT_pagesize);
}
-#elif defined(HAVE_SYS_SYSCTL_H) && defined(HW_MEMSIZE) && SIZEOF_SIZE_T ==
SIZEOF_LNG
+#elif defined(BSD) && defined(HW_MEMSIZE) && SIZEOF_SIZE_T == SIZEOF_LNG
/* Darwin, 64-bits */
{
uint64_t size = 0;
@@ -358,7 +358,7 @@ MT_init(void)
sysctl(mib, 2, &size, &len, NULL, 0);
_MT_npages = size / _MT_pagesize;
}
-#elif defined(HAVE_SYS_SYSCTL_H) && defined (HW_PHYSMEM64) && SIZEOF_SIZE_T ==
SIZEOF_LNG
+#elif defined(BSD) && defined (HW_PHYSMEM64) && SIZEOF_SIZE_T == SIZEOF_LNG
/* OpenBSD, 64-bits */
{
int64_t size = 0;
@@ -372,7 +372,7 @@ MT_init(void)
sysctl(mib, 2, &size, &len, NULL, 0);
_MT_npages = size / _MT_pagesize;
}
-#elif defined(HAVE_SYS_SYSCTL_H) && defined(HW_PHYSMEM)
+#elif defined(BSD) && defined(HW_PHYSMEM)
/* NetBSD, OpenBSD, Darwin, 32-bits; FreeBSD 32 & 64-bits */
{
# ifdef __FreeBSD__
@@ -1181,23 +1181,12 @@ GDKsyserror(const char *format, ...)
va_start(ap, format);
vsnprintf(message + len, sizeof(message) - (len + 2), format, ap);
va_end(ap);
-#ifndef NATIVE_WIN32
- if (err > 0 && err < 1024)
-#endif
- {
+ if (err > 0 && err < 1024) {
size_t len1;
size_t len2;
size_t len3;
char *osmsg;
-#ifdef NATIVE_WIN32
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
