date:20170303

MonetDB: Dec2016 - finally fixing R test cases

2017-03-03 Thread Hannes Muehleisen

Changeset: 65191bb72656 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=65191bb72656
Modified Files:
clients/R/Tests/copy_into_fwf.stable.out
clients/R/Tests/dbapply.stable.out
clients/R/Tests/dbi.R
clients/R/Tests/dbi.stable.err
clients/R/Tests/dbi.stable.out
clients/R/Tests/dplyr-flights.R
clients/R/Tests/dplyr-flights.stable.out
clients/R/Tests/dplyr.R
clients/R/Tests/dplyr.stable.err
clients/R/Tests/dplyr.stable.out
Branch: Dec2016
Log Message:

finally fixing R test cases


diffs (truncated from 361 to 300 lines):

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
@@ -24,11 +24,8 @@ Ready.
 # 16:40:23 >  "R" "--vanilla" "--slave" "--args" "30658"
 # 16:40:23 >  
 
-[1] TRUE
 
   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 dratwt  qsec vs am gear carb
 1  21.0   6 160.0 110 3.90 2.620 16.46  0  144
 2  21.0   6 160.0 110 3.90 2.875 17.02  0  144
@@ -62,7 +59,6 @@ 29 15.8   8 351.0 264 4.22 3.170 14.50  
 30 19.7   6 145.0 175 3.62 2.770 15.50  0  156
 31 15.0   8 301.0 335 3.54 3.570 14.60  0  158
 32 21.4   4 121.0 109 4.11 2.780 18.60  1  142
-[1] TRUE
 [1] "SUCCESS"
 
 # 16:40:23 >  
diff --git a/clients/R/Tests/dbapply.stable.out 
b/clients/R/Tests/dbapply.stable.out
--- a/clients/R/Tests/dbapply.stable.out
+++ b/clients/R/Tests/dbapply.stable.out
@@ -29,14 +29,10 @@ Ready.
 # 11:43:14 >  "R" "--vanilla" "--slave" "--args" "35780"
 # 11:43:14 >  
 
-[1] TRUE
-[1] TRUE
-[1] TRUE
 [1] 32
 [1] TRUE
 [1] 32
 [1] 42
-[1] TRUE
 [1] "SUCCESS"
 
 # 11:43:21 >  
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
@@ -43,6 +43,7 @@ dbRemoveTable(con,tname)
 stopifnot(identical(dbExistsTable(con,tname),FALSE))
 
 # write test table iris
+# iris is one of the built-in datasets in R
 data(iris)
 dbWriteTable(con,tname,iris)
 
