Changeset: c0cffd5afc2b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c0cffd5afc2b
Modified Files:
clients/R/MonetDB.R/R/dbi.R
clients/R/Tests/All
clients/R/Tests/dbi.R
sql/backends/monet5/Tests/simpleSQL.stable.err
sql/backends/monet5/sql_execute.c
sql/test/BugTracker-2014/Tests/ifthenelse.Bug-3629.stable.out
sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.stable.out
sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.stable.out.int128
tools/embedded/Tests/dbi.R
tools/embedded/build-on-windows.bat
Branch: embedded
Log Message:
Fixes for testweb
diffs (156 lines):
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
@@ -835,12 +835,12 @@ setMethod("isIdCurrent", signature(dbObj
.Deprecated("dbIsValid")
dbIsValid(dbObj)
})
+
setMethod("isIdCurrent", signature(dbObj="MonetDBConnection"),
def=function(dbObj, ...) {
.Deprecated("dbIsValid")
dbIsValid(dbObj)
})
-
if (is.null(getGeneric("initExtension"))) setGeneric("initExtension",
function(dbObj, ...) standardGeneric("initExtension"))
setMethod("initExtension", signature(dbObj="MonetDBConnection"),
def=function(dbObj, ...) {
.Deprecated(msg="initExtension() is not required for MonetDBLite")
diff --git a/clients/R/Tests/All b/clients/R/Tests/All
--- a/clients/R/Tests/All
+++ b/clients/R/Tests/All
@@ -6,4 +6,3 @@ HAVE_LIBR?survey
HAVE_LIBR?dplyr
HAVE_LIBR?dplyr-flights
HAVE_LIBR&NOT_WIN32?dbapply
-HAVE_LIBR?testrandom
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
@@ -69,7 +69,7 @@ stopifnot(identical(res@env$success,TRUE
stopifnot(dbColumnInfo(res)[[1,1]] == "Species")
stopifnot(dbColumnInfo(res)[[2,1]] == "Sepal.Width")
-stopifnot(dbGetInfo(res)$row.count == 150 && res@env$info$rows == 150)
+stopifnot(dbGetRowCount(res) == 150 && res@env$info$rows == 150)
data <- dbFetch(res,10)
diff --git a/sql/backends/monet5/Tests/simpleSQL.stable.err
b/sql/backends/monet5/Tests/simpleSQL.stable.err
--- a/sql/backends/monet5/Tests/simpleSQL.stable.err
+++ b/sql/backends/monet5/Tests/simpleSQL.stable.err
@@ -1,11 +1,11 @@
stderr of test 'simpleSQL` in directory 'sql/backends/monet5` itself:
-# 23:37:35 >
-# 23:37:35 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30175" "--set"
"mapi_usock=/var/tmp/mtest-28801/.s.monetdb.30175" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/mk/default//Linux/var/MonetDB/mTests_sql_backends_monet5"
"simpleSQL.mal"
-# 23:37:35 >
+# 11:36:51 >
+# 11:36:51 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=37368" "--set"
"mapi_usock=/var/tmp/mtest-33376/.s.monetdb.37368" "--set" "monet_prompt="
"--forcemito" "--dbpath=/tmp/fuckit/var/MonetDB/mTests_sql_backends_monet5"
"--set" "embedded_r=yes"
+# 11:36:51 >
-# builtin opt gdk_dbpath =
/export/scratch1/mk/default//Linux/var/monetdb5/dbfarm/demo
+# builtin opt gdk_dbpath = /tmp/fuckit/var/monetdb5/dbfarm/demo
# builtin opt gdk_debug = 0
# builtin opt gdk_vmtrim = no
# builtin opt monet_prompt = >
@@ -17,19 +17,19 @@ stderr of test 'simpleSQL` in directory
# builtin opt sql_debug = 0
# cmdline opt gdk_nr_threads = 0
# cmdline opt mapi_open = true
-# cmdline opt mapi_port = 30175
-# cmdline opt mapi_usock = /var/tmp/mtest-28801/.s.monetdb.30175
+# cmdline opt mapi_port = 37368
+# cmdline opt mapi_usock = /var/tmp/mtest-33376/.s.monetdb.37368
# cmdline opt monet_prompt =
-# cmdline opt mal_listing = 2
-# cmdline opt gdk_dbpath =
/export/scratch1/mk/default//Linux/var/MonetDB/mTests_sql_backends_monet5
+# cmdline opt gdk_dbpath = /tmp/fuckit/var/MonetDB/mTests_sql_backends_monet5
+# cmdline opt embedded_r = yes
# cmdline opt gdk_debug = 536870922
-# 13:03:24 >
-# 13:03:24 > "mclient" "-lmal" "-ftest" "-Eutf-8"
"--host=/var/tmp/mtest-21282" "--port=38130"
-# 13:03:24 >
+# 11:36:52 >
+# 11:36:52 > "mclient" "-lmal" "-ftest" "-Eutf-8"
"--host=/var/tmp/mtest-33376" "--port=37368"
+# 11:36:52 >
-# 11:30:21 >
-# 11:30:21 > "Done."
-# 11:30:21 >
+# 11:36:52 >
+# 11:36:52 > "Done."
+# 11:36:52 >
diff --git a/sql/backends/monet5/sql_execute.c
b/sql/backends/monet5/sql_execute.c
--- a/sql/backends/monet5/sql_execute.c
+++ b/sql/backends/monet5/sql_execute.c
@@ -207,6 +207,8 @@ SQLstatementIntern(Client c, str *expr,
if (execute) {
MalBlkPtr mb = c->curprg->def;
+ if (!output)
+ sql->out = NULL; /* no output stream */
msg = runMAL(c, mb, 0, 0);
MSresetInstructions(mb, oldstop);
freeVariables(c, mb, NULL, oldvtop);
diff --git a/sql/test/BugTracker-2014/Tests/ifthenelse.Bug-3629.stable.out
b/sql/test/BugTracker-2014/Tests/ifthenelse.Bug-3629.stable.out
--- a/sql/test/BugTracker-2014/Tests/ifthenelse.Bug-3629.stable.out
+++ b/sql/test/BugTracker-2014/Tests/ifthenelse.Bug-3629.stable.out
@@ -38,7 +38,7 @@ Ready.
% .L1, .L2, .L2 # table_name
% L1, L2, test_single_value # name
% int, int, int # type
-% 1, 1, 11 # length
+% 1, 1, 1 # length
[ 1, 0, NULL ]
#select test(true);
% .L # table_name
diff --git
a/sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.stable.out
b/sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.stable.out
--- a/sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.stable.out
+++ b/sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.stable.out
@@ -49,7 +49,7 @@ Ready.
% .L, .L, .L, .L, .L, sys.L1 # table_name
% cods, elrik, ether, jaelen, sora, L1 # name
% tinyint, tinyint, tinyint, tinyint, tinyint,
bigint # type
-% 1, 1, 1, 1, 1, 20 # length
+% 1, 1, 1, 1, 1, 1 # length
[ 0, 0, 0, 0, 0, NULL ]
#drop table t2a;
#drop table t1a;
diff --git
a/sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.stable.out.int128
b/sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.stable.out.int128
---
a/sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.stable.out.int128
+++
b/sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.stable.out.int128
@@ -49,7 +49,7 @@ Ready.
% .L, .L, .L, .L, .L, sys.L1 # table_name
% cods, elrik, ether, jaelen, sora, L1 # name
% tinyint, tinyint, tinyint, tinyint, tinyint,
hugeint # type
-% 1, 1, 1, 1, 1, 40 # length
+% 1, 1, 1, 1, 1, 1 # length
[ 0, 0, 0, 0, 0, NULL ]
#drop table t2a;
#drop table t1a;
diff --git a/tools/embedded/Tests/dbi.R b/tools/embedded/Tests/dbi.R
--- a/tools/embedded/Tests/dbi.R
+++ b/tools/embedded/Tests/dbi.R
@@ -52,7 +52,7 @@ test_that("import export", {
expect_true(res@env$success)
expect_equal(dbColumnInfo(res)[[1,1]], "Species")
expect_equal(dbColumnInfo(res)[[2,1]], "Sepal.Width")
- expect_equal(dbGetInfo(res)$row.count, 150)
+ expect_equal(dbGetRowCount(res), 150)
expect_equal(res@env$info$rows, 150)
data2 <- dbFetch(res,-1)
diff --git a/tools/embedded/build-on-windows.bat
b/tools/embedded/build-on-windows.bat
--- a/tools/embedded/build-on-windows.bat
+++ b/tools/embedded/build-on-windows.bat
@@ -1,4 +1,5 @@
+rm MonetDBLite_0.2.0.zip
"c:\Program Files (x86)\GnuWin32\bin\wget.exe"
http://dev.monetdb.org/Assets/R/MonetDBLite_0.2.0.tar.gz
-"c:\Program Files\R\R-3.2.3\bin\R" CMD INSTALL --build --force-biarch
MonetDBLite_0.2.0.tar.gz
+"c:\Program Files\R\R-3.2.3\bin\R" CMD INSTALL --build --merge-multiarch
MonetDBLite_0.2.0.tar.gz
rm MonetDBLite_0.2.0.tar.gz
pause
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
