Changeset: c7971537462c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c7971537462c
Added Files:
MacOSX/MonetDB_logo.png
clients/R/Tests/dplyr.timeout
monetdb5/modules/mal/Tests/orderidx04.stable.err
monetdb5/modules/mal/Tests/orderidx04.stable.out
sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.err.single
sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out.single
sql/test/BugTracker-2016/Tests/RELEASE_SAVEPOINT_after_ALTER_TABLE_crash.Bug-4010.sql
sql/test/BugTracker-2016/Tests/RELEASE_SAVEPOINT_after_ALTER_TABLE_crash.Bug-4010.stable.err
sql/test/BugTracker-2016/Tests/RELEASE_SAVEPOINT_after_ALTER_TABLE_crash.Bug-4010.stable.out
sql/test/BugTracker-2016/Tests/RELEASE_SAVEPOINT_after_UPDATE_crash.Bug-4010.sql
sql/test/BugTracker-2016/Tests/RELEASE_SAVEPOINT_after_UPDATE_crash.Bug-4010.stable.err
sql/test/BugTracker-2016/Tests/RELEASE_SAVEPOINT_after_UPDATE_crash.Bug-4010.stable.out
sql/test/BugTracker-2016/Tests/rename_exps.Bug-3974.stable.out.32bit
sql/test/BugTracker-2016/Tests/storagemodel.sql
sql/test/BugTracker-2016/Tests/storagemodel.stable.err
sql/test/BugTracker-2016/Tests/storagemodel.stable.out
sql/test/BugTracker-2016/Tests/string-length.Bug-3999.sql
sql/test/BugTracker-2016/Tests/string-length.Bug-3999.stable.err
sql/test/BugTracker-2016/Tests/string-length.Bug-3999.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
Removed Files:
MacOSX/MonetDB logo.png
sql/test/BugTracker-2016/Tests/storagemodel.Bug-3923.sql
sql/test/BugTracker-2016/Tests/storagemodel.Bug-3923.stable.err
sql/test/BugTracker-2016/Tests/storagemodel.Bug-3923.stable.out
Modified Files:
MacOSX/MonetDB.pkgproj
NT/updatecodes.py
clients/R/MonetDB.R/R/dbi.R
clients/R/Tests/All
clients/R/Tests/dbapply.R
clients/R/Tests/dbi.R
clients/R/Tests/deps-install.R
clients/R/Tests/deps-test.R
clients/R/Tests/dplyr-flights.R
clients/R/Tests/dplyr-flights.stable.out
clients/R/Tests/dplyr.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
clients/Tests/exports.stable.out
clients/mapiclient/mclient.c
gdk/gdk.h
gdk/gdk_bbp.c
gdk/gdk_join.c
gdk/gdk_logger.c
gdk/gdk_select.c
gdk/gdk_storage.c
gdk/gdk_tm.c
gdk/gdk_utils.c
java/ChangeLog.Jul2015
java/ChangeLog.Jun2016
java/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetResultSet.java
java/src/main/java/nl/cwi/monetdb/util/SQLExporter.java
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows.single
monetdb5/extras/mal_optimizer_template/opt_sql_append.c
monetdb5/extras/rapi/rapi.c
monetdb5/mal/mal.c
monetdb5/mal/mal.h
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_instruction.h
monetdb5/mal/mal_listing.c
monetdb5/mal/mal_namespace.c
monetdb5/mal/mal_runtime.c
monetdb5/modules/atoms/str.c
monetdb5/modules/atoms/str.h
monetdb5/modules/atoms/str.mal
monetdb5/modules/kernel/batstr.c
monetdb5/modules/kernel/batstr.mal
monetdb5/modules/kernel/status.c
monetdb5/modules/mal/01_batcalc.mal
monetdb5/modules/mal/Tests/inspect00.stable.out
monetdb5/modules/mal/Tests/inspect05.stable.out
monetdb5/modules/mal/bbp.c
monetdb5/modules/mal/manifold.c
monetdb5/optimizer/Tests/dataflow3.stable.out
monetdb5/optimizer/Tests/inline02.stable.out
monetdb5/optimizer/Tests/inline03.stable.out
monetdb5/optimizer/Tests/inline04.stable.out
monetdb5/optimizer/Tests/inline06.stable.out
monetdb5/optimizer/Tests/inline07.stable.out
monetdb5/optimizer/Tests/inline09.stable.out
monetdb5/optimizer/Tests/inline10.stable.out
monetdb5/optimizer/Tests/inline12.stable.out
monetdb5/optimizer/Tests/inlineCst.stable.out
monetdb5/optimizer/Tests/inlineFunction2.stable.out
monetdb5/optimizer/Tests/manifold2.stable.out
monetdb5/optimizer/Tests/manifold2.stable.out.single
monetdb5/optimizer/opt_constants.c
monetdb5/optimizer/opt_costModel.c
monetdb5/optimizer/opt_support.c
monetdb5/optimizer/opt_wrapper.c
monetdb5/optimizer/optimizer.c
monetdb5/scheduler/run_isolate.c
sql/backends/monet5/sql_decimal.mal
sql/backends/monet5/sql_decimal.mal.sh
sql/backends/monet5/sql_decimal_hge.mal
sql/backends/monet5/sql_decimal_hge.mal.sh
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_optimizer.c
sql/backends/monet5/sql_upgrades.c
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/05-explain.stable.out
sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/06-explain.stable.out
sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128
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/tpch/Tests/01-explain.stable.out
sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
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.32bit
sql/benchmarks/tpch/Tests/05-explain.stable.out
sql/benchmarks/tpch/Tests/05-explain.stable.out.32bit
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/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/12-explain.stable.out
sql/benchmarks/tpch/Tests/12-explain.stable.out.int128
sql/benchmarks/tpch/Tests/13-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/14-explain.stable.out
sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
sql/benchmarks/tpch/Tests/17-explain.stable.out
sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/21-plan.stable.out
sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit
sql/common/sql_types.c
sql/jdbc/tests/Tests/Test_CisValid.stable.err
sql/jdbc/tests/Tests/Test_JdbcClient.stable.out
sql/jdbc/tests/Tests/Test_Rmetadata.stable.out
sql/scripts/45_uuid.sql
sql/server/rel_optimizer.c
sql/server/rel_partition.c
sql/server/sql_mvc.c
sql/server/sql_parser.y
sql/server/sql_qc.c
sql/storage/store.c
sql/test/ADT2006/Tests/bram.stable.out
sql/test/BugDay_2005-10-06_2.9.3/Tests/var_char_cast_truncate.SF-1150907.stable.out
sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out
sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
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
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128.single
sql/test/BugTracker-2013/Tests/binary_copy_into.Bug-3345.SQL.py
sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out
sql/test/BugTracker-2015/Tests/mserver-creates-but-not-accept-column-types-decimal19-decimal39.Bug-3863.stable.out.int128
sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out
sql/test/BugTracker-2016/Tests/All
sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out.32bit
sql/test/BugTracker/Tests/authorization.SF-1430616.stable.out
sql/test/BugTracker/Tests/bug_in_selection.SF-1892413.stable.out
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/insert_not_exists.SF-1380287.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
sql/test/Dependencies/Tests/Dependencies.stable.out
sql/test/Tests/decimal2.stable.out
sql/test/Tests/str-pad.stable.out
sql/test/Tests/str-trim.stable.out
sql/test/Tests/string.stable.out
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
sql/test/Users/Tests/copyinto.SQL.py
sql/test/Users/Tests/copyinto.stable.err
sql/test/Users/Tests/dropManyUsers.Bug-3764.SQL.py
sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.out
sql/test/Users/Tests/test_privs2_p1.stable.out
sql/test/bugs/Tests/except-union-intersect-bug-sf-1146079.stable.out
sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.stable.out
sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_MapiClient.stable.out
sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/check.stable.out
sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-hge/Tests/check.stable.out.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/check.stable.out
sql/test/emptydb-upgrade/Tests/check.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/leaks/Tests/check0.stable.out
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check1.stable.out.int128
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check2.stable.out.int128
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check3.stable.out.int128
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check4.stable.out.int128
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/check5.stable.out.int128
sql/test/leaks/Tests/select1.stable.out
sql/test/leaks/Tests/select2.stable.out
sql/test/mergetables/Tests/mergequery.stable.out
sql/test/orderidx/Tests/simpletable.sql
sql/test/orderidx/Tests/simpletable.stable.out
sql/test/orderidx/Tests/smalltable.sql
sql/test/orderidx/Tests/smalltable.stable.out
sql/test/pg_regress/Tests/strings.stable.out
sql/test/pg_regress/Tests/without_oid.stable.out.oid32
sql/test/remote/Tests/partition_elim.stable.out
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
testing/Mfilter.py
testing/Mtest.py.in
tools/mserver/mserver5.c
Branch: no-wrd
Log Message:
Merge with default branch.
diffs (truncated from 32268 to 300 lines):
diff --git a/MacOSX/MonetDB.pkgproj b/MacOSX/MonetDB.pkgproj
--- a/MacOSX/MonetDB.pkgproj
+++ b/MacOSX/MonetDB.pkgproj
@@ -544,7 +544,7 @@
<key>BACKGROUND_PATH</key>
<dict>
<key>PATH</key>
- <string>MonetDB logo.png</string>
+ <string>MonetDB_logo.png</string>
<key>PATH_TYPE</key>
<integer>1</integer>
</dict>
diff --git a/MacOSX/MonetDB logo.png b/MacOSX/MonetDB_logo.png
rename from MacOSX/MonetDB logo.png
rename to MacOSX/MonetDB_logo.png
diff --git a/NT/updatecodes.py b/NT/updatecodes.py
--- a/NT/updatecodes.py
+++ b/NT/updatecodes.py
@@ -13,20 +13,22 @@ prcdre = re.compile('"ProductCode" = "8:
pacdre = re.compile('"PackageCode" = "8:{(.*)}"')
def update(f):
- p = subprocess.Popen(['uuidgen'], stdout = subprocess.PIPE)
+ p = subprocess.Popen(['uuidgen'], stdout = subprocess.PIPE,
+ universal_newlines = True)
u, e = p.communicate()
- productcode = u.strip('\r\n').upper()
- p = subprocess.Popen(['uuidgen'], stdout = subprocess.PIPE)
+ productcode = u.strip('\n').upper()
+ p = subprocess.Popen(['uuidgen'], stdout = subprocess.PIPE,
+ universal_newlines = True)
u, e = p.communicate()
- packagecode = u.strip('\r\n').upper()
- fp = open(f, 'rb')
+ packagecode = u.strip('\n').upper()
+ fp = open(f)
data = fp.read()
fp.close()
repl = '"ProductCode" = "8:{%s}"' % productcode
data = prcdre.sub(repl, data)
repl = '"PackageCode" = "8:{%s}"' % packagecode
data = pacdre.sub(repl, data)
- fp = open(f, 'wb')
+ fp = open(f, 'w')
fp.write(data)
fp.close()
diff --git a/clients/R/MonetDB.R/R/dbi.R b/clients/R/MonetDB.R/R/dbi.R
--- a/clients/R/MonetDB.R/R/dbi.R
+++ b/clients/R/MonetDB.R/R/dbi.R
@@ -524,7 +524,7 @@ setMethod("dbWriteTable", signature(conn
if (csvdump) {
tmp <- tempfile(fileext = ".csv")
write.table(value, tmp, sep = ",", quote = TRUE, row.names = FALSE,
col.names = FALSE, na="", fileEncoding = "UTF-8")
- dbSendQuery(conn, paste0("COPY INTO ", qname, " FROM '", tmp, "' USING
DELIMITERS ',','\\n','\"' NULL AS ''"))
+ dbSendQuery(conn, paste0("COPY INTO ", qname, " FROM '",
encodeString(tmp), "' USING DELIMITERS ',','\\n','\"' NULL AS ''"))
file.remove(tmp)
} else {
vins <- paste("(", paste(rep("?", length(value)), collapse=', '), ")",
sep='')
@@ -924,7 +924,7 @@ monet.read.csv <- monetdb.read.csv <- fu
delimspec <- paste0("USING DELIMITERS '", delim, "','", newline, "','",
quote, "'")
for(i in seq_along(files)) {
- thefile <- normalizePath(files[i])
+ thefile <- encodeString(normalizePath(files[i]))
dbSendUpdate(conn, paste("COPY", if(header) "OFFSET 2", "INTO",
tablename, "FROM", paste("'", thefile, "'", sep=""), delimspec, "NULL
as", paste("'",
na.strings[1], "'", sep=""), if(locked) "LOCKED", if(best.effort) "BEST
EFFORT"))
diff --git a/clients/R/Tests/All b/clients/R/Tests/All
--- a/clients/R/Tests/All
+++ b/clients/R/Tests/All
@@ -1,6 +1,6 @@
HAVE_LIBR?deps-install
+HAVE_LIBR?install
HAVE_LIBR?deps-test
-HAVE_LIBR?install
HAVE_LIBR?dbi
HAVE_LIBR?survey
HAVE_LIBR?dplyr
diff --git a/clients/R/Tests/dbapply.R b/clients/R/Tests/dbapply.R
--- a/clients/R/Tests/dbapply.R
+++ b/clients/R/Tests/dbapply.R
@@ -1,6 +1,5 @@
-ll <- NULL
if (Sys.getenv("TSTTRGDIR") != "") {
- ll <- paste0(Sys.getenv("TSTTRGDIR"),"/rlibdir")
+ .libPaths(c(.libPaths(), paste0(Sys.getenv("TSTTRGDIR"),"/rlibdir")))
}
library(DBI, quietly = T)
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
@@ -1,6 +1,5 @@
-ll <- NULL
if (Sys.getenv("TSTTRGDIR") != "") {
- ll <- paste0(Sys.getenv("TSTTRGDIR"),"/rlibdir")
+ .libPaths(c(.libPaths(), paste0(Sys.getenv("TSTTRGDIR"),"/rlibdir")))
}
library(DBI)
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
@@ -3,6 +3,9 @@ dir.create(unlist(strsplit(Sys.getenv("R
# autoinstall DBI and digest, we need those to install MonetDB.R
dd <- capture.output(suppressMessages(suppressWarnings({
- install.packages(c("devtools", "digest"),
repos="http://cran.rstudio.com/";, quiet=T)
+ 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)
})))
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
@@ -5,6 +5,5 @@ dd <- capture.output(suppressMessages(su
repos <-
c('http://download.r-forge.r-project.org','http://cran.rstudio.com/')
if(length(np)) install.packages(np,repos=repos, quiet=T)
update.packages(repos=repos, ask=F, oldPkgs=lp, quiet=T)
- x <- lapply(lp,function(x){library(x,character.only=TRUE,quietly=T)})
})(c('Rcpp', 'dplyr','survey','sqlsurvey','Lahman','nycflights13'))
})))
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
@@ -1,6 +1,5 @@
-ll <- NULL
if (Sys.getenv("TSTTRGDIR") != "") {
- ll <- paste0(Sys.getenv("TSTTRGDIR"),"/rlibdir")
+ .libPaths(c(.libPaths(), paste0(Sys.getenv("TSTTRGDIR"),"/rlibdir")))
}
ff <- textConnection("asdf", open="w")
# hide output from connect and attach since it would blow up the test output
diff --git a/clients/R/Tests/dplyr-flights.stable.out
b/clients/R/Tests/dplyr-flights.stable.out
--- a/clients/R/Tests/dplyr-flights.stable.out
+++ b/clients/R/Tests/dplyr-flights.stable.out
@@ -30,25 +30,25 @@ Ready.
# 11:44:05 >
[1] TRUE
-[1] 336776 16
-[1] 42 16
-[1] 42 16
-[1] 42 16
-[1] 42 16
-[1] 42 16
+[1] 336776 19
+[1] 42 19
+[1] 42 19
+[1] 42 19
+[1] 42 19
+[1] 42 19
[1] 42 3
[1] 42 3
-[1] 42 13
-[1] 42 1
[1] 42 16
[1] 42 1
+[1] 42 19
+[1] 42 1
[1] 42 2
-[1] 42 18
-[1] 42 18
+[1] 42 21
+[1] 42 21
[1] 42 2
[1] 1 1
-[1] 10 16
-[1] 42 16
+[1] 10 19
+[1] 42 19
[1] 42 3
[1] 42 4
[1] 42 4
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
@@ -1,6 +1,5 @@
-ll <- NULL
if (Sys.getenv("TSTTRGDIR") != "") {
- ll <- paste0(Sys.getenv("TSTTRGDIR"),"/rlibdir")
+ .libPaths(c(.libPaths(), paste0(Sys.getenv("TSTTRGDIR"),"/rlibdir")))
}
ff <- textConnection("asdf", open="w")
# hide output from connect and attach since it would blow up the test output
diff --git a/clients/R/Tests/dplyr.timeout b/clients/R/Tests/dplyr.timeout
new file mode 100644
--- /dev/null
+++ b/clients/R/Tests/dplyr.timeout
@@ -0,0 +1,1 @@
+2
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
@@ -2290,10 +2290,6 @@ command batstr.startsWith(s:bat[:str],pr
address STRbatPrefix;
comment Prefix check.
-command batstr.stringlength(s:bat[:str]):bat[:int]
-address STRbatstringLength;
-comment Return the length of a right trimed string.
-
command batstr.trim(s:bat[:str],s2:bat[:str]):bat[:str]
address STRbatStrip2_bat;
comment Strip characters in the second strings around the first strings.
@@ -32599,10 +32595,6 @@ command str.startsWith(s:str,prefix:str)
address STRPrefix;
comment Prefix check.
-command str.stringlength(s:str):int
-address STRSQLLength;
-comment Return the length of a right trimed string (SQL semantics).
-
command str.string(s:str,offset:int,count:int):str
address STRSubString;
comment Return substring s[offset..offset+count] of a string s[0..n]
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
@@ -2690,10 +2690,6 @@ command batstr.startsWith(s:bat[:str],pr
address STRbatPrefix;
comment Prefix check.
-command batstr.stringlength(s:bat[:str]):bat[:int]
-address STRbatstringLength;
-comment Return the length of a right trimed string.
-
command batstr.trim(s:bat[:str],s2:bat[:str]):bat[:str]
address STRbatStrip2_bat;
comment Strip characters in the second strings around the first strings.
@@ -42028,10 +42024,6 @@ command str.startsWith(s:str,prefix:str)
address STRPrefix;
comment Prefix check.
-command str.stringlength(s:str):int
-address STRSQLLength;
-comment Return the length of a right trimed string (SQL semantics).
-
command str.string(s:str,offset:int,count:int):str
address STRSubString;
comment Return substring s[offset..offset+count] of a string s[0..n]
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
@@ -942,7 +942,6 @@ create filter function "ilike"(val strin
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;
create function internaltransform(geom geometry, srid_src integer, srid_dest
integer, proj4_src string, proj4_dest string) returns geometry external name
geom."Transform";
create function isaurl(theurl url) returns bool external name url."isaURL";
-create function sys.isauuid(u uuid) returns boolean begin return true; end;
create function sys.isauuid(s string) returns boolean external name
uuid."isaUUID";
create function "left_shift"(i1 inet, i2 inet) returns boolean external name
inet."<<";
create function "left_shift_assign"(i1 inet, i2 inet) returns boolean external
name inet."<<=";
@@ -2033,7 +2032,6 @@ drop function pcre_replace(string, strin
[ "sys", "internaltransform", "create function internaltransform(geom
geometry, srid_src integer, srid_dest integer, proj4_src string, proj4_dest
string) returns geometry external name geom.\"Transform\";", "geom", 1,
1, false, false, false ]
[ "sys", "isaurl", "create function isaurl(theurl url) returns
bool external name url.\"isaURL\";", "url", 1, 1, false,
false, false ]
[ "sys", "isauuid", "create function sys.isauuid(s string) returns
boolean external name uuid.\"isaUUID\";", "uuid", 1, 1, false,
false, false ]
-[ "sys", "isauuid", "create function sys.isauuid(u uuid) returns
boolean begin return true; end;", "user", 2, 1, false, false,
false ]
[ "sys", "isnull", "isnil", "calc", 0, 1, false,
false, false ]
[ "sys", "lcase", "toLower", "str", 0, 1, false,
false, false ]
[ "sys", "lcase", "toLower", "str", 0, 1, false,
false, false ]
@@ -2054,9 +2052,9 @@ drop function pcre_replace(string, strin
[ "sys", "left_shift", "mbrLeft", "geom", 0, 1, false,
false, false ]
[ "sys", "left_shift", "mbrLeft", "geom", 0, 1, false,
false, false ]
[ "sys", "left_shift_assign", "create function
\"left_shift_assign\"(i1 inet, i2 inet) returns boolean external name
inet.\"<<=\";", "inet", 1, 1, false, false, false ]
-[ "sys", "length", "stringlength", "str", 0, 1, false,
false, false ]
-[ "sys", "length", "stringlength", "str", 0, 1, false,
false, false ]
-[ "sys", "length", "stringlength", "str", 0, 1, false,
false, false ]
+[ "sys", "length", "length", "str", 0, 1, false,
false, false ]
+[ "sys", "length", "length", "str", 0, 1, false,
false, false ]
+[ "sys", "length", "length", "str", 0, 1, false,
false, false ]
[ "sys", "levenshtein", "levenshtein", "txtsim", 0, 1,
false, false, false ]
[ "sys", "levenshtein", "levenshtein", "txtsim", 0, 1,
false, false, false ]
[ "sys", "levenshtein", "levenshtein", "txtsim", 0, 1,
false, false, false ]
@@ -3588,7 +3586,6 @@ drop function pcre_replace(string, strin
[ "sys", "internaltransform", "geom", "geometry", 0, 0,
1, "srid_src", "int", 32, 0, 1, "srid_dest", "int",
32, 0, 1, "proj4_src", "clob", 0, 0, 1,
"proj4_dest", "clob", 0, 0, 1, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL ]
[ "sys", "isaurl", "theurl", "url", 0, 0, 1,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
]
[ "sys", "isauuid", "s", "clob", 0, 0, 1, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
-[ "sys", "isauuid", "u", "uuid", 0, 0, 1, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
[ "sys", "isnull", "arg_1", "any", 0, 0, 1,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
]
[ "sys", "lcase", "arg_1", "char", 0, 0, 1,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
]
[ "sys", "lcase", "arg_1", "clob", 0, 0, 1,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
]
@@ -5156,7 +5153,6 @@ drop function pcre_replace(string, strin
[ "inet", "inet", "sys", "host", "TYPE_DEPENDENCY" ]
[ "inet", "inet", "sys", "hostmask", "TYPE_DEPENDENCY" ]
[ "url", "url", "sys", "isaurl", "TYPE_DEPENDENCY" ]
-[ "uuid", "uuid", "sys", "isauuid", "TYPE_DEPENDENCY" ]
[ "inet", "inet", "sys", "left_shift", "TYPE_DEPENDENCY" ]
[ "inet", "inet", "sys", "left_shift_assign", "TYPE_DEPENDENCY"
]
[ "inet", "inet", "sys", "masklen", "TYPE_DEPENDENCY" ]
@@ -5596,7 +5592,6 @@ drop function pcre_replace(string, strin
[ "isarray" ]
[ "isaurl" ]
[ "isauuid" ]
-[ "isauuid" ]
[ "isnull" ]
[ "isobject" ]
[ "isobject" ]
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
