Changeset: 432b7ec35c15 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/432b7ec35c15
Branch: less_explain_info
Log Message:
Merge with default branch.
diffs (truncated from 24418 to 300 lines):
diff --git a/clients/Tests/MAL-signatures-hge.test
b/clients/Tests/MAL-signatures-hge.test
--- a/clients/Tests/MAL-signatures-hge.test
+++ b/clients/Tests/MAL-signatures-hge.test
@@ -2554,6 +2554,16 @@ command aggr.subvariancep(X_0:bat[:sht],
AGGRsubvariancepcand_dbl
Grouped variance (population/biased) aggregate with candidates list
aggr
+subxmlaggr
+command aggr.subxmlaggr(X_0:bat[:xml], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bit):bat[:xml]
+AGGRsubxml
+Grouped aggregation of XML values.
+aggr
+subxmlaggr
+command aggr.subxmlaggr(X_0:bat[:xml], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bat[:oid], X_4:bit):bat[:xml]
+AGGRsubxmlcand
+Grouped aggregation of XML values with candidates list.
+aggr
subzero_or_one
command aggr.subzero_or_one(X_0:bat[:any_1], X_1:bat[:oid], X_2:bat[:oid],
X_3:bit):bat[:any_1]
SQLsubzero_or_one
@@ -3329,6 +3339,11 @@ command aggr.variancep(X_0:bat[:any_2]):
ALGvariancep
Gives the variance of all tail values
aggr
+xmlaggr
+command aggr.xmlaggr(X_0:bat[:xml]):xml
+BATXMLgroup
+Aggregate the XML values.
+aggr
zero_or_one
command aggr.zero_or_one(X_0:bat[:any_1]):any_1
zero_or_one
@@ -50809,11 +50824,6 @@ command uuid.uuid(X_0:str):uuid
UUIDstr2uuid
Coerce a string to a uuid, validating its format
xml
-aggr
-command xml.aggr(X_0:bat[:xml]):xml
-BATXMLgroup
-Aggregate the XML values.
-xml
attribute
command xml.attribute(X_0:str, X_1:str):xml
XMLattribute
@@ -50884,16 +50894,6 @@ command xml.str(X_0:xml):str
XMLxml2str
Cast the string to an xml compliant string
xml
-subaggr
-command xml.subaggr(X_0:bat[:xml], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bit):bat[:xml]
-AGGRsubxml
-Grouped aggregation of XML values.
-xml
-subaggr
-command xml.subaggr(X_0:bat[:xml], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bat[:oid], X_4:bit):bat[:xml]
-AGGRsubxmlcand
-Grouped aggregation of XML values with candidates list.
-xml
text
command xml.text(X_0:xml):str
XMLxmltext
diff --git a/clients/Tests/MAL-signatures.test
b/clients/Tests/MAL-signatures.test
--- a/clients/Tests/MAL-signatures.test
+++ b/clients/Tests/MAL-signatures.test
@@ -2164,6 +2164,16 @@ command aggr.subvariancep(X_0:bat[:sht],
AGGRsubvariancepcand_dbl
Grouped variance (population/biased) aggregate with candidates list
aggr
+subxmlaggr
+command aggr.subxmlaggr(X_0:bat[:xml], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bit):bat[:xml]
+AGGRsubxml
+Grouped aggregation of XML values.
+aggr
+subxmlaggr
+command aggr.subxmlaggr(X_0:bat[:xml], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bat[:oid], X_4:bit):bat[:xml]
+AGGRsubxmlcand
+Grouped aggregation of XML values with candidates list.
+aggr
subzero_or_one
command aggr.subzero_or_one(X_0:bat[:any_1], X_1:bat[:oid], X_2:bat[:oid],
X_3:bit):bat[:any_1]
SQLsubzero_or_one
@@ -2764,6 +2774,11 @@ command aggr.variancep(X_0:bat[:any_2]):
ALGvariancep
Gives the variance of all tail values
aggr
+xmlaggr
+command aggr.xmlaggr(X_0:bat[:xml]):xml
+BATXMLgroup
+Aggregate the XML values.
+aggr
zero_or_one
command aggr.zero_or_one(X_0:bat[:any_1]):any_1
zero_or_one
@@ -39184,11 +39199,6 @@ command uuid.uuid(X_0:str):uuid
UUIDstr2uuid
Coerce a string to a uuid, validating its format
xml
-aggr
-command xml.aggr(X_0:bat[:xml]):xml
-BATXMLgroup
-Aggregate the XML values.
-xml
attribute
command xml.attribute(X_0:str, X_1:str):xml
XMLattribute
@@ -39259,16 +39269,6 @@ command xml.str(X_0:xml):str
XMLxml2str
Cast the string to an xml compliant string
xml
-subaggr
-command xml.subaggr(X_0:bat[:xml], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bit):bat[:xml]
-AGGRsubxml
-Grouped aggregation of XML values.
-xml
-subaggr
-command xml.subaggr(X_0:bat[:xml], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bat[:oid], X_4:bit):bat[:xml]
-AGGRsubxmlcand
-Grouped aggregation of XML values with candidates list.
-xml
text
command xml.text(X_0:xml):str
XMLxmltext
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
@@ -545,7 +545,7 @@ gdk_return log_bat_group_start(logger *l
gdk_return log_bat_persists(logger *lg, BAT *b, log_id id);
gdk_return log_bat_transient(logger *lg, log_id id);
lng log_changes(logger *lg);
-gdk_return log_constant(logger *lg, int type, const void *val, log_id id, lng
offset, lng cnt);
+gdk_return log_constant(logger *lg, int type, const void *val, log_id id, lng
offset, lng cnt, lng total_cnt);
logger *log_create(int debug, const char *fn, const char *logdir, int version,
preversionfix_fptr prefuncp, postversionfix_fptr postfuncp, void *funcdata);
gdk_return log_delta(logger *lg, BAT *uid, BAT *uval, log_id id);
void log_destroy(logger *lg);
diff --git a/clients/mapiclient/mhelp.c b/clients/mapiclient/mhelp.c
--- a/clients/mapiclient/mhelp.c
+++ b/clients/mapiclient/mhelp.c
@@ -61,7 +61,7 @@ SQLhelp sqlhelp1[] = {
"See also
https://www.monetdb.org/documentation/user-guide/sql-manual/data-definition/schema-definitions/"},
{"ALTER SEQUENCE",
"",
- "ALTER SEQUENCE qname [AS seq_int_datatype] [RESTART [WITH
{bigint|subquery}] ] [INCREMENT BY bigint]\n"
+ "ALTER SEQUENCE [ IF EXISTS ] qname [AS seq_int_datatype] [RESTART
[WITH {bigint|subquery}] ] [INCREMENT BY bigint]\n"
" [MINVALUE bigint | NO MINVALUE] [MAXVALUE bigint | NO MAXVALUE]
[CACHE bigint] [[NO] CYCLE]",
"seq_int_datatype",
"See also
https://www.monetdb.org/documentation/user-guide/sql-manual/data-types/serial-types/"},
@@ -83,9 +83,9 @@ SQLhelp sqlhelp1[] = {
"See also
https://www.monetdb.org/documentation/user-guide/sql-manual/data-definition/alter-statement/"},
{"ALTER USER",
"Change a user's login name or password or default schema",
- "ALTER USER ident RENAME TO ident\n"
+ "ALTER USER [ IF EXISTS ] ident RENAME TO ident\n"
"ALTER USER SET [ENCRYPTED | UNENCRYPTED] PASSWORD string USING OLD
PASSWORD string\n"
- "ALTER USER ident\n"
+ "ALTER USER [ IF EXISTS ] ident\n"
" [WITH [ENCRYPTED | UNENCRYPTED] PASSWORD string]\n"
" [SET SCHEMA ident] [SCHEMA PATH string] [DEFAULT ROLE ident]\n"
" [MAX_MEMORY posbytes | MAX_MEMORY sizestr | NO MAX_MEMORY]
[MAX_WORKERS poscount | NO MAX_WORKERS]",
@@ -175,7 +175,7 @@ SQLhelp sqlhelp1[] = {
"See also
https://www.monetdb.org/documentation/user-guide/sql-programming/function-definitions/"},
{"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 ')'",
+ "CREATE [ UNIQUE | ORDERED | IMPRINTS ] INDEX [ IF NOT EXISTS ] ident
ON qname '(' ident_list ')'",
NULL,
"See also
https://www.monetdb.org/documentation/user-guide/sql-manual/data-definition/index-definitions/"},
{"CREATE LOADER",
@@ -217,7 +217,7 @@ SQLhelp sqlhelp1[] = {
{"CREATE ROLE",
"Create a new role. You can grant privileges to a role and next\n"
"grant a role (or multiple roles) to specific users",
- "CREATE ROLE ident [ WITH ADMIN { CURRENT_USER | CURRENT_ROLE } ]",
+ "CREATE ROLE [ IF NOT EXISTS ] ident [ WITH ADMIN { CURRENT_USER |
CURRENT_ROLE } ]",
"ident",
"See also
https://www.monetdb.org/documentation/user-guide/sql-manual/data-definition/privileges/#roles"},
{"CREATE SCHEMA",
@@ -227,7 +227,7 @@ SQLhelp sqlhelp1[] = {
"See also
https://www.monetdb.org/documentation/user-guide/sql-manual/data-definition/schema-definitions/"},
{"CREATE SEQUENCE",
"Define a new integer number sequence generator",
- "CREATE SEQUENCE qname [AS seq_int_datatype] [START WITH bigint]
[INCREMENT BY bigint]\n"
+ "CREATE SEQUENCE [ IF NOT EXISTS ] qname [AS seq_int_datatype] [START
WITH bigint] [INCREMENT BY bigint]\n"
" [MINVALUE bigint | NO MINVALUE] [MAXVALUE bigint | NO MAXVALUE]
[CACHE bigint] [[NO] CYCLE]",
"seq_int_datatype",
"See also
https://www.monetdb.org/documentation/user-guide/sql-manual/data-types/serial-types/"},
@@ -247,14 +247,14 @@ SQLhelp sqlhelp1[] = {
"See also
https://www.monetdb.org/documentation/user-guide/sql-programming/trigger-definition/"},
{"CREATE TYPE",
"Add user defined type to the type system ",
- "CREATE TYPE qname EXTERNAL NAME ident",
+ "CREATE TYPE [ IF NOT EXISTS ] qname EXTERNAL NAME ident",
NULL,
NULL},
{"CREATE USER",
"Create a new database user",
- "CREATE USER ident WITH [ENCRYPTED | UNENCRYPTED] PASSWORD string NAME
string [SCHEMA ident] [SCHEMA PATH string]\n"
- "[MAX_MEMORY posbytes | MAX_MEMORY sizestr | NO MAX_MEMORY]
[MAX_WORKERS poscount | NO MAX_WORKERS]\n"
- "[OPTIMIZER string] [DEFAULT ROLE ident]",
+ "CREATE USER [ IF NOT EXISTS ] ident WITH [ENCRYPTED | UNENCRYPTED]
PASSWORD string NAME string\n"
+ " [SCHEMA ident] [SCHEMA PATH string] [MAX_MEMORY posbytes |
MAX_MEMORY sizestr | NO MAX_MEMORY]\n"
+ " [MAX_WORKERS poscount | NO MAX_WORKERS] [OPTIMIZER string]
[DEFAULT ROLE ident]",
"ident",
"See also
https://www.monetdb.org/documentation/user-guide/sql-manual/data-definition/privileges/"},
{"CREATE VIEW",
@@ -343,7 +343,7 @@ SQLhelp sqlhelp1[] = {
NULL},
{"DROP INDEX",
"",
- "DROP INDEX qname",
+ "DROP INDEX [ IF EXISTS ] qname",
NULL,
NULL},
{"DROP LOADER",
@@ -360,7 +360,7 @@ SQLhelp sqlhelp1[] = {
NULL},
{"DROP ROLE",
"",
- "DROP ROLE ident",
+ "DROP ROLE [ IF EXISTS ] ident",
NULL,
NULL},
{"DROP SCHEMA",
@@ -370,7 +370,7 @@ SQLhelp sqlhelp1[] = {
NULL},
{"DROP SEQUENCE",
"",
- "DROP SEQUENCE qname",
+ "DROP SEQUENCE [ IF EXISTS ] qname",
NULL,
NULL},
{"DROP TABLE",
@@ -385,12 +385,12 @@ SQLhelp sqlhelp1[] = {
NULL},
{"DROP TYPE",
"",
- "DROP TYPE qname [ RESTRICT | CASCADE ]",
+ "DROP TYPE [ IF EXISTS ] qname [ RESTRICT | CASCADE ]",
NULL,
NULL},
{"DROP USER",
"",
- "DROP USER ident",
+ "DROP USER [ IF EXISTS ] ident",
NULL,
NULL},
{"DROP VIEW",
diff --git a/debian/monetdb-sql.init.d b/debian/monetdb-sql.init.d
--- a/debian/monetdb-sql.init.d
+++ b/debian/monetdb-sql.init.d
@@ -29,9 +29,31 @@ test -x $DAEMON || exit 0
umask 022
-# Include monetdb5-sql defaults if available
-if [ -f /etc/default/monetdb5-sql ] ; then
- . /etc/default/monetdb5-sql
+# Include monetdb-sql defaults if available
+if [ -f /etc/default/monetdb5-sql -a -f /etc/default/monetdb-sql ]; then
+ # old and new both available
+ case $(sum /etc/default/monetdb5-sql) in
+ 46711*) # unchanged
+ rm /etc/default/monetdb5-sql
+ ;;
+ *) # changed
+ case $(sum /etc/default/monetdb-sql) in
+ 46711*) # unchanged
+ mv /etc/default/monetdb5-sql /etc/default/monetdb-sql
+ ;;
+ *) # changed
+ rm /etc/default/monetdb5-sql
+ ;;
+ esac
+ ;;
+ esac
+ . /etc/default/monetdb-sql
+elif [ -f /etc/default/monetdb5-sql ]; then
+ # unexpected: only old available
+ mv /etc/default/monetdb5-sql /etc/default/monetdb-sql
+ . /etc/default/monetdb-sql
+elif [ -f /etc/default/monetdb-sql ]; then
+ . /etc/default/monetdb-sql
fi
PIDFILE=${DBFARM}/merovingian.pid
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -2499,7 +2499,7 @@ gdk_export gdk_return gdk_remove_callbac
gdk_export void GDKusr1triggerCB(void (*func)(void));
#define SQLSTATE(sqlstate) #sqlstate "!"
-#define MAL_MALLOC_FAIL "Could not allocate space"
+#define MAL_MALLOC_FAIL "Could not allocate memory"
#include <setjmp.h>
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -30,7 +30,6 @@ unshare_varsized_heap(BAT *b)
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
