Changeset: 94e55c606088 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=94e55c606088
Added Files:
sql/test/BugTracker-2017/Tests/double-groupby-column.Bug-6207.sql
sql/test/BugTracker-2017/Tests/double-groupby-column.Bug-6207.stable.err
sql/test/BugTracker-2017/Tests/double-groupby-column.Bug-6207.stable.out
sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-distinct-coalesce.Bug-6431.sql
sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-distinct-coalesce.Bug-6431.stable.err
sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-distinct-coalesce.Bug-6431.stable.out
sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-distinct.Bug-6411.stable.err
sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-distinct.Bug-6411.stable.out
sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-having-avg.Bug-6428.sql
sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-having-avg.Bug-6428.stable.err
sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-having-avg.Bug-6428.stable.out
sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-not-in.Bug-6416.sql
sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-not-in.Bug-6416.stable.err
sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-not-in.Bug-6416.stable.out
sql/test/BugTracker-2017/Tests/sqlitelogictest-select-in.Bug-6433.sql
sql/test/BugTracker-2017/Tests/sqlitelogictest-select-in.Bug-6433.stable.err
sql/test/BugTracker-2017/Tests/sqlitelogictest-select-in.Bug-6433.stable.out
sql/test/BugTracker-2017/Tests/sqlitelogictest-select-not-in.Bug-6435.sql
sql/test/BugTracker-2017/Tests/sqlitelogictest-select-not-in.Bug-6435.stable.err
sql/test/BugTracker-2017/Tests/sqlitelogictest-select-not-in.Bug-6435.stable.out
sql/test/BugTracker-2017/Tests/sqllitelogistest_case.Bug-6335.stable.err
sql/test/BugTracker-2017/Tests/sqllitelogistest_case.Bug-6335.stable.out
sql/test/BugTracker-2017/Tests/sqlsmith-semijoin-constant.bug-6417.sql
sql/test/BugTracker-2017/Tests/sqlsmith-semijoin-constant.bug-6417.stable.err
sql/test/BugTracker-2017/Tests/sqlsmith-semijoin-constant.bug-6417.stable.out
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6418.sql
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6418.stable.err
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6418.stable.out
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6423.sql
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6423.stable.err
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6423.stable.out
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6424.sql
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6424.stable.err
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6424.stable.out
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6425.sql
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6425.stable.err
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6425.stable.out
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6432.sql
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6432.stable.err
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6432.stable.out
sql/test/bugs/Tests/in.sql
sql/test/bugs/Tests/in.stable.err
sql/test/bugs/Tests/in.stable.out
sql/test/mergetables/Tests/mergedb.Bug-6820.sql
sql/test/mergetables/Tests/mergedb.Bug-6820.stable.err
sql/test/mergetables/Tests/mergedb.Bug-6820.stable.out
sql/test/mergetables/Tests/mergedb_create.sql
sql/test/mergetables/Tests/mergedb_create.stable.err
sql/test/mergetables/Tests/mergedb_create.stable.out
sql/test/mergetables/Tests/mergedb_drop.sql
sql/test/mergetables/Tests/mergedb_drop.stable.err
sql/test/mergetables/Tests/mergedb_drop.stable.out
sql/test/mergetables/Tests/sqlsmith.Bug-6426.sql
sql/test/mergetables/Tests/sqlsmith.Bug-6426.stable.err
sql/test/mergetables/Tests/sqlsmith.Bug-6426.stable.out
Removed Files:
ChangeLog.Dec2016
buildtools/ChangeLog.Dec2016
clients/ChangeLog.Dec2016
clients/mapilib/ChangeLog.Dec2016
common/stream/ChangeLog.Dec2016
gdk/ChangeLog.Dec2016
geom/ChangeLog.Dec2016
monetdb5/ChangeLog.Dec2016
sql/ChangeLog.Dec2016
testing/ChangeLog.Dec2016
tools/merovingian/ChangeLog.Dec2016
Modified Files:
clients/R/Tests/All
clients/R/Tests/copy_into_fwf.stable.out
clients/R/Tests/dbi.R
clients/R/Tests/dbi.stable.err
clients/R/Tests/deps-install.R
clients/R/Tests/deps-test.R
clients/R/Tests/dplyr-flights.R
clients/R/Tests/dplyr-flights.reqtests
clients/R/Tests/dplyr.R
clients/R/Tests/install.R
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
clients/odbc/driver/SQLGetInfo.c
gdk/gdk_calc_compare.h
gdk/gdk_utils.c
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_linker.c
monetdb5/mal/mal_listing.c
monetdb5/mal/mal_sabaoth.c
monetdb5/modules/atoms/mtime.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/mdb.c
monetdb5/modules/mal/remote.c
monetdb5/optimizer/opt_constants.c
monetdb5/optimizer/opt_mergetable.c
monetdb5/optimizer/opt_remoteQueries.c
sql/backends/monet5/UDF/cudf/Tests/udf-reverse.stable.out
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql_cat.c
sql/backends/monet5/sql_user.c
sql/backends/monet5/vaults/bam/Tests/query2.1.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.10.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.2.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.2.stable.out.int128
sql/backends/monet5/vaults/bam/Tests/query2.6.sql
sql/backends/monet5/vaults/bam/Tests/query2.6.stable.out
sql/benchmarks/tpch/fileleak/Tests/delete_all.stable.out
sql/include/sql_catalog.h
sql/scripts/51_sys_schema_extension.sql
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_select.c
sql/server/rel_updates.c
sql/server/sql_semantic.c
sql/storage/bat/bat_storage.c
sql/storage/store.c
sql/test/BugDay_2005-10-06_2.9.3/Tests/simple_union.SF-1005596.stable.out
sql/test/BugDay_2005-11-09_2.9.3/Tests/sql_server_crash.SF-1080024.stable.out
sql/test/BugTracker-2008/Tests/count_with_order_by_and_limit_crashes.SF-2229936.stable.err
sql/test/BugTracker-2009/Tests/use_order_column_first.SF-2686008.stable.out
sql/test/BugTracker-2011/Tests/and-power.Bug-3013.stable.out.int128
sql/test/BugTracker-2012/Tests/null_except_null.Bug-3040.stable.out
sql/test/BugTracker-2012/Tests/querycache.Bug-3212.stable.out
sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out
sql/test/BugTracker-2015/Tests/and_or_in.Bug-3655.stable.out
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/decimal_vs_integer.Bug-3941.stable.out
sql/test/BugTracker-2016/Tests/memory-consumption-query-PLAN-25joins.Bug-3972.stable.out
sql/test/BugTracker-2017/Tests/All
sql/test/BugTracker-2017/Tests/caching_stats_bug.6374.stable.out
sql/test/BugTracker-2017/Tests/case.Bug-6386.sql
sql/test/BugTracker-2017/Tests/case.Bug-6386.stable.out
sql/test/BugTracker-2017/Tests/sqllitelogistest_case.Bug-6335.sql
sql/test/BugTracker-2017/Tests/statistics_nils_not_eq_zero.Bug-6331.stable.out
sql/test/BugTracker/Tests/caching.SF-1651599.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.out.int128
sql/test/LSST/Tests/dbQuery036.stable.err
sql/test/Tests/marcin3.stable.err
sql/test/Tests/str-pad.sql
sql/test/Tests/str-pad.stable.out
sql/test/bugs/Tests/All
sql/test/bugs/Tests/subselect_multiple_unionall_where_1=1-bug-sf-1005596.stable.out
sql/test/bugs/Tests/union_all-bug-sf-941788.stable.out
sql/test/mapi/Tests/sql_int128.stable.out.int128
sql/test/mergetables/Tests/All
sql/test/mergetables/Tests/mergequery.stable.out
sql/test/mergetables/Tests/part-elim.stable.out
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
Branch: trails
Log Message:
Merge with default
diffs (truncated from 9562 to 300 lines):
diff --git a/ChangeLog.Dec2016 b/ChangeLog.Dec2016
deleted file mode 100644
--- a/ChangeLog.Dec2016
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for devel
-# This file is updated with Maddlog
-
diff --git a/buildtools/ChangeLog.Dec2016 b/buildtools/ChangeLog.Dec2016
deleted file mode 100644
--- a/buildtools/ChangeLog.Dec2016
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for buildtools
-# This file is updated with Maddlog
-
diff --git a/clients/ChangeLog.Dec2016 b/clients/ChangeLog.Dec2016
deleted file mode 100644
--- a/clients/ChangeLog.Dec2016
+++ /dev/null
@@ -1,7 +0,0 @@
-# ChangeLog file for clients
-# This file is updated with Maddlog
-
-* Mon Jun 12 2017 Sjoerd Mullender <sjo...@acm.org>
-- A bug was fixed in the implementation of the functions SQLTables in
- the ODBC driver where not enough memory was allocated.
-
diff --git a/clients/R/Tests/All b/clients/R/Tests/All
--- a/clients/R/Tests/All
+++ b/clients/R/Tests/All
@@ -1,8 +1,8 @@
HAVE_LIBR?deps-install
HAVE_LIBR?install
HAVE_LIBR?deps-test
-HAVE_LIBR&HAVE_PERL?dbi
-HAVE_LIBR?dplyr
+HAVE_LIBR?dbi
+#HAVE_LIBR?dplyr too slow
HAVE_LIBR?dplyr-flights
HAVE_LIBR?copy_into_fwf
HAVE_LIBR&NOT_WIN32?dbapply
diff --git a/clients/R/Tests/copy_into_fwf.stable.out
b/clients/R/Tests/copy_into_fwf.stable.out
--- a/clients/R/Tests/copy_into_fwf.stable.out
+++ b/clients/R/Tests/copy_into_fwf.stable.out
@@ -26,6 +26,8 @@ Ready.
<MonetDBResult>
SQL CREATE TABLE mtcars (mpg DOUBLE PRECISION, cyl DOUBLE PRECISION, disp
DOUBLE PRECISION, hp DOUBLE PRECISION, drat DOUBLE PRECISION, wt DOUBLE
PRECISION, qsec DOUBLE PRECISION, vs DOUBLE PRECISION, am DOUBLE PRECISION,
gear DOUBLE PRECISION, carb DOUBLE PRECISION)
+ ROWS Fetched: 0 [complete]
+ Changed: NA
mpg cyl disp hp drat wt qsec vs am gear carb
1 21.0 6 160.0 110 3.90 2.620 16.46 0 1 4 4
2 21.0 6 160.0 110 3.90 2.875 17.02 0 1 4 4
diff --git a/clients/R/Tests/dbi.R b/clients/R/Tests/dbi.R
--- a/clients/R/Tests/dbi.R
+++ b/clients/R/Tests/dbi.R
@@ -198,7 +198,7 @@ stopifnot(identical(1L, as.integer(dbGet
# reserved words in data frame column names
stopifnot(dbIsValid(conn))
dbBegin(conn)
-dbWriteTable(conn, "evilt", data.frame(year=42, month=12, day=24,
some.dot=12), transaction=F)
+dbWriteTable(conn, "evilt", data.frame(year=42, month=12, day=24, some.dot=12))
stopifnot(dbExistsTable(conn, "evilt"))
dbRollback(conn)
@@ -208,7 +208,7 @@ dbBegin(conn)
data(api, package="survey")
x <- apiclus1
x$idkey <- seq( nrow( x ) )
-dbWriteTable( conn , 'x' , x , transaction=F)
+dbWriteTable( conn , 'x' , x )
stopifnot(dbExistsTable(conn, "x"))
dbRollback(conn)
@@ -217,7 +217,7 @@ stopifnot(!is.null(dbGetQuery(conn, "SEL
#non-standard dbwritetable use
dbBegin(conn)
-dbWriteTable(conn, "vectable", 1:1000, transaction=F)
+dbWriteTable(conn, "vectable", 1:1000)
stopifnot(dbExistsTable(conn, "vectable"))
dbRollback(conn)
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
@@ -33,19 +33,16 @@ stderr of test 'dbi` in directory 'clien
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.
Warning message:
'MonetDBLite::isIdCurrent' is deprecated.
-Use 'dbIsValid' instead.
+Use 'use dbIsValid() instead' 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.
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) "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) "Need to quote this table name" contain uppercase or reserved
SQL characters and need(s) to be quoted in queries.
Identifier(s) "some.dot" contain uppercase or reserved SQL characters and
need(s) to be quoted in queries.
Identifier(s) "year", "month", "day" are reserved SQL keywords and need(s) to
be quoted in queries.
Identifier(s) "sch.wide", "comp.imp", "yr.rnd", "acs.k3", "acs.46",
"acs.core", "pct.resp", "not.hsg", "some.col", "col.grad", "grad.sch",
"avg.ed", "api.stu" 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,13 +1,11 @@
# autoinstall DBI and digest, we need those to install MonetDB.R
+options(warn = -1)
+packages_required <- c("digest", "DBI")
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)
+install.packages(packages_required, repos="http://cran.rstudio.com/";)
cat("#~EndProfilingOutput~#\n", file=stderr())
cat("#~EndProfilingOutput~#\n\n", file=stdout())
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,26 +1,16 @@
-packages_required <- c('Rcpp', 'dplyr', 'Lahman', 'nycflights13', 'gdata',
'survey')
+packages_required <-
c("assertthat","testthat","survey","nycflights13","RSQLite","dbplyr","dplyr","gdata","callr","devtools","DBItest")
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)
-
- # dev dplyr
- if (packageVersion("devtools") < 1.6) {
- install.packages("devtools")
- }
- devtools::install_github("hadley/lazyeval")
- devtools::install_github("hadley/dplyr")
-
}
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())
diff --git a/clients/R/Tests/dplyr-flights.R b/clients/R/Tests/dplyr-flights.R
--- a/clients/R/Tests/dplyr-flights.R
+++ b/clients/R/Tests/dplyr-flights.R
@@ -20,7 +20,7 @@ so <- function(x) {
}
my_db <- MonetDBLite::src_monetdb(dbname=dbname, port=dbport, wait=T)
-if (!DBI::dbExistsTable(con_acquire(my_db) , 'flights')) DBI::dbWriteTable(
con_acquire(my_db) , 'flights' , nycflights13::flights , csvdump=T, overwrite=T)
+if (!DBI::dbExistsTable(my_db$con , 'flights')) DBI::dbWriteTable(my_db$con ,
'flights' , nycflights13::flights , csvdump=T, overwrite=T)
flights <- tbl( my_db , 'flights')
dim(flights)
diff --git a/clients/R/Tests/dplyr-flights.reqtests
b/clients/R/Tests/dplyr-flights.reqtests
--- a/clients/R/Tests/dplyr-flights.reqtests
+++ b/clients/R/Tests/dplyr-flights.reqtests
@@ -1,1 +1,1 @@
-dplyr
+dbi
diff --git a/clients/R/Tests/dplyr.R b/clients/R/Tests/dplyr.R
--- a/clients/R/Tests/dplyr.R
+++ b/clients/R/Tests/dplyr.R
@@ -15,7 +15,7 @@ if (length(args) > 1)
dbname <- args[[2]]
dps <- MonetDBLite::src_monetdb(dbname=dbname, port=dbport)
-if (!DBI::dbExistsTable(con_acquire(dps), "AllstarFull")) copy_lahman(dps)
+if (!DBI::dbExistsTable(dps$con, "AllstarFull")) dbplyr::copy_lahman(dps)
}))
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,11 +1,17 @@
+options(warn = -1)
cat("#~BeginProfilingOutput~#\n", file=stderr())
cat("#~BeginProfilingOutput~#\n", file=stdout())
-devtools::install_github("hannesmuehleisen/MonetDBLite", quiet=T)
+install_submodule_git <- function(x, ...) {
+ install_dir <- tempfile()
+ system(paste("git clone --recursive --depth 1", shQuote(x),
+shQuote(install_dir)))
+ devtools::install(install_dir, ...)
+}
+install_submodule_git("https://github.com/hannesmuehleisen/MonetDBLite-R";)
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
@@ -7459,7 +7459,6 @@ Ready.
[ "cquery", "heartbeat", "pattern cquery.heartbeat(mod:str, fcn:str,
cnt:lng):void ", "CQheartbeat;", "Awake the query after cnt milliseconds"
]
[ "cquery", "log", "pattern cquery.log() (tick:bat[:timestamp],
mod:bat[:str], fcn:bat[:str], time:bat[:lng], error:bat[:str]) ", "CQlog;",
"The log of all CQ executions" ]
[ "cquery", "prelude", "command cquery.prelude():void ",
"CQprelude;", "" ]
-[ "cquery", "register", "pattern cquery.register(mod:str, fcn:str):void
", "CQregister;", "Add a continuous SQL procedure to the Petri-net
scheduler. It will analyse\nthe MAL block to determine the input/output
dependencies and firing conditions." ]
[ "cquery", "show", "pattern cquery.show(sch:str, fcn:str):void ",
"CQshow;", "Debug a single continuous query" ]
[ "cquery", "status", "pattern cquery.status() (tick:bat[:timestamp],
mod:bat[:str], fcn:bat[:str], state:bat[:str], error:bat[:str], stmt:bat[:str])
", "CQstatus;", "Status of all registered continuous queries" ]
[ "cquery", "wait", "pattern cquery.wait(cnt:int):void ", "CQwait;",
"Sleep for some time" ]
@@ -8528,6 +8527,7 @@ Ready.
[ "sqlcatalog", "revoke", "pattern sqlcatalog.revoke(sname:str,
tbl:str, grantee:str, privs:int, cname:str, grant:int, grantor:int):void ",
"SQLrevoke;", "Catalog operation revoke" ]
[ "sqlcatalog", "revoke_function", "pattern
sqlcatalog.revoke_function(sname:str, fcnid:int, grantee:str, privs:int,
grant:int, grantor:int):void ", "SQLrevoke_function;", "Catalog
operation revoke_function" ]
[ "sqlcatalog", "revoke_roles", "pattern
sqlcatalog.revoke_roles(sname:str, auth:str, grantor:int, admin:int):void ",
"SQLrevoke_roles;", "Catalog operation revoke_roles" ]
+[ "sqlcatalog", "start_cp", "pattern sqlcatalog.start_cp(sname:str,
fname:str, argc:int, argv:ptr, alias:str, action:int, heartbeats:lng,
startat:lng, cycles:int):void ", "SQLstart_cp;", "Start a continuous query"
]
[ "status", "batStatistics", "command status.batStatistics()
(X_0:bat[:str], X_1:bat[:str]) ", "SYSgdkEnv;", "Show distribution of
bats by kind" ]
[ "status", "cpuStatistics", "command status.cpuStatistics()
(X_0:bat[:str], X_1:bat[:int]) ", "SYScpuStatistics;", "Global cpu
usage information" ]
[ "status", "getThreads", "command status.getThreads() (X_0:bat[:int],
X_1:bat[:str]) ", "SYSgdkThread;", "Produce overview of active threads"
]
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
@@ -9805,7 +9805,6 @@ Ready.
[ "cquery", "heartbeat", "pattern cquery.heartbeat(mod:str, fcn:str,
cnt:lng):void ", "CQheartbeat;", "Awake the query after cnt milliseconds"
]
[ "cquery", "log", "pattern cquery.log() (tick:bat[:timestamp],
mod:bat[:str], fcn:bat[:str], time:bat[:lng], error:bat[:str]) ", "CQlog;",
"The log of all CQ executions" ]
[ "cquery", "prelude", "command cquery.prelude():void ",
"CQprelude;", "" ]
-[ "cquery", "register", "pattern cquery.register(mod:str, fcn:str):void
", "CQregister;", "Add a continuous SQL procedure to the Petri-net
scheduler. It will analyse\nthe MAL block to determine the input/output
dependencies and firing conditions." ]
[ "cquery", "show", "pattern cquery.show(sch:str, fcn:str):void ",
"CQshow;", "Debug a single continuous query" ]
[ "cquery", "status", "pattern cquery.status() (tick:bat[:timestamp],
mod:bat[:str], fcn:bat[:str], state:bat[:str], error:bat[:str], stmt:bat[:str])
", "CQstatus;", "Status of all registered continuous queries" ]
[ "cquery", "wait", "pattern cquery.wait(cnt:int):void ", "CQwait;",
"Sleep for some time" ]
@@ -10892,6 +10891,7 @@ Ready.
[ "sqlcatalog", "revoke", "pattern sqlcatalog.revoke(sname:str,
tbl:str, grantee:str, privs:int, cname:str, grant:int, grantor:int):void ",
"SQLrevoke;", "Catalog operation revoke" ]
[ "sqlcatalog", "revoke_function", "pattern
sqlcatalog.revoke_function(sname:str, fcnid:int, grantee:str, privs:int,
grant:int, grantor:int):void ", "SQLrevoke_function;", "Catalog
operation revoke_function" ]
[ "sqlcatalog", "revoke_roles", "pattern
sqlcatalog.revoke_roles(sname:str, auth:str, grantor:int, admin:int):void ",
"SQLrevoke_roles;", "Catalog operation revoke_roles" ]
+[ "sqlcatalog", "start_cp", "pattern sqlcatalog.start_cp(sname:str,
fname:str, argc:int, argv:ptr, alias:str, action:int, heartbeats:lng,
startat:lng, cycles:int):void ", "SQLstart_cp;", "Start a continuous query"
]
[ "status", "batStatistics", "command status.batStatistics()
(X_0:bat[:str], X_1:bat[:str]) ", "SYSgdkEnv;", "Show distribution of
bats by kind" ]
[ "status", "cpuStatistics", "command status.cpuStatistics()
(X_0:bat[:str], X_1:bat[:int]) ", "SYScpuStatistics;", "Global cpu
usage information" ]
[ "status", "getThreads", "command status.getThreads() (X_0:bat[:int],
X_1:bat[:str]) ", "SYSgdkThread;", "Produce overview of active threads"
]
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
@@ -2533,6 +2533,7 @@ str sqlcatalogRef;
str startProfiler(void);
str startRef;
str startTrace(str path);
+str start_cpRef;
str starttraceRef;
str stopProfiler(void);
str stopRef;
diff --git a/clients/mapilib/ChangeLog.Dec2016
b/clients/mapilib/ChangeLog.Dec2016
deleted file mode 100644
--- a/clients/mapilib/ChangeLog.Dec2016
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for mapilib
-# This file is updated with Maddlog
-
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
@@ -1145,10 +1145,14 @@ MNDBGetInfo(ODBCDbc *dbc,
if (sValue) {
copyString(sValue, strlen(sValue), InfoValuePtr, BufferLength,
StringLengthPtr, SQLSMALLINT, addDbcError, dbc, return SQL_ERROR);
} else if (InfoValuePtr) {
- if (len == sizeof(SQLULEN))
+ if (len == sizeof(SQLUINTEGER))
+ *(SQLUINTEGER *) InfoValuePtr = (SQLUINTEGER) nValue;
+#ifndef SQLULEN
+ /* if SQLULEN is defined, it's defined as SQLUINTEGER
+ * which we've handled */
+ else if (len == sizeof(SQLULEN))
*(SQLULEN *) InfoValuePtr = (SQLULEN) nValue;
- else if (len == sizeof(SQLUINTEGER))
- *(SQLUINTEGER *) InfoValuePtr = (SQLUINTEGER) nValue;
+#endif
else if (len == sizeof(SQLUSMALLINT))
*(SQLUSMALLINT *) InfoValuePtr = (SQLUSMALLINT) nValue;
if (StringLengthPtr)
diff --git a/common/stream/ChangeLog.Dec2016 b/common/stream/ChangeLog.Dec2016
deleted file mode 100644
--- a/common/stream/ChangeLog.Dec2016
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for stream
-# This file is updated with Maddlog
-
diff --git a/gdk/ChangeLog.Dec2016 b/gdk/ChangeLog.Dec2016
deleted file mode 100644
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
