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 'sql/backends/monet5` itself: + + +# 15:06:46 > +# 15:06:46 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=31590" "--set" "mapi_usock=/var/tmp/mtest-46511/.s.monetdb.31590" "--set" "monet_prompt=" "--forcemito" "--dbpath=/tmp/fuckit/var/MonetDB/mTests_sql_backends_monet5" "--set" "embedded_r=yes" "--set" "embedded_py=true" +# 15:06:46 > + +# 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.5.0/64bit with 64bit OIDs and 128bit integers dynamically linked +# Found 16.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://dakar.da.cwi.nl:31590/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-46511/.s.monetdb.31590 +# 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_gsl.sql +# loading sql script: 46_profiler.sql +# loading sql script: 51_sys_schema_extension.sql +# loading sql script: 72_fits.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:06:46 > +# 15:06:46 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-46511" "--port=31590" +# 15:06:46 > + +#START TRANSACTION; +#CREATE LOADER pyloader07() LANGUAGE PYTHON { +# _emit.emit({'s': 33, 't': 42}); +# +#}; +#SELECT * FROM pyloader07table; +% sys.pyloader07table, sys.pyloader07table # table_name +% s, t # name +% int, int # type +% 2, 2 # length +[ 33, 42 ] +#DROP TABLE pyloader07table; +#DROP LOADER pyloader07; +#ROLLBACK; + +# 15:06:46 > +# 15:06:46 > "Done." +# 15:06:46 > + 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
