Changeset: e2e6994c1796 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e2e6994c1796 Added Files: sql/test/BugTracker-2017/Tests/too-large-decimals.Bug-6192.stable.err.int128 Removed Files: geom/sql/conformance/Tests/T3.stable.out.int128 Modified Files: clients/Tests/MAL-signatures.stable.out geom/sql/conformance/Tests/T3.stable.out monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err.Windows monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows sql/jdbc/tests/Tests/Bug_Connect_as_voc_getMetaData_Failure_Bug_6388.stable.out sql/test/BugTracker-2009/Tests/bit_and.SF-2850341.stable.err sql/test/BugTracker-2012/Tests/large-number-operation-strange-results.Bug-2929.stable.err sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.err sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.out sql/test/BugTracker-2014/Tests/round.Bug-3542.stable.err sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.err sql/test/BugTracker-2016/Tests/storagemodel.stable.out sql/test/BugTracker-2017/Tests/too-large-decimals.Bug-6192.stable.err sql/test/BugTracker/Tests/explain.SF-1739353.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out sql/test/BugTracker/Tests/limits_of_decimal.SF-1685357.stable.err sql/test/pg_regress/Tests/float8.stable.err sql/test/pg_regress/Tests/int8.stable.err sql/test/pg_regress/Tests/int8.stable.out sql/test/pg_regress/Tests/interval.stable.err sql/test/pg_regress/Tests/interval.stable.out sql/test/pg_regress/Tests/numeric_big.stable.err sql/test/pg_regress/Tests/oid.stable.err sql/test/pg_regress/Tests/strings.stable.err Branch: jitudf Log Message:
Merge with default. diffs (truncated from 10509 to 300 lines): 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 @@ -7825,20 +7825,20 @@ Ready. [ "json", "unfold", "pattern json.unfold(val:json) (o:bat[:oid], k:bat[:str], v:bat[:json]) ", "JSONunfold;", "Expands the outermost JSON object into key-value pairs." ] [ "json", "valuearray", "command json.valuearray(val:json):json ", "JSONvalueArray;", "Expands the outermost JSON object values into a JSON value array." ] [ "json", "values", "command json.values(val:json):bat[:json] ", "JSONvalueTable;", "Expands the outermost JSON values." ] -[ "language", "assert", "unsafe command language.assert(v:bit, term:str):void ", "MALassertBit;", "" ] -[ "language", "assert", "unsafe command language.assert(v:int, term:str):void ", "MALassertInt;", "" ] -[ "language", "assert", "unsafe command language.assert(v:lng, term:str):void ", "MALassertLng;", "" ] -[ "language", "assert", "unsafe command language.assert(v:oid, term:str):void ", "MALassertOid;", "" ] -[ "language", "assert", "unsafe command language.assert(v:sht, term:str):void ", "MALassertSht;", "" ] -[ "language", "assert", "unsafe command language.assert(v:str, term:str):void ", "MALassertStr;", "" ] -[ "language", "assert", "unsafe pattern language.assert(v:any_1, pname:str, oper:str, val:any_2):void ", "MALassertTriple;", "Assertion test." ] +[ "language", "assert", "command language.assert(v:bit, term:str):void ", "MALassertBit;", "" ] +[ "language", "assert", "command language.assert(v:int, term:str):void ", "MALassertInt;", "" ] +[ "language", "assert", "command language.assert(v:lng, term:str):void ", "MALassertLng;", "" ] +[ "language", "assert", "command language.assert(v:oid, term:str):void ", "MALassertOid;", "" ] +[ "language", "assert", "command language.assert(v:sht, term:str):void ", "MALassertSht;", "" ] +[ "language", "assert", "command language.assert(v:str, term:str):void ", "MALassertStr;", "" ] +[ "language", "assert", "pattern language.assert(v:any_1, pname:str, oper:str, val:any_2):void ", "MALassertTriple;", "Assertion test." ] [ "language", "block", "pattern language.block(v:int, w:any...):int ", "deblockdataflow;", "Block on availability of all variables w, and then pass on v" ] [ "language", "call", "pattern language.call(s:bat[:str]):void ", "CMDcallBAT;", "Evaluate a program stored in a BAT." ] [ "language", "call", "pattern language.call(m:str, f:str):void ", "CMDcallFunction;", "" ] [ "language", "call", "pattern language.call(s:str):void ", "CMDcallString;", "Evaluate a MAL string program." ] [ "language", "dataflow", "pattern language.dataflow():bit ", "MALstartDataflow;", "The current guarded block is executed using dataflow control. " ] [ "language", "pass", "pattern language.pass(v:any_1):void ", "MALpass;", "Cheap instruction to disgard storage while retaining the dataflow dependency" ] -[ "language", "raise", "unsafe command language.raise(msg:str):str ", "CMDraise;", "Raise an exception labeled \n\twith a specific message." ] +[ "language", "raise", "command language.raise(msg:str):str ", "CMDraise;", "Raise an exception labeled \n\twith a specific message." ] [ "language", "register", "pattern language.register(m:str, f:str, code:str, help:str):void ", "CMDregisterFunction;", "Compile the code string to MAL and register it as a function." ] [ "language", "sink", "pattern language.sink(v:any...):void ", "MALgarbagesink;", "Variables to be considered together when triggering garbage collection.\nUsed in the dataflow blocks to avoid early release of values." ] [ "language", "source", "pattern language.source(f:str):void ", "CMDevalFile;", "Merge the instructions stored in the file with the current program." ] diff --git a/geom/sql/conformance/Tests/T3.stable.out b/geom/sql/conformance/Tests/T3.stable.out --- a/geom/sql/conformance/Tests/T3.stable.out +++ b/geom/sql/conformance/Tests/T3.stable.out @@ -29,7 +29,7 @@ Ready. #SELECT coord_dimension FROM geometry_columns WHERE f_table_name = 'streams'; % .geometry_columns # table_name % coord_dimension # name -% bigint # type +% int # type % 1 # length [ 2 ] diff --git a/geom/sql/conformance/Tests/T3.stable.out.int128 b/geom/sql/conformance/Tests/T3.stable.out.int128 deleted file mode 100644 --- a/geom/sql/conformance/Tests/T3.stable.out.int128 +++ /dev/null @@ -1,39 +0,0 @@ -stdout of test 'T3` in directory 'geom/sql/conformance` itself: - - -# 13:50:02 > -# 13:50:02 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=37941" "--set" "mapi_usock=/var/tmp/mtest-12717/.s.monetdb.37941" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/alvanaki/INSTALL/MonetDB-public/var/MonetDB/mTests_geom_sql_Tests_conformance" "--set" "mal_listing=0" -# 13:50:02 > - -# MonetDB 5 server v11.20.0 -# This is an unreleased version -# Serving database 'mTests_geom_sql_Tests_conformance', using 8 threads -# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit integers dynamically linked -# Found 15.356 GiB available main-memory. -# Copyright (c) 1993-July 2008 CWI. -# Copyright (c) August 2008-2014 MonetDB B.V., all rights reserved -# Visit http://www.monetdb.org/ for further information -# Listening for connection requests on mapi:monetdb://sibuyan.da.cwi.nl:37941/ -# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-12717/.s.monetdb.37941 -# MonetDB/GIS module loaded -# MonetDB/SQL module loaded - -Ready. -#WARNING To speedup geom.hasZ a bulk operator implementation is needed -#WARNING To speedup geom.hasM a bulk operator implementation is needed - -# 13:50:02 > -# 13:50:02 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-12717" "--port=37941" -# 13:50:02 > - -#SELECT coord_dimension FROM geometry_columns WHERE f_table_name = 'streams'; -% .geometry_columns # table_name -% coord_dimension # name -% int # type -% 1 # length -[ 2 ] - -# 13:50:02 > -# 13:50:02 > "Done." -# 13:50:02 > - diff --git a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err.Windows b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err.Windows --- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err.Windows +++ b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err.Windows @@ -33,15 +33,19 @@ stderr of test 'opt_sql_append` in direc MAPI = monetdb@LAB03:37903 QUERY = explain copy into ttt from '/tmp/xyz'; ERROR = !COPY INTO: filename must have absolute path: /tmp/xyz +CODE = 42000 MAPI = monetdb@LAB03:37903 QUERY = explain copy into ttt from '\tmp/xyz'; ERROR = !COPY INTO: filename must have absolute path: \tmp/xyz +CODE = 42000 MAPI = monetdb@LAB03:37903 QUERY = explain copy into ttt from '/tmp/xyz'; ERROR = !COPY INTO: filename must have absolute path: /tmp/xyz +CODE = 42000 MAPI = monetdb@LAB03:37903 QUERY = explain copy into ttt from '\tmp/xyz'; ERROR = !COPY INTO: filename must have absolute path: \tmp/xyz +CODE = 42000 # 22:58:58 > # 22:58:58 > "Done." diff --git a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows --- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows +++ b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows @@ -7,13 +7,13 @@ stdout of test 'opt_sql_append` in direc # MonetDB 5 server v11.8.0 # This is an unreleased version -# Serving database 'mTests_extras_mal_optimizer_template', using 8 threads -# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked -# Found 15.630 GiB available main-memory. +# Serving database 'mTests_monetdb5_extras_mal_optimizer_template', using 4 threads +# Compiled for x86_64-pc-winnt/64bit +# Found 11.991 GiB available main-memory. # Copyright (c) 1993-July 2008 CWI. -# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved -# Visit http://www.monetdb.org/ for further information -# Listening for connection requests on mapi:monetdb://rome.ins.cwi.nl:36275/ +# Copyright (c) August 2008-2017 MonetDB B.V., all rights reserved +# Visit https://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://lab03:33047/ # MonetDB/GIS module loaded # MonetDB/SQL module loaded @@ -25,130 +25,149 @@ Ready. # loading sql script: 12_url.sql # loading sql script: 13_date.sql # loading sql script: 14_inet.sql -# loading sql script: 15_history.sql +# loading sql script: 15_querylog.sql # loading sql script: 16_tracelog.sql -# loading sql script: 17_compress.sql -# loading sql script: 18_dictionary.sql -# loading sql script: 19_cluster.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: 40_geom.sql +# loading sql script: 40_json.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: 60_wlcr.sql +# loading sql script: 75_storagemodel.sql +# loading sql script: 80_statistics.sql # loading sql script: 80_udf.sql +# loading sql script: 90_generator.sql # loading sql script: 99_system.sql # 22:58:57 > # 22:58:57 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=rome" "--port=36275" # 22:58:57 > +#set optimizer = 'sequential_pipe'; -- to get predictable errors #create table ttt (a int, b int, c int); #select optimizer; -% .L2 # table_name -% L2 # name +% . # table_name +# .L2 # table_name +% L # name +# L2 # name % varchar # type % 15 # length -[ "sequential_pipe" ] +[ "sequential_pipe" ] #select def from optimizers() where name = optimizer; -% .L1 # table_name +% . # table_name +# .L1 # table_name % def # name % clob # type -% 503 # length -[ "optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.reorder();optimizer.deadcode();optimizer.matpack();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.garbageCollector();" ] +% 519 # length +[ "optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.reorder();optimizer.deadcode();optimizer.matpack();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.wlc();optimizer.garbageCollector();" ] #explain copy into ttt from 'a:\tmp/xyz'; % .explain # table_name % mal # name % clob # type -% 161 # length +% 177 # length function user.s10_1():void; - X_1:void := querylog.define("explain copy into ttt from \\'a:\\\\tmp/xyz\\';", "sequential_pipe", 21:int); - X_4 := sql.mvc(); - (X_25:bat[:int], X_26:bat[:int], X_27:bat[:int]) := sql.copy_from(nil:ptr, "|", "\\n", nil:str, "null", "a:\\tmp/xyz", -1:lng, 0:lng, 0:int, 0:int, nil:str); - X_29 := sql.append(X_4, "sys", "ttt", "a", X_25); - X_34 := sql.append(X_29, "sys", "ttt", "b", X_26); - X_37 := sql.append(X_34, "sys", "ttt", "c", X_27); - X_39 := aggr.count(X_27); - sql.affectedRows(X_37, X_39); + X_1:void := querylog.define("explain copy into ttt from \\'a:\\\\tmp/xyz\\';":str, "sequential_pipe":str, 21:int); + X_4:int := sql.mvc(); + (X_25:bat[:int], X_26:bat[:int], X_27:bat[:int]) := sql.copy_from(nil:ptr, "|":str, "\\n":str, nil:str, "null":str, "a:\\tmp/xyz":str, -1:lng, 0:lng, 0:int, 0:int, nil:str); + X_29:int := sql.append(X_4:int, "sys":str, "ttt":str, "a":str, X_25:bat[:int]); + X_34:int := sql.append(X_29:int, "sys":str, "ttt":str, "b":str, X_26:bat[:int]); + X_37:int := sql.append(X_34:int, "sys":str, "ttt":str, "c":str, X_27:bat[:int]); + X_39:lng := aggr.count(X_27:bat[:int]); + sql.affectedRows(X_37:int, X_39:lng); end user.s10_1; #inline actions= 0 time=1 usec -#remap actions= 0 time=5 usec +#remap actions= 0 time=2 usec #costmodel actions= 1 time=1 usec -#coercion actions=11 time=16 usec -#evaluate actions= 0 time=4 usec -#emptybind actions= 0 time=12 usec -#aliases actions= 0 time=6 usec -#mergetable actions= 0 time=46 usec -#deadcode actions= 0 time=7 usec -#aliases actions= 0 time=6 usec -#constants actions= 0 time=9 usec -#commonTerms actions= 0 time=5 usec -#projectionpath actions= 0 time=5 usec -#deadcode actions= 0 time=6 usec -#reorder actions= 1 time=38 usec -#reduce actions=33 time=37 usec -#matpack actions= 0 time=4 usec -#multiplex actions= 0 time=5 usec -#profiler actions= 1 time=0 usec -#candidates actions= 1 time=1 usec -#garbagecollector actions= 1 time=19 usec -#total actions= 1 time=475 usec +#coercion actions=11 time=7 usec +#evaluate actions= 0 time=5 usec +#emptybind actions= 0 time=0 usec +#pushselect actions= 0 time=3 usec +#aliases actions= 0 time=1 usec +#mergetable actions= 0 time=14 usec +#deadcode actions= 0 time=5 usec +#aliases actions= 0 time=0 usec +#constants actions= 0 time=4 usec +#commonTerms actions= 0 time=2 usec +#projectionpath actions= 0 time=3 usec +#reorder actions= 1 time=11 usec +#deadcode actions= 0 time=3 usec +#matpack actions= 0 time=0 usec +#multiplex actions= 0 time=2 usec +#profiler actions=1 time=0 usec +#candidates actions=1 time=1 usec +#wlc actions= 0 time=1 usec +#garbagecollector actions= 1 time=58 usec +#total actions=24 time=200 usec #declare opt_pipe_name string; #set opt_pipe_name = ( select optimizer ); #declare opt_pipe_def string; #set opt_pipe_def = ( select def from optimizers() where name = opt_pipe_name ); #set optimizer = substring(opt_pipe_def,0,length(opt_pipe_def)-length('optimizer.garbageCollector();')) || 'optimizer.sql_append();optimizer.garbageCollector();'; #select optimizer; -% .L2 # table_name -% L2 # name +% . # table_name +# .L2 # table_name +% L # name +# L2 # name % varchar # type % 6 # length -[ "user_1" ] +[ "user_1" ] #select def from optimizers() where name = optimizer; -% .L1 # table_name +% . # table_name +# .L1 # table_name % def # name % clob # type -% 526 # length -[ "optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.reorder();optimizer.deadcode();optimizer.matpack();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.sql_append();optimizer.garbageCollector();" ] +% 542 # length +[ "optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.reorder();optimizer.deadcode();optimizer.matpack();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.wlc();optimizer.sql_append();optimizer.garbageCollector();" ] #explain copy into ttt from 'Z:/tmp/xyz'; % .explain # table_name % mal # name % clob # type -% 160 # length +% 176 # length function user.s26_1():void; - X_1:void := querylog.define("explain copy into ttt from \\'Z:/tmp/xyz\\';", "user_1", 21:int); - X_4 := sql.mvc(); - (X_25:bat[:int], X_26:bat[:int], X_27:bat[:int]) := sql.copy_from(nil:ptr, "|", "\\n", nil:str, "null", "Z:/tmp/xyz", -1:lng, 0:lng, 0:int, 0:int, nil:str); - X_29 := sql.append(X_4, "sys", "ttt", "a", X_25); - X_34 := sql.append(X_29, "sys", "ttt", "b", X_26); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
