Changeset: 65a90c4291d8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=65a90c4291d8
Added Files:
sql/test/BugTracker-2016/Tests/merge-table-edit.Bug-6084.sql
sql/test/BugTracker-2016/Tests/merge-table-edit.Bug-6084.stable.err
sql/test/BugTracker-2016/Tests/merge-table-edit.Bug-6084.stable.out
Modified Files:
clients/R/Tests/All
clients/R/Tests/dbi.stable.err
clients/R/Tests/deps-install.R
clients/R/Tests/deps-test.R
clients/R/Tests/install.R
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/SQL-dump.stable.out
clients/Tests/SQL-dump.stable.out.int128
debian/monetdb5-sql.init.d
gdk/gdk_logger.c
monetdb5/extras/rapi/Tests/rapi02.stable.out
monetdb5/extras/rapi/Tests/rapi08.malC
monetdb5/mal/mal_instruction.c
monetdb5/optimizer/opt_mergetable.c
sql/backends/monet5/UDF/pyapi/pyapi.c
sql/backends/monet5/mal_backend.h
sql/backends/monet5/rel_bin.c
sql/backends/monet5/rel_bin.h
sql/backends/monet5/sql.c
sql/backends/monet5/sql.h
sql/backends/monet5/sql_bat2time.c
sql/backends/monet5/sql_cast.c
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_fround.c
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_gencode.h
sql/backends/monet5/sql_round.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_statement.h
sql/backends/monet5/sql_upgrades.c
sql/benchmarks/ssbm/Tests/01-13.stable.out
sql/benchmarks/ssbm/Tests/01-explain.stable.out
sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/02-explain.stable.out
sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/03-explain.stable.out
sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/04-explain.stable.out
sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/04.stable.out
sql/benchmarks/ssbm/Tests/05-explain.stable.out
sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/05.stable.out
sql/benchmarks/ssbm/Tests/06-explain.stable.out
sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/06.stable.out
sql/benchmarks/ssbm/Tests/07-explain.stable.out
sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/08-explain.stable.out
sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/09-explain.stable.out
sql/benchmarks/ssbm/Tests/09-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/10-explain.stable.out
sql/benchmarks/ssbm/Tests/10-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/11-explain.stable.out
sql/benchmarks/ssbm/Tests/11-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/12-explain.stable.out
sql/benchmarks/ssbm/Tests/12-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/13-explain.stable.out
sql/benchmarks/ssbm/Tests/13-explain.stable.out.int128
sql/benchmarks/tpch/Tests/01-explain.stable.out
sql/benchmarks/tpch/Tests/01-explain.stable.out.int128
sql/benchmarks/tpch/Tests/02-explain.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out.int128
sql/benchmarks/tpch/Tests/04-explain.stable.out
sql/benchmarks/tpch/Tests/05-explain.stable.out
sql/benchmarks/tpch/Tests/05-explain.stable.out.int128
sql/benchmarks/tpch/Tests/06-explain.stable.out
sql/benchmarks/tpch/Tests/06-explain.stable.out.int128
sql/benchmarks/tpch/Tests/07-explain.stable.out
sql/benchmarks/tpch/Tests/07-explain.stable.out.int128
sql/benchmarks/tpch/Tests/08-explain.stable.out
sql/benchmarks/tpch/Tests/08-explain.stable.out.int128
sql/benchmarks/tpch/Tests/09-explain.stable.out
sql/benchmarks/tpch/Tests/09-explain.stable.out.int128
sql/benchmarks/tpch/Tests/10-explain.stable.out
sql/benchmarks/tpch/Tests/10-explain.stable.out.int128
sql/benchmarks/tpch/Tests/11-explain.stable.out
sql/benchmarks/tpch/Tests/11-explain.stable.out.int128
sql/benchmarks/tpch/Tests/12-explain.stable.out
sql/benchmarks/tpch/Tests/12-explain.stable.out.int128
sql/benchmarks/tpch/Tests/13-explain.stable.out
sql/benchmarks/tpch/Tests/14-explain.stable.out
sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
sql/benchmarks/tpch/Tests/15-explain.stable.out
sql/benchmarks/tpch/Tests/15-explain.stable.out.int128
sql/benchmarks/tpch/Tests/16-explain.stable.out
sql/benchmarks/tpch/Tests/17-explain.stable.out
sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
sql/benchmarks/tpch/Tests/18-explain.stable.out
sql/benchmarks/tpch/Tests/18-explain.stable.out.int128
sql/benchmarks/tpch/Tests/19-explain.stable.out
sql/benchmarks/tpch/Tests/19-explain.stable.out.int128
sql/benchmarks/tpch/Tests/20-explain.stable.out
sql/benchmarks/tpch/Tests/20-explain.stable.out.int128
sql/benchmarks/tpch/Tests/21-explain.stable.out
sql/benchmarks/tpch/Tests/22-explain.stable.out
sql/benchmarks/tpch/Tests/22-explain.stable.out.int128
sql/benchmarks/tpch/load.sh
sql/include/sql_catalog.h
sql/server/rel_dump.c
sql/server/rel_exp.c
sql/server/rel_exp.h
sql/server/rel_optimizer.c
sql/server/rel_rel.c
sql/server/rel_schema.c
sql/server/rel_semantic.c
sql/storage/store.c
sql/test/BugDay_2005-10-06_2.9.3/Tests/UNION_JOIN_vs_plain_set_UNION-2.SF-920585.stable.out
sql/test/BugDay_2005-12-19_2.9.3/Tests/delete_cascade.SF-1296395.stable.out
sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128
sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128
sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out.single
sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.out
sql/test/BugTracker-2016/Tests/All
sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out
sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out.int128
sql/test/BugTracker-2016/Tests/trigger_bulk.Bug-4045.stable.err
sql/test/BugTracker-2016/Tests/trigger_bulk.Bug-4045.stable.out
sql/test/BugTracker/Tests/cascade_operations_in_different_sessions.SF-1823387_drop.stable.out
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
sql/test/Triggers/Tests/recursive_triggers.stable.err
sql/test/Triggers/Tests/trigger_activation.stable.out
sql/test/Triggers/trigger_activation.sql
sql/test/Update_Delete_action/Tests/delete_cascade.stable.out
sql/test/Update_Delete_action/Tests/update_delete_cascade.stable.out
sql/test/bugs/Tests/case_cast-bug-sf-1019506.stable.out
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/leaks/Tests/check0.stable.out.int128
sql/test/leaks/Tests/check1.stable.out.int128
sql/test/leaks/Tests/check2.stable.out.int128
sql/test/leaks/Tests/check3.stable.out.int128
sql/test/leaks/Tests/check4.stable.out.int128
sql/test/leaks/Tests/check5.stable.out.int128
sql/test/leaks/Tests/drop3.stable.out.int128
sql/test/leaks/Tests/select1.stable.out.int128
sql/test/leaks/Tests/select2.stable.out.int128
sql/test/leaks/Tests/temp1.stable.out.int128
sql/test/leaks/Tests/temp2.stable.out.int128
sql/test/leaks/Tests/temp3.stable.out.int128
sql/test/mapi/Tests/sql_int128.stable.out
sql/test/mergetables/Tests/mergequery.stable.out
sql/test/pg_regress/Tests/alter_table.stable.err
sql/test/pg_regress/Tests/strings.stable.out
sql/test/pg_regress/Tests/strings_cast.stable.out
sql/test/remote/Tests/partition_elim.stable.out
sql/test/remote/Tests/ssbm.SQL.py
sql/test/ssqq/Tests/insert_query.stable.err
sql/test/ssqq/Tests/insert_query.stable.out
sql/test/ssqq/Tests/insert_queue.stable.out
sql/test/ssqq/Tests/insert_quser.stable.err
sql/test/ssqq/Tests/insert_quser.stable.out
sql/test/ssqq/insert_query.sql
sql/test/ssqq/insert_queue.sql
testing/Mfilter.py
tools/merovingian/daemon/argvcmds.c
tools/merovingian/daemon/controlrunner.c
Branch: mosaic
Log Message:
merge with default
diffs (truncated from 29766 to 300 lines):
diff --git a/clients/R/Tests/All b/clients/R/Tests/All
--- a/clients/R/Tests/All
+++ b/clients/R/Tests/All
@@ -1,7 +1,7 @@
HAVE_LIBR?deps-install
HAVE_LIBR?install
HAVE_LIBR?deps-test
-HAVE_LIBR?dbi
+HAVE_LIBR&HAVE_PERL?dbi
HAVE_LIBR?dplyr
HAVE_LIBR?dplyr-flights
HAVE_LIBR?copy_into_fwf
diff --git a/clients/R/Tests/dbi.stable.err b/clients/R/Tests/dbi.stable.err
--- a/clients/R/Tests/dbi.stable.err
+++ b/clients/R/Tests/dbi.stable.err
@@ -37,6 +37,7 @@ Use 'dbIsValid' instead.
See help("Deprecated")
Identifier(s) "Sepal.Length", "Sepal.Width", "Petal.Length", "Petal.Width",
"Species" contain uppercase or reserved SQL characters and need(s) to be quoted
in queries.
Identifier(s) "Need to quote this table name" contain uppercase or reserved
SQL characters and need(s) to be quoted in queries.
+Identifier(s) "Need to quote this table name" contain uppercase or reserved
SQL characters and need(s) to be quoted in queries.
Identifier(s) "Sepal.Length", "Sepal.Width", "Petal.Length", "Petal.Width",
"Species" contain uppercase or reserved SQL characters and need(s) to be quoted
in queries.
Treating character vector parameter as file name(s) for monetdb.read.csv()
Identifier(s) "Sepal.Length", "Sepal.Width", "Petal.Length", "Petal.Width",
"Species" contain uppercase or reserved SQL characters and need(s) to be quoted
in queries.
diff --git a/clients/R/Tests/deps-install.R b/clients/R/Tests/deps-install.R
--- a/clients/R/Tests/deps-install.R
+++ b/clients/R/Tests/deps-install.R
@@ -1,8 +1,15 @@
# autoinstall DBI and digest, we need those to install MonetDB.R
-dd <- capture.output(suppressMessages(suppressWarnings({
- repos <- "http://cran.rstudio.com/";
- lp <- c("devtools", "digest")
- install.packages(lp, repos=repos, quiet=T)
- update.packages(repos=repos, ask=F, oldPkgs=lp)
- devtools::install_github("rstats-db/DBI", quiet=T)
-})))
+
+cat("#~BeginProfilingOutput~#\n", file=stderr())
+cat("#~BeginProfilingOutput~#\n", file=stdout())
+
+repos <- "http://cran.rstudio.com/";
+packages_required <- c("devtools", "digest")
+install.packages(packages_required, repos=repos, quiet=T)
+update.packages(repos=repos, ask=F, oldPkgs=packages_required)
+devtools::install_github("rstats-db/DBI", quiet=T)
+
+cat("#~EndProfilingOutput~#\n", file=stderr())
+cat("#~EndProfilingOutput~#\n\n", file=stdout())
+
+stopifnot(all(c(packages_required, "DBI") %in%
installed.packages()[,"Package"]))
diff --git a/clients/R/Tests/deps-test.R b/clients/R/Tests/deps-test.R
--- a/clients/R/Tests/deps-test.R
+++ b/clients/R/Tests/deps-test.R
@@ -1,8 +1,21 @@
-dd <- capture.output(suppressMessages(suppressWarnings({
- (function(lp) {
+packages_required <- c('Rcpp', 'dplyr', 'Lahman', 'nycflights13')
+
+install_or_upgrade_packages <- function(lp) {
np <- lp[!(lp %in% installed.packages()[,"Package"])]
repos <- 'http://cran.rstudio.com/'
if(length(np)) install.packages(np, repos=repos, quiet=T)
update.packages(repos=repos, ask=F, oldPkgs=lp, quiet=T)
- })(c('Rcpp', 'dplyr', 'Lahman', 'nycflights13', 'gdata'))
-})))
+}
+
+
+cat("#~BeginProfilingOutput~#\n", file=stderr())
+cat("#~BeginProfilingOutput~#\n", file=stdout())
+
+devtools::install_github("hannesmuehleisen/MonetDBLite", quiet=T)
+
+install_or_upgrade_packages(packages_required)
+
+cat("#~EndProfilingOutput~#\n", file=stderr())
+cat("#~EndProfilingOutput~#\n", file=stdout())
+
+stopifnot(all(packages_required %in% installed.packages()[,"Package"]))
diff --git a/clients/R/Tests/install.R b/clients/R/Tests/install.R
--- a/clients/R/Tests/install.R
+++ b/clients/R/Tests/install.R
@@ -1,4 +1,11 @@
-dd <- capture.output(suppressMessages( {
- devtools::install_github("hannesmuehleisen/MonetDBLite", quiet=T)
-}))
-library(MonetDBLite,quietly=T)
+cat("#~BeginProfilingOutput~#\n", file=stderr())
+cat("#~BeginProfilingOutput~#\n", file=stdout())
+
+devtools::install_github("hannesmuehleisen/MonetDBLite", quiet=T)
+
+cat("#~EndProfilingOutput~#\n", file=stderr())
+cat("#~EndProfilingOutput~#\n", file=stdout())
+
+stopifnot("MonetDBLite" %in% installed.packages()[,"Package"])
+
+library(MonetDBLite, quietly=T)
diff --git a/clients/Tests/MAL-signatures.stable.out
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -57,7 +57,7 @@ Ready.
# 14:39:22 >
#select * from sys.malfunctions() order by module, "function", address,
signature, comment;
-% ., ., ., ., . # table_name
+% .L1, .L1, .L1, .L1, .L1 # table_name
% module, function, signature, address, comment # name
% clob, clob, clob, clob, clob # type
% 11, 28, 367, 44, 874 # length
@@ -7443,9 +7443,9 @@ Ready.
[ "clients", "setListing", "pattern clients.setListing(flag:int):int ",
"CLTsetListing;", "Turn on/off echo of MAL instructions:\n\t1 - echo
input,\n\t2 - show mal instruction,\n\t4 - show details of type resolutoin,
\n\t8 - show binding information." ]
[ "clients", "setPassword", "pattern
clients.setPassword(user:str,pass:str):void ", "CLTsetPassword;", "Set the
password for the given user" ]
[ "clients", "setScenario", "pattern clients.setScenario(msg:str):str ",
"CLTsetScenario;", "Switch to other scenario handler, return previous
one." ]
-[ "clients", "setTimeout", "pattern clients.setTimeout(q:lng,s:lng):void
", "CLTsetTimeout;", "Abort a query after q seconds (q=0 means run
undisturbed).\nThe session timeout aborts the connection after spending
too\nmany seconds on query processing." ]
[ "clients", "setsession", "pattern clients.setsession(n:lng):void ",
"CLTsetSessionTimeout;", "Abort a session after n seconds." ]
[ "clients", "settimeout", "pattern clients.settimeout(n:lng):void ",
"CLTsetTimeout;", "Abort a query after n seconds." ]
+[ "clients", "settimeout", "pattern clients.settimeout(q:lng,s:lng):void
", "CLTsetTimeout;", "Abort a query after q seconds (q=0 means run
undisturbed).\nThe session timeout aborts the connection after spending
too\nmany seconds on query processing." ]
[ "clients", "sha1sum", "command clients.sha1sum(pw:str):str ",
"CLTsha1sum;", "Return hex string representation of the SHA-1 hash of the
given string" ]
[ "clients", "sha2sum", "command clients.sha2sum(pw:str,bits:int):str
", "CLTsha2sum;", "Return hex string representation of the SHA-2 hash
with bits of the given string" ]
[ "clients", "shutdown", "pattern clients.shutdown(delay:int):str ",
"CLTshutdown;", "" ]
@@ -8255,8 +8255,6 @@ Ready.
[ "optimizer", "emptybind", "pattern
optimizer.emptybind(mod:str,fcn:str):str ", "OPTwrapper;", "Evaluate empty
set expressions." ]
[ "optimizer", "evaluate", "pattern optimizer.evaluate():str ",
"OPTwrapper;", "" ]
[ "optimizer", "evaluate", "pattern
optimizer.evaluate(mod:str,fcn:str):str ", "OPTwrapper;", "Evaluate
constant expressions once." ]
-[ "optimizer", "factorize", "pattern optimizer.factorize():str ",
"OPTwrapper;", "" ]
-[ "optimizer", "factorize", "pattern
optimizer.factorize(mod:str,fcn:str):str ", "OPTwrapper;", "Turn function
into a factory" ]
[ "optimizer", "garbageCollector", "pattern
optimizer.garbageCollector():str ", "OPTwrapper;", "" ]
[ "optimizer", "garbageCollector", "pattern
optimizer.garbageCollector(mod:str,fcn:str):str ", "OPTwrapper;", "Garbage
collector optimizer" ]
[ "optimizer", "generator", "pattern optimizer.generator():str ",
"OPTwrapper;", "" ]
@@ -8546,8 +8544,6 @@ Ready.
[ "sql", "row_number", "pattern
sql.row_number(b:any_1,p:bit,o:bit):int ", "SQLrow_number;", "return
the row_numer-ed groups" ]
[ "sql", "sessions", "pattern sql.sessions()
(user:bat[:str],start:bat[:timestamp],stimeout:bat[:lng],lastcmd:bat[:timestamp],qtimeout:bat[:lng],idle:bat[:bit])
", "sql_sessions_wrap;", "SQL export table of active sessions, their
timeouts and idle status" ]
[ "sql", "setVariable", "pattern
sql.setVariable(mvc:int,varname:str,value:any_1):int ", "setVariable;",
"Set the value of a session variable" ]
-[ "sql", "settimeout", "pattern sql.settimeout(s:lng):void ",
"CLTsetTimeout;", "Abort query after s seconds" ]
-[ "sql", "settimeout", "pattern sql.settimeout(s:lng,t:lng):void ",
"CLTsetTimeout;", "Abort query after s and session after t seconds"
]
[ "sql", "shrink", "pattern sql.shrink(sch:str,tbl:str):void ",
"SQLshrink;", "Consolidate the deletion table over all columns using
shrinking" ]
[ "sql", "shutdown", "pattern sql.shutdown(delay:bte):str ",
"SQLshutdown_wrap;", "" ]
[ "sql", "shutdown", "pattern sql.shutdown(delay:bte,force:bit):str
", "SQLshutdown_wrap;", "" ]
diff --git a/clients/Tests/MAL-signatures.stable.out.int128
b/clients/Tests/MAL-signatures.stable.out.int128
--- a/clients/Tests/MAL-signatures.stable.out.int128
+++ b/clients/Tests/MAL-signatures.stable.out.int128
@@ -61,7 +61,7 @@ Ready.
# 12:57:39 >
#select * from sys.malfunctions() order by module, "function", address,
signature, comment;
-% ., ., ., ., . # table_name
+% .L1, .L1, .L1, .L1, .L1 # table_name
% module, function, signature, address, comment # name
% clob, clob, clob, clob, clob # type
% 11, 28, 367, 44, 874 # length
@@ -9794,9 +9794,9 @@ Ready.
[ "clients", "setListing", "pattern clients.setListing(flag:int):int ",
"CLTsetListing;", "Turn on/off echo of MAL instructions:\n\t1 - echo
input,\n\t2 - show mal instruction,\n\t4 - show details of type resolutoin,
\n\t8 - show binding information." ]
[ "clients", "setPassword", "pattern
clients.setPassword(user:str,pass:str):void ", "CLTsetPassword;", "Set the
password for the given user" ]
[ "clients", "setScenario", "pattern clients.setScenario(msg:str):str ",
"CLTsetScenario;", "Switch to other scenario handler, return previous
one." ]
-[ "clients", "setTimeout", "pattern clients.setTimeout(q:lng,s:lng):void
", "CLTsetTimeout;", "Abort a query after q seconds (q=0 means run
undisturbed).\nThe session timeout aborts the connection after spending
too\nmany seconds on query processing." ]
[ "clients", "setsession", "pattern clients.setsession(n:lng):void ",
"CLTsetSessionTimeout;", "Abort a session after n seconds." ]
[ "clients", "settimeout", "pattern clients.settimeout(n:lng):void ",
"CLTsetTimeout;", "Abort a query after n seconds." ]
+[ "clients", "settimeout", "pattern clients.settimeout(q:lng,s:lng):void
", "CLTsetTimeout;", "Abort a query after q seconds (q=0 means run
undisturbed).\nThe session timeout aborts the connection after spending
too\nmany seconds on query processing." ]
[ "clients", "sha1sum", "command clients.sha1sum(pw:str):str ",
"CLTsha1sum;", "Return hex string representation of the SHA-1 hash of the
given string" ]
[ "clients", "sha2sum", "command clients.sha2sum(pw:str,bits:int):str
", "CLTsha2sum;", "Return hex string representation of the SHA-2 hash
with bits of the given string" ]
[ "clients", "shutdown", "pattern clients.shutdown(delay:int):str ",
"CLTshutdown;", "" ]
@@ -10622,8 +10622,6 @@ Ready.
[ "optimizer", "emptybind", "pattern
optimizer.emptybind(mod:str,fcn:str):str ", "OPTwrapper;", "Evaluate empty
set expressions." ]
[ "optimizer", "evaluate", "pattern optimizer.evaluate():str ",
"OPTwrapper;", "" ]
[ "optimizer", "evaluate", "pattern
optimizer.evaluate(mod:str,fcn:str):str ", "OPTwrapper;", "Evaluate
constant expressions once." ]
-[ "optimizer", "factorize", "pattern optimizer.factorize():str ",
"OPTwrapper;", "" ]
-[ "optimizer", "factorize", "pattern
optimizer.factorize(mod:str,fcn:str):str ", "OPTwrapper;", "Turn function
into a factory" ]
[ "optimizer", "garbageCollector", "pattern
optimizer.garbageCollector():str ", "OPTwrapper;", "" ]
[ "optimizer", "garbageCollector", "pattern
optimizer.garbageCollector(mod:str,fcn:str):str ", "OPTwrapper;", "Garbage
collector optimizer" ]
[ "optimizer", "generator", "pattern optimizer.generator():str ",
"OPTwrapper;", "" ]
@@ -10915,8 +10913,6 @@ Ready.
[ "sql", "row_number", "pattern
sql.row_number(b:any_1,p:bit,o:bit):int ", "SQLrow_number;", "return
the row_numer-ed groups" ]
[ "sql", "sessions", "pattern sql.sessions()
(user:bat[:str],start:bat[:timestamp],stimeout:bat[:lng],lastcmd:bat[:timestamp],qtimeout:bat[:lng],idle:bat[:bit])
", "sql_sessions_wrap;", "SQL export table of active sessions, their
timeouts and idle status" ]
[ "sql", "setVariable", "pattern
sql.setVariable(mvc:int,varname:str,value:any_1):int ", "setVariable;",
"Set the value of a session variable" ]
-[ "sql", "settimeout", "pattern sql.settimeout(s:lng):void ",
"CLTsetTimeout;", "Abort query after s seconds" ]
-[ "sql", "settimeout", "pattern sql.settimeout(s:lng,t:lng):void ",
"CLTsetTimeout;", "Abort query after s and session after t seconds"
]
[ "sql", "shrink", "pattern sql.shrink(sch:str,tbl:str):void ",
"SQLshrink;", "Consolidate the deletion table over all columns using
shrinking" ]
[ "sql", "shutdown", "pattern sql.shutdown(delay:bte):str ",
"SQLshutdown_wrap;", "" ]
[ "sql", "shutdown", "pattern sql.shutdown(delay:bte,force:bit):str
", "SQLshutdown_wrap;", "" ]
diff --git a/clients/Tests/SQL-dump.stable.out
b/clients/Tests/SQL-dump.stable.out
--- a/clients/Tests/SQL-dump.stable.out
+++ b/clients/Tests/SQL-dump.stable.out
@@ -1016,9 +1016,9 @@ create function "right_shift"(i1 inet, i
create function "right_shift_assign"(i1 inet, i2 inet) returns boolean
external name inet.">>=";
create function sys.sessions() returns table("user" string, "login" timestamp,
"sessiontimeout" bigint, "lastcommand" timestamp, "querytimeout" bigint,
"active" bool) external name sql.sessions;
create function "setmasklen" (p inet, mask int) returns inet external name
inet."setmasklen";
-create procedure sys.setsession("timeout" bigint) external name sql.setsession;
-create procedure sys.settimeout("query" bigint) external name sql.settimeout;
-create procedure sys.settimeout("query" bigint, "session" bigint) external
name sql.settimeout;
+create procedure sys.setsession("timeout" bigint) external name
clients.setsession;
+create procedure sys.settimeout("query" bigint) external name
clients.settimeout;
+create procedure sys.settimeout("query" bigint, "session" bigint) external
name clients.settimeout;
create procedure shpattach(fname string) external name shp.attach;
create procedure shpload(fid integer) external name shp.load;
create procedure shpload(fid integer, filter geometry) external name
shp.import;
@@ -1292,7 +1292,7 @@ drop function pcre_replace(string, strin
[ "sys", 2, 3, true ]
[ "tmp", 2, 3, true ]
#select s.name, t.name,
replace(replace(pcre_replace(pcre_replace(pcre_replace(t.query, '--.*\n', '',
''), '[ \t\n]+', ' ', 'm'), '^ ', '', ''), '( ', '('), ' )', ')') as query,
t.type, t.system, t.commit_action, t.access from sys._tables t left outer join
sys.schemas s on t.schema_id = s.id order by s.name, t.name;
-% .s, .t, .L1, .t, .t, .t, .t # table_name
+% .s, .t, .L4, .t, .t, .t, .t # table_name
% name, name, query, type, system, commit_action, access # name
% varchar, varchar, varchar, smallint, boolean,
smallint, smallint # type
% 3, 17, 597, 1, 5, 1, 1 # length
@@ -1744,7 +1744,7 @@ drop function pcre_replace(string, strin
[ "users", "fullname", "varchar", 2024, 0, NULL, true,
1, NULL ]
[ "users", "default_schema", "int", 9, 0, NULL, true,
2, NULL ]
#select s.name, f.name,
replace(replace(pcre_replace(pcre_replace(pcre_replace(f.func, '--.*\n', '',
''), '[ \t\n]+', ' ', 'm'), '^ ', '', ''), '( ', '('), ' )', ')') as query,
f.mod, f.language, f.type, f.side_effect, f.varres, f.vararg from sys.functions
f left outer join sys.schemas s on f.schema_id = s.id order by s.name, f.name,
query;
-% .s, .f, .L1, .f, .f, .f, .f, .f, .f # table_name
+% .s, .f, .L4, .f, .f, .f, .f, .f, .f # table_name
% name, name, query, mod, language, type, side_effect,
varres, vararg # name
% varchar, varchar, varchar, varchar, int, int,
boolean, boolean, boolean # type
% 8, 35, 845, 9, 1, 1, 5, 5, 5 # length
@@ -2018,8 +2018,8 @@ drop function pcre_replace(string, strin
[ "sys", "hour", "hours", "mtime", 0, 1, false,
false, false ]
[ "sys", "identity", "identity", "calc", 0, 1, false,
false, false ]
[ "sys", "ifthenelse", "ifthenelse", "calc", 0, 1, false,
false, false ]
-[ "sys", "ilike", "create filter function \"ilike\"(val string,
pat string) external name algebra.\"ilike\";", "algebra", 1, 4,
true, false, false ]
-[ "sys", "ilike", "create filter function \"ilike\"(val string,
pat string, esc string) external name algebra.\"ilike\";", "algebra",
1, 4, true, false, false ]
+[ "sys", "ilike", "create filter function \"ilike\"(val string,
pat string) external name algebra.\"ilike\";", "algebra", 1, 4,
false, false, false ]
+[ "sys", "ilike", "create filter function \"ilike\"(val string,
pat string, esc string) external name algebra.\"ilike\";", "algebra",
1, 4, false, false, false ]
[ "sys", "imprintsize", "create function sys.imprintsize(i bigint, nme
string) returns bigint begin if nme = 'boolean' or nme = 'tinyint' or nme =
'smallint' or nme = 'int' or nme = 'bigint' or nme = 'hugeint' or nme =
'decimal' or nme = 'date' or nme = 'timestamp' or nme = 'real' or nme =
'double' then return cast(i * 0.12 as bigint); end if ; return 0; end;",
"user", 2, 1, false, false, false ]
[ "sys", "in", "in", "calc", 0, 1, false, false, false
]
[ "sys", "index", "index", "calc", 0, 1, false,
false, false ]
@@ -2069,8 +2069,8 @@ drop function pcre_replace(string, strin
[ "sys", "lidarattach", "create procedure lidarattach(fname string)
external name lidar.attach;", "lidar", 1, 2, true,
false, false ]
[ "sys", "lidarexport", "create procedure lidarexport(tname string,
fname string, format string) external name lidar.export;", "lidar", 1,
2, true, false, false ]
[ "sys", "lidarload", "create procedure lidarload(tname string)
external name lidar.load;", "lidar", 1, 2, true, false,
false ]
-[ "sys", "like", "create filter function \"like\"(val string, pat
string) external name algebra.\"like\";", "algebra", 1, 4,
true, false, false ]
-[ "sys", "like", "create filter function \"like\"(val string, pat
string, esc string) external name algebra.\"like\";", "algebra", 1,
4, true, false, false ]
+[ "sys", "like", "create filter function \"like\"(val string, pat
string) external name algebra.\"like\";", "algebra", 1, 4,
false, false, false ]
+[ "sys", "like", "create filter function \"like\"(val string, pat
string, esc string) external name algebra.\"like\";", "algebra", 1,
4, false, false, false ]
[ "sys", "listdir", "create procedure listdir(dirname string)
external name fits.listdir;", "fits", 1, 2, true, false, false ]
[ "sys", "listdirpat", "create procedure listdirpat(dirname string,pat
string) external name fits.listdirpattern;", "fits", 1, 2, true,
false, false ]
[ "sys", "local_timezone", "local_timezone", "mtime",
0, 1, false, false, false ]
@@ -2813,9 +2813,9 @@ drop function pcre_replace(string, strin
[ "sys", "second", "sql_seconds", "mtime", 0, 1,
false, false, false ]
[ "sys", "sessions", "create function sys.sessions() returns
table(\"user\" string, \"login\" timestamp, \"sessiontimeout\" bigint,
\"lastcommand\" timestamp, \"querytimeout\" bigint, \"active\" bool) external
name sql.sessions;", "sql", 1, 5, false, false, false ]
[ "sys", "setmasklen", "create function \"setmasklen\" (p inet, mask
int) returns inet external name inet.\"setmasklen\";", "inet", 1, 1,
false, false, false ]
-[ "sys", "setsession", "create procedure sys.setsession(\"timeout\"
bigint) external name sql.setsession;", "sql", 1, 2, true,
false, false ]
-[ "sys", "settimeout", "create procedure sys.settimeout(\"query\"
bigint) external name sql.settimeout;", "sql", 1, 2, true,
false, false ]
-[ "sys", "settimeout", "create procedure sys.settimeout(\"query\"
bigint, \"session\" bigint) external name sql.settimeout;", "sql", 1, 2,
true, false, false ]
+[ "sys", "setsession", "create procedure sys.setsession(\"timeout\"
bigint) external name clients.setsession;", "clients", 1, 2,
true, false, false ]
+[ "sys", "settimeout", "create procedure sys.settimeout(\"query\"
bigint) external name clients.settimeout;", "clients", 1, 2,
true, false, false ]
+[ "sys", "settimeout", "create procedure sys.settimeout(\"query\"
bigint, \"session\" bigint) external name clients.settimeout;", "clients",
1, 2, true, false, false ]
[ "sys", "shpattach", "create procedure shpattach(fname string)
external name shp.attach;", "shp", 1, 2, true, false, false ]
[ "sys", "shpload", "create procedure shpload(fid integer) external
name shp.load;", "shp", 1, 2, true, false, false ]
[ "sys", "shpload", "create procedure shpload(fid integer, filter
geometry) external name shp.import;", "shp", 1, 2, true,
false, false ]
@@ -4850,8 +4850,8 @@ drop function pcre_replace(string, strin
[ "sysadmin", 0 ]
[ "monetdb", 0 ]
#select server, port, db, db_alias, user, password, language from
sys.connections order by server, port;
-% sys.connections, sys.connections, sys.connections,
sys.connections, .L1, sys.connections, sys.connections #
table_name
-% server, port, db, db_alias, L1, password,
language # name
+% sys.connections, sys.connections, sys.connections,
sys.connections, .L6, sys.connections, sys.connections #
table_name
+% server, port, db, db_alias, L6, password,
language # name
% char, int, char, char, varchar, char, char # type
% 1024, 1, 64, 1024, 0, 1024, 1024 # length
#select u.name, u.fullname, s.name from sys.db_user_info u left outer join
sys.schemas s on u.default_schema = s.id order by u.name;
@@ -5660,14 +5660,14 @@ drop function pcre_replace(string, strin
% varchar, varchar, bigint, bigint, bigint, bigint, bigint, boolean
# type
% 0, 0, 1, 1, 1, 1, 1, 5 # length
#select count(*) from sys.statistics;
-% sys.L2 # table_name
-% L1 # name
+% sys.L4 # table_name
+% L3 # name
% bigint # type
% 1 # length
[ 0 ]
#select count(*) from sys.storagemodelinput;
-% sys.L2 # table_name
-% L1 # name
+% sys.L4 # table_name
+% L3 # name
% bigint # type
% 1 # length
[ 0 ]
diff --git a/clients/Tests/SQL-dump.stable.out.int128
b/clients/Tests/SQL-dump.stable.out.int128
--- a/clients/Tests/SQL-dump.stable.out.int128
+++ b/clients/Tests/SQL-dump.stable.out.int128
@@ -1021,9 +1021,9 @@ create function "right_shift"(i1 inet, i
create function "right_shift_assign"(i1 inet, i2 inet) returns boolean
external name inet.">>=";
create function sys.sessions() returns table("user" string, "login" timestamp,
"sessiontimeout" bigint, "lastcommand" timestamp, "querytimeout" bigint,
"active" bool) external name sql.sessions;
create function "setmasklen" (p inet, mask int) returns inet external name
inet."setmasklen";
-create procedure sys.setsession("timeout" bigint) external name sql.setsession;
-create procedure sys.settimeout("query" bigint) external name sql.settimeout;
-create procedure sys.settimeout("query" bigint, "session" bigint) external
name sql.settimeout;
+create procedure sys.setsession("timeout" bigint) external name
clients.setsession;
+create procedure sys.settimeout("query" bigint) external name
clients.settimeout;
+create procedure sys.settimeout("query" bigint, "session" bigint) external
name clients.settimeout;
create procedure shpattach(fname string) external name shp.attach;
create procedure shpload(fid integer) external name shp.load;
create procedure shpload(fid integer, filter geometry) external name
shp.import;
@@ -1301,7 +1301,7 @@ drop function pcre_replace(string, strin
[ "sys", 2, 3, true ]
[ "tmp", 2, 3, true ]
#select s.name, t.name,
replace(replace(pcre_replace(pcre_replace(pcre_replace(t.query, '--.*\n', '',
''), '[ \t\n]+', ' ', 'm'), '^ ', '', ''), '( ', '('), ' )', ')') as query,
t.type, t.system, t.commit_action, t.access from sys._tables t left outer join
sys.schemas s on t.schema_id = s.id order by s.name, t.name;
-% .s, .t, .L1, .t, .t, .t, .t # table_name
+% .s, .t, .L4, .t, .t, .t, .t # table_name
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