@@ -65,16 +66,22 @@ stopifnot(identical(res@env$success,TRUE
 stopifnot(dbColumnInfo(res)[[1,1]] == "Species")
 stopifnot(dbColumnInfo(res)[[2,1]] == "Sepal.Width")
 
-stopifnot(dbGetRowCount(res) == 150 && res@env$info$rows == 150)
+stopifnot(dbGetRowCount(res) == 0)
 
 data <- dbFetch(res,10)
 
+stopifnot(dbGetRowCount(res) == 10)
+
+
 stopifnot(dim(data)[[1]] == 10)
 stopifnot(dim(data)[[2]] == 2)
 stopifnot(res@env$delivered == 10)
 stopifnot(dbHasCompleted(res) == FALSE)
 
 data2 <- dbFetch(res,-1)
+
+stopifnot(dbGetRowCount(res) == 150)
+
 stopifnot(dim(data2)[[1]] == 140)
 stopifnot(dbHasCompleted(res) == TRUE)
 
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/dbi.stable.out b/clients/R/Tests/dbi.stable.out
--- a/clients/R/Tests/dbi.stable.out
+++ b/clients/R/Tests/dbi.stable.out
@@ -44,42 +44,12 @@ Ready.
 # loading sql script: 90_generator.sql
 # loading sql script: 99_system.sql
 
-# 12:26:31 >  
-# 12:26:31 >  "R" "--vanilla" "--slave" "--args" "31372"
-# 12:26:31 >  
+# 15:00:13 >  
+# 15:00:13 >  "R" "--vanilla" "--slave" "--args" "34632"
+# 15:00:13 >  
 
-[1] TRUE
-[1] TRUE
-[1] TRUE
-[1] TRUE
-[1] TRUE
 [1] "\"Need to quote this table name\"" "monetdbtest"  
 [3] "othermethod"  
-[1] TRUE
-[1] TRUE
-[1] TRUE
-[1] TRUE
-[1] TRUE
-[1] TRUE
-[1] TRUE
-[1] TRUE
-[1] TRUE
-[1] TRUE
-[1] TRUE
-[1] TRUE
-[1] TRUE
-[1] TRUE
-[1] TRUE
-[1] TRUE
-[1] TRUE
-[1] TRUE
-[1] TRUE
-[1] TRUE
-[1] TRUE
-[1] TRUE
-[1] TRUE
-[1] TRUE
-[1] TRUE
 [1] "SUCCESS"
 
 # 12:26:33 >  
diff

MonetDB: Dec2016 - Replaced scripts by "links" to identical scri...

2017-03-03 Thread Sjoerd Mullender

Changeset: d23c14997795 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d23c14997795
Added Files:
sql/test/testdb-upgrade-chain-hge/Tests/dump.SQL.py.src
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.SQL.py.src
sql/test/testdb-upgrade-chain/Tests/dump.SQL.py.src
sql/test/testdb-upgrade-chain/Tests/upgrade.SQL.py.src
sql/test/testdb-upgrade-hge/Tests/dump.SQL.py.src
sql/test/testdb-upgrade-hge/Tests/upgrade.SQL.py.src
sql/test/testdb-upgrade/Tests/dump.SQL.py.src
Removed Files:
sql/test/testdb-upgrade-chain-hge/Tests/dump.SQL.py
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.SQL.py
sql/test/testdb-upgrade-chain/Tests/dump.SQL.py
sql/test/testdb-upgrade-chain/Tests/upgrade.SQL.py
sql/test/testdb-upgrade-hge/Tests/dump.SQL.py
sql/test/testdb-upgrade-hge/Tests/upgrade.SQL.py
sql/test/testdb-upgrade/Tests/dump.SQL.py
Branch: Dec2016
Log Message:

Replaced scripts by "links" to identical scripts.


diffs (150 lines):

diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/dump.SQL.py 
b/sql/test/testdb-upgrade-chain-hge/Tests/dump.SQL.py
deleted file mode 100644
--- a/sql/test/testdb-upgrade-chain-hge/Tests/dump.SQL.py
+++ /dev/null
@@ -1,9 +0,0 @@
-import sys
-import re
-try:
-from MonetDBtesting import process
-except ImportError:
-import process
-
-p = process.client('sqldump')
-p.communicate()
diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/dump.SQL.py.src 
b/sql/test/testdb-upgrade-chain-hge/Tests/dump.SQL.py.src
new file mode 100644
--- /dev/null
+++ b/sql/test/testdb-upgrade-chain-hge/Tests/dump.SQL.py.src
@@ -0,0 +1,1 @@
+$RELSRCDIR/../../testdb/Tests/testdb-dump.SQL.py
diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.SQL.py 
b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.SQL.py
deleted file mode 100644
--- a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.SQL.py
+++ /dev/null
@@ -1,12 +0,0 @@
-import os, sys
-try:
-from MonetDBtesting import process
-except ImportError:
-import process
-
-clt = process.client('sql', user = 'testuser', passwd = 'testpassword',
- stdin = process.PIPE,
- stdout = process.PIPE, stderr = process.PIPE)
-out, err = clt.communicate('select count(*) from testschema.smallstring;\n')
-sys.stdout.write(out)
-sys.stderr.write(err)
diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.SQL.py.src 
b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.SQL.py.src
new file mode 100644
--- /dev/null
+++ b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.SQL.py.src
@@ -0,0 +1,1 @@
+$RELSRCDIR/../../testdb-upgrade/Tests/upgrade.SQL.py
diff --git a/sql/test/testdb-upgrade-chain/Tests/dump.SQL.py 
b/sql/test/testdb-upgrade-chain/Tests/dump.SQL.py
deleted file mode 100644
--- a/sql/test/testdb-upgrade-chain/Tests/dump.SQL.py
+++ /dev/null
@@ -1,10 +0,0 @@
-import sys
-import re
-try:
-from MonetDBtesting import process
-except ImportError:
-import process
-
-p = process.client('sqldump')
-p.communicate()
-
diff --git a/sql/test/testdb-upgrade-chain/Tests/dump.SQL.py.src 
b/sql/test/testdb-upgrade-chain/Tests/dump.SQL.py.src
new file mode 100644
--- /dev/null
+++ b/sql/test/testdb-upgrade-chain/Tests/dump.SQL.py.src
@@ -0,0 +1,1 @@
+$RELSRCDIR/../../testdb/Tests/testdb-dump.SQL.py
diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.SQL.py 
b/sql/test/testdb-upgrade-chain/Tests/upgrade.SQL.py
deleted file mode 100644
--- a/sql/test/testdb-upgrade-chain/Tests/upgrade.SQL.py
+++ /dev/null
@@ -1,12 +0,0 @@
-import os, sys
-try:
-from MonetDBtesting import process
-except ImportError:
-import process
-
-clt = process.client('sql', user = 'testuser', passwd = 'testpassword',
- stdin = process.PIPE,
- stdout = process.PIPE, stderr = process.PIPE)
-out, err = clt.communicate('select count(*) from testschema.smallstring;\n')
-sys.stdout.write(out)
-sys.stderr.write(err)
diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.SQL.py.src 
b/sql/test/testdb-upgrade-chain/Tests/upgrade.SQL.py.src
new file mode 100644
--- /dev/null
+++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.SQL.py.src
@@ -0,0 +1,1 @@
+$RELSRCDIR/../../testdb-upgrade/Tests/upgrade.SQL.py
diff --git a/sql/test/testdb-upgrade-hge/Tests/dump.SQL.py 
b/sql/test/testdb-upgrade-hge/Tests/dump.SQL.py
deleted file mode 100644
--- a/sql/test/testdb-upgrade-hge/Tests/dump.SQL.py
+++ /dev/null
@@ -1,9 +0,0 @@
-import sys
-import re
-try:
-from MonetDBtesting import process
-except ImportError:
-import process
-
-p = process.client('sqldump')
-p.communicate()
diff --git a/sql/test/testdb-upgrade-hge/Tests/dump.SQL.py.src 
b/sql/test/testdb-upgrade-hge/Tests/dump.SQL.py.src
new file mode 100644
--- /dev/null
+++ b/sql/test/testdb-upgrade-hge/Tests/dump.SQL.py.src
@@ -0,0 +1,1 @@
+$RELSRCDIR/../../testdb/Tests/testdb-dump.SQL.py
diff --git

MonetDB: default - Merge with Dec2016 branch.

2017-03-03 Thread Sjoerd Mullender

Changeset: 0a81b81505c9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0a81b81505c9
Added Files:
sql/backends/monet5/Tests/pyloader06.stable.out.Windows
sql/backends/monet5/Tests/pyloader07.stable.out.Windows
Modified Files:
sql/server/rel_select.c
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain-hge/Tests/dump.SQL.py
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/dump.SQL.py
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-hge/Tests/dump.SQL.py
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/dump.SQL.py
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb/Tests/testdb-dump.SQL.py
Branch: default
Log Message:

Merge with Dec2016 branch.


diffs (276 lines):

diff --git a/sql/backends/monet5/Tests/pyloader06.stable.out.Windows 
b/sql/backends/monet5/Tests/pyloader06.stable.out.Windows
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/Tests/pyloader06.stable.out.Windows
@@ -0,0 +1,89 @@
+stdout of test 'pyloader06` in directory 'sql/backends/monet5` itself:
+
+
+# 15:10:43 >  
+# 15:10:43 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=39055" "--set" 
"mapi_usock=/var/tmp/mtest-23860/.s.monetdb.39055" "--set" "monet_prompt=" 
"--forcemito" "--dbpath=/Users/myth/opt/var/MonetDB/mTests_sql_backends_monet5" 
"--set" "embedded_r=yes" "--set" "embedded_py=true"
+# 15:10:43 >  
+
+# MonetDB 5 server v11.24.0
+# This is an unreleased version
+# Serving database 'mTests_sql_backends_monet5', using 4 threads
+# Compiled for x86_64-apple-darwin15.6.0/64bit with 128bit integers
+# Found 8.000 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2016 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on 
mapi:monetdb://dhcp-154.eduroam.cwi.nl:39055/
+# Listening for UNIX domain connection requests on 
mapi:monetdb:///var/tmp/mtest-23860/.s.monetdb.39055
+# MonetDB/SQL module loaded
+# MonetDB/Python module loaded
+# MonetDB/R   module loaded
+
+Ready.
+# SQL catalog created, loading sql scripts once
+# loading sql script: 09_like.sql
+# loading sql script: 10_math.sql
+# loading sql script: 11_times.sql
+# loading sql script: 12_url.sql
+# loading sql script: 13_date.sql
+# loading sql script: 14_inet.sql
+# loading sql script: 15_querylog.sql
+# loading sql script: 16_tracelog.sql
+# loading sql script: 17_temporal.sql
+# loading sql script: 18_index.sql
+# loading sql script: 20_vacuum.sql
+# loading sql script: 21_dependency_functions.sql
+# loading sql script: 22_clients.sql
+# loading sql script: 23_skyserver.sql
+# loading sql script: 24_zorder.sql
+# loading sql script: 25_debug.sql
+# loading sql script: 26_sysmon.sql
+# loading sql script: 27_rejects.sql
+# loading sql script: 39_analytics.sql
+# loading sql script: 39_analytics_hge.sql
+# loading sql script: 40_json.sql
+# loading sql script: 40_json_hge.sql
+# loading sql script: 41_md5sum.sql
+# loading sql script: 45_uuid.sql
+# loading sql script: 46_profiler.sql
+# loading sql script: 51_sys_schema_extension.sql
+# loading sql script: 72_fits.sql
+# loading sql script: 74_netcdf.sql
+# loading sql script: 75_storagemodel.sql
+# loading sql script: 80_statistics.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 80_udf_hge.sql
+# loading sql script: 90_generator.sql
+# loading sql script: 90_generator_hge.sql
+# loading sql script: 99_system.sql
+
+# 15:10:44 >  
+# 15:10:44 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-23860" "--port=39055"
+# 15:10:44 >  
+
+#START TRANSACTION;
+#CREATE LOADER pyloader06() LANGUAGE PYTHON {
+#  return
+#};
+#ROLLBACK;
+#START TRANSACTION;
+#CREATE LOADER pyloader06() LANGUAGE PYTHON {
+#  return {'a': 1, 'b': 2, 'c': 3}
+#};
+#SELECT * FROM pyloader06table;
+% sys.pyloader06table, sys.pyloader06table,sys.pyloader06table # table_name
+% a,   c,  b # name
+% int, int,int # type
+% 1,   1,  1 # length
+[ 1,   3,  2   ]
+#ROLLBACK;
+#START TRANSACTION;
+#CREATE LOADER pyloader06() LANGUAGE PYTHON {
+#  return 3
+#};
+#ROLLBACK;
+
+# 15:10:44 >  
+# 15:10:44 >  "Done."
+# 15:10:44 >  
+
diff --git a/sql/backends/monet5/Tests/pyloader07.stable.out.Windows 
b/sql/backends/monet5/Tests/pyloader07.stable.out.Windows
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/Tests/pyloader07.stable.out.Windows
@@ -0,0 +1,82 @@
+stdout of test 'pyloader07` in directory

MonetDB: Dec2016 - Don't make Python do output processing.

2017-03-03 Thread Sjoerd Mullender

Changeset: ae2bce394648 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ae2bce394648
Modified Files:
sql/test/testdb-upgrade-chain-hge/Tests/dump.SQL.py
sql/test/testdb-upgrade-chain/Tests/dump.SQL.py
sql/test/testdb-upgrade-hge/Tests/dump.SQL.py
sql/test/testdb-upgrade/Tests/dump.SQL.py
sql/test/testdb/Tests/testdb-dump.SQL.py
Branch: Dec2016
Log Message:

Don't make Python do output processing.
This saves about 100 seconds for each of the tests on my machine.


diffs (95 lines):

diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/dump.SQL.py 
b/sql/test/testdb-upgrade-chain-hge/Tests/dump.SQL.py
--- a/sql/test/testdb-upgrade-chain-hge/Tests/dump.SQL.py
+++ b/sql/test/testdb-upgrade-chain-hge/Tests/dump.SQL.py
@@ -5,13 +5,5 @@ try:
 except ImportError:
 import process
 
-p = process.client('sqldump', stdout = process.PIPE, stderr = process.PIPE)
-out, err = p.communicate()
-
-pos = 0
-for res in re.finditer(r'\b\d+\.\d{8,}\b', out):
-sys.stdout.write(out[pos:res.start(0)])
-sys.stdout.write('%.8g' % float(res.group(0)))
-pos = res.end(0)
-sys.stdout.write(out[pos:])
-sys.stderr.write(err)
+p = process.client('sqldump')
+p.communicate()
diff --git a/sql/test/testdb-upgrade-chain/Tests/dump.SQL.py 
b/sql/test/testdb-upgrade-chain/Tests/dump.SQL.py
--- a/sql/test/testdb-upgrade-chain/Tests/dump.SQL.py
+++ b/sql/test/testdb-upgrade-chain/Tests/dump.SQL.py
@@ -5,13 +5,6 @@ try:
 except ImportError:
 import process
 
-p = process.client('sqldump', stdout = process.PIPE, stderr = process.PIPE)
-out, err = p.communicate()
+p = process.client('sqldump')
+p.communicate()
 
-pos = 0
-for res in re.finditer(r'\b\d+\.\d{8,}\b', out):
-sys.stdout.write(out[pos:res.start(0)])
-sys.stdout.write('%.8g' % float(res.group(0)))
-pos = res.end(0)
-sys.stdout.write(out[pos:])
-sys.stderr.write(err)
diff --git a/sql/test/testdb-upgrade-hge/Tests/dump.SQL.py 
b/sql/test/testdb-upgrade-hge/Tests/dump.SQL.py
--- a/sql/test/testdb-upgrade-hge/Tests/dump.SQL.py
+++ b/sql/test/testdb-upgrade-hge/Tests/dump.SQL.py
@@ -5,13 +5,5 @@ try:
 except ImportError:
 import process
 
-p = process.client('sqldump', stdout = process.PIPE, stderr = process.PIPE)
-out, err = p.communicate()
-
-pos = 0
-for res in re.finditer(r'\b\d+\.\d{8,}\b', out):
-sys.stdout.write(out[pos:res.start(0)])
-sys.stdout.write('%.8g' % float(res.group(0)))
-pos = res.end(0)
-sys.stdout.write(out[pos:])
-sys.stderr.write(err)
+p = process.client('sqldump')
+p.communicate()
diff --git a/sql/test/testdb-upgrade/Tests/dump.SQL.py 
b/sql/test/testdb-upgrade/Tests/dump.SQL.py
--- a/sql/test/testdb-upgrade/Tests/dump.SQL.py
+++ b/sql/test/testdb-upgrade/Tests/dump.SQL.py
@@ -5,13 +5,5 @@ try:
 except ImportError:
 import process
 
-p = process.client('sqldump', stdout = process.PIPE, stderr = process.PIPE)
-out, err = p.communicate()
-
-pos = 0
-for res in re.finditer(r'\b\d+\.\d{8,}\b', out):
-sys.stdout.write(out[pos:res.start(0)])
-sys.stdout.write('%.8g' % float(res.group(0)))
-pos = res.end(0)
-sys.stdout.write(out[pos:])
-sys.stderr.write(err)
+p = process.client('sqldump')
+p.communicate()
diff --git a/sql/test/testdb/Tests/testdb-dump.SQL.py 
b/sql/test/testdb/Tests/testdb-dump.SQL.py
--- a/sql/test/testdb/Tests/testdb-dump.SQL.py
+++ b/sql/test/testdb/Tests/testdb-dump.SQL.py
@@ -6,13 +6,5 @@ except ImportError:
 import process
 
 sys.stdout.flush()  # just to be sure
-p = process.client('sqldump', stdout = process.PIPE, stderr = process.PIPE)
-out, err = p.communicate()
-
-pos = 0
-for res in re.finditer(r'\b\d+\.\d{8,}\b', out):
-sys.stdout.write(out[pos:res.start(0)])
-sys.stdout.write('%.8g' % float(res.group(0)))
-pos = res.end(0)
-sys.stdout.write(out[pos:])
-sys.stderr.write(err)
+p = process.client('sqldump')
+p.communicate()
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Merge with Dec2016 branch.

2017-03-03 Thread Sjoerd Mullender

Changeset: 163ba1769943 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=163ba1769943
Modified Files:
sql/server/rel_select.c
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out
Branch: default
Log Message:

Merge with Dec2016 branch.


diffs (132 lines):

diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -4885,7 +4885,7 @@ rel_query(mvc *sql, sql_rel *rel, symbol
/* reset error */
sql->session->status = 0;
sql->errstr[0] = 0;
-   if (used)
+   if (used && rel)
rel = rel_dup(rel);
if (!used && (!sn->lateral && !lateral) && rel) 
{
sql_rel *o = rel;
diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -24,11 +24,6 @@ stdout of test 'upgrade` in directory 's
 # MonetDB/R   module loaded
 
 Ready.
-Running database upgrade commands:
-set schema "sys";
-update sys.types set digits = 38 where sqlname = 'decimal' and digits = 39;
-update sys.args set type_digits = 38 where type = 'decimal' and type_digits = 
39;
-set schema "sys";
 
 # 15:26:18 >  
 # 15:26:18 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-21187" "--port=38946"
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out 
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
@@ -24,11 +24,6 @@ stdout of test 'upgrade` in directory 's
 # MonetDB/R   module loaded
 
 Ready.
-Running database upgrade commands:
-set schema "sys";
-update sys.types set digits = 18 where sqlname = 'decimal' and digits = 19;
-update sys.args set type_digits = 18 where type = 'decimal' and type_digits = 
19;
-set schema "sys";
 
 # 15:41:19 >  
 # 15:41:19 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-7576" "--port=32696"
diff --git a/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 
b/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
@@ -24,11 +24,6 @@ stdout of test 'upgrade` in directory 's
 # MonetDB/R   module loaded
 
 Ready.
-Running database upgrade commands:
-set schema "sys";
-update sys.types set digits = 38 where sqlname = 'decimal' and digits = 39;
-update sys.args set type_digits = 38 where type = 'decimal' and type_digits = 
39;
-set schema "sys";
 
 # 15:26:18 >  
 # 15:26:18 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-21187" "--port=38946"
diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out 
b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
--- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
@@ -24,11 +24,6 @@ stdout of test 'upgrade` in directory 's
 # MonetDB/R   module loaded
 
 Ready.
-Running database upgrade commands:
-set schema "sys";
-update sys.types set digits = 18 where sqlname = 'decimal' and digits = 19;
-update sys.args set type_digits = 18 where type = 'decimal' and type_digits = 
19;
-set schema "sys";
 
 # 15:41:18 >  
 # 15:41:18 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-7576" "--port=32696"
diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 
b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -22,11 +22,6 @@ stdout of test 'upgrade` in directory 's
 # MonetDB/R   module loaded
 
 Ready.
-Running database upgrade commands:
-set schema "sys";
-update sys.types set digits = 38 where sqlname = 'decimal' and digits = 39;
-update sys.args set type_digits = 38 where type = 'decimal' and type_digits = 
39;
-set schema "testschema";
 
 # 15:26:22 >  
 # 15:26:22 >  "/usr/bin/python2" "upgrade.SQL.py" "upgrade"

MonetDB: Dec2016 - Approve upgrade output after release of Dec20...

2017-03-03 Thread Sjoerd Mullender

Changeset: bbf8b875fae7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bbf8b875fae7
Modified Files:
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out
Branch: Dec2016
Log Message:

Approve upgrade output after release of Dec2016-SP2.


diffs (120 lines):

diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -24,11 +24,6 @@ stdout of test 'upgrade` in directory 's
 # MonetDB/R   module loaded
 
 Ready.
-Running database upgrade commands:
-set schema "sys";
-update sys.types set digits = 38 where sqlname = 'decimal' and digits = 39;
-update sys.args set type_digits = 38 where type = 'decimal' and type_digits = 
39;
-set schema "sys";
 
 # 15:26:18 >  
 # 15:26:18 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-21187" "--port=38946"
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out 
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
@@ -24,11 +24,6 @@ stdout of test 'upgrade` in directory 's
 # MonetDB/R   module loaded
 
 Ready.
-Running database upgrade commands:
-set schema "sys";
-update sys.types set digits = 18 where sqlname = 'decimal' and digits = 19;
-update sys.args set type_digits = 18 where type = 'decimal' and type_digits = 
19;
-set schema "sys";
 
 # 15:41:19 >  
 # 15:41:19 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-7576" "--port=32696"
diff --git a/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 
b/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
@@ -24,11 +24,6 @@ stdout of test 'upgrade` in directory 's
 # MonetDB/R   module loaded
 
 Ready.
-Running database upgrade commands:
-set schema "sys";
-update sys.types set digits = 38 where sqlname = 'decimal' and digits = 39;
-update sys.args set type_digits = 38 where type = 'decimal' and type_digits = 
39;
-set schema "sys";
 
 # 15:26:18 >  
 # 15:26:18 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-21187" "--port=38946"
diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out 
b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
--- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
@@ -24,11 +24,6 @@ stdout of test 'upgrade` in directory 's
 # MonetDB/R   module loaded
 
 Ready.
-Running database upgrade commands:
-set schema "sys";
-update sys.types set digits = 18 where sqlname = 'decimal' and digits = 19;
-update sys.args set type_digits = 18 where type = 'decimal' and type_digits = 
19;
-set schema "sys";
 
 # 15:41:18 >  
 # 15:41:18 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-7576" "--port=32696"
diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 
b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -22,11 +22,6 @@ stdout of test 'upgrade` in directory 's
 # MonetDB/R   module loaded
 
 Ready.
-Running database upgrade commands:
-set schema "sys";
-update sys.types set digits = 38 where sqlname = 'decimal' and digits = 39;
-update sys.args set type_digits = 38 where type = 'decimal' and type_digits = 
39;
-set schema "testschema";
 
 # 15:26:22 >  
 # 15:26:22 >  "/usr/bin/python2" "upgrade.SQL.py" "upgrade"
diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out 
b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
@@ -19,11 +19,6 @@ stdout of test 'upgrade` in directory 's
 # MonetDB/SQL module loaded
 
 Ready.
-Running database upgrade commands:
-set schema "sys";
-update sys.types set digits = 18 where sqlname = 'decimal' and digits = 19;
-update sys.args set type_digits = 18 where type = 'decimal' and type_digits = 
19;
-set schema "testschema";
 
 # 16:00:57 >  
 # 16:00:57 >  "/usr/bin/python2"

MonetDB: Dec2016 - finally fixing R test cases

MonetDB: Dec2016 - Replaced scripts by "links" to identical scri...

MonetDB: default - Merge with Dec2016 branch.

MonetDB: Dec2016 - Don't make Python do output processing.

MonetDB: default - Merge with Dec2016 branch.

MonetDB: Dec2016 - Approve upgrade output after release of Dec20...

6 matches

Site Navigation

Mail list logo

Footer information