Changeset: cdd28583a243 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cdd28583a243 Modified Files: sql/benchmarks/nobench/Tests/nobench.stable.err sql/benchmarks/nobench/Tests/nobench.stable.out sql/test/BugTracker-2012/Tests/case_evaluated_too_early.Bug-3186.stable.out sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err sql/test/BugTracker-2015/Tests/readonly.Bug-3709.stable.out sql/test/BugTracker-2017/Tests/caching_stats_bug.6374.stable.out sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out sql/test/SQLancer/Tests/sqlancer01.stable.err sql/test/SQLancer/Tests/sqlancer01.stable.out sql/test/analytics/Tests/analytics14.stable.err sql/test/analytics/Tests/analytics14.stable.out sql/test/mergetables/Tests/part-elim.stable.out sql/test/miscellaneous/Tests/groupby_error.stable.out sql/test/remote/Tests/partition_elim.stable.out sql/test/subquery/Tests/correlated.stable.err sql/test/subquery/Tests/correlated.stable.out sql/test/sysmon/Tests/sys_queue_expand.stable.out Branch: unlock Log Message:
approved output diffs (truncated from 2451 to 300 lines): diff --git a/sql/benchmarks/nobench/Tests/nobench.stable.err b/sql/benchmarks/nobench/Tests/nobench.stable.err --- a/sql/benchmarks/nobench/Tests/nobench.stable.err +++ b/sql/benchmarks/nobench/Tests/nobench.stable.err @@ -30,7 +30,7 @@ stderr of test 'nobench` in directory 's MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395 QUERY = select cast(json.text(json.filter(js,'dyn1')) as integer) from bench10; -ERROR = !conversion of string 'GBRDA===' to type int failed. +ERROR = !conversion of string to type int failed. CODE = 22018 diff --git a/sql/benchmarks/nobench/Tests/nobench.stable.out b/sql/benchmarks/nobench/Tests/nobench.stable.out --- a/sql/benchmarks/nobench/Tests/nobench.stable.out +++ b/sql/benchmarks/nobench/Tests/nobench.stable.out @@ -62,7 +62,7 @@ stdout of test 'nobench` in directory 's % 2 # length [ 10 ] #select json.filter(js, '$..str1,$..num') from bench10; -% sys. # table_name +% sys.%1 # table_name % %1 # name % json # type % 24 # length @@ -77,7 +77,7 @@ stdout of test 'nobench` in directory 's [ "[\"GBRDA===\",5,0]" ] [ "[\"GBRDCMJQ\",1,6]" ] #select json.filter(js,'.nested_obj.str,.nested_obj.num') from bench10; -% sys. # table_name +% sys.%1 # table_name % %1 # name % json # type % 22 # length @@ -92,7 +92,7 @@ stdout of test 'nobench` in directory 's [ "[\"GBRDCMBR\",5]" ] [ "[\"GBRDC===\",1]" ] #select json.filter(js,'..sparse_000,..sparse_001') from bench10; -% sys. # table_name +% sys.%1 # table_name % %1 # name % json # type % 23 # length @@ -107,7 +107,7 @@ stdout of test 'nobench` in directory 's [ "[\"GBRDA===\",\"GBRDA===\"]" ] [ "[]" ] #select json.filter(js,'..sparse_000,..sparse_110') from bench10; -% sys. # table_name +% sys.%1 # table_name % %1 # name % json # type % 12 # length @@ -122,7 +122,7 @@ stdout of test 'nobench` in directory 's [ "[\"GBRDA===\"]" ] [ "[]" ] #select json.filter(js,'str1') from bench10; -% sys. # table_name +% sys.%1 # table_name % %1 # name % json # type % 20 # length @@ -137,7 +137,7 @@ stdout of test 'nobench` in directory 's [ "[\"GBRDA===\"]" ] [ "[\"GBRDCMJQ\"]" ] #select json.text(json.filter(js,'str1')) from bench10; -% sys. # table_name +% sys.%1 # table_name % %1 # name % clob # type % 16 # length @@ -158,7 +158,7 @@ stdout of test 'nobench` in directory 's % 462 # length [ "{\"nested_obj\": {\"num\": 0, \"str\": \"GBRDA===\"}, \"dyn2\": 5, \"dyn1\": 5, \"nested_arr\": [\"the\", \"state\", \"aware\", \"''\", \"the\"], \"str2\": \"GBRDA===\", \"str1\": \"GBRDCMBR\", \"sparse_058\": \"GBRDCMBR\", \"thousandth\": 5, \"num\": 5, \"bool\": true, \"sparse_059\": \"GBRDCMBR\", \"sparse_054\": \"GBRDCMBR\", \"sparse_055\": \"GBRDCMBR\", \"sparse_056\": \"GBRDCMBR\", \"sparse_057\": \"GBRDCMBR\", \"sparse_050\": \"GBRDCMBR\", \"sparse_051\": \"GBRDCMBR\", \"sparse_052\": \"GBRDCMBR\", \"sparse_053\": \"GBRDCMBR\"}" ] #select json.number(json.filter(js,'num')) from bench10; -% sys. # table_name +% sys.%1 # table_name % %1 # name % double # type % 24 # length @@ -173,7 +173,7 @@ stdout of test 'nobench` in directory 's [ 0 ] [ 6 ] #select json."integer"(json.filter(js,'num')) from bench10; -% sys. # table_name +% sys.%1 # table_name % %1 # name % bigint # type % 1 # length @@ -188,7 +188,7 @@ stdout of test 'nobench` in directory 's [ 0 ] [ 6 ] #select cast(json.text(json.filter(js,'num')) as integer) from bench10; -% sys. # table_name +% sys.%1 # table_name % %1 # name % int # type % 1 # length @@ -212,7 +212,7 @@ stdout of test 'nobench` in directory 's [ "{\"nested_obj\": {\"num\": 7, \"str\": \"GBRDCMJR\"}, \"dyn2\": 2, \"dyn1\": 2, \"nested_arr\": [\"she\", \"beyond\"], \"str2\": \"GBRDCMJR\", \"str1\": \"GBRDCMA=\", \"thousandth\": 2, \"sparse_025\": \"GBRDCMA=\", \"sparse_024\": \"GBRDCMA=\", \"sparse_027\": \"GBRDCMA=\", \"num\": 2, \"bool\": false, \"sparse_020\": \"GBRDCMA=\", \"sparse_023\": \"GBRDCMA=\", \"sparse_022\": \"GBRDCMA=\", \"sparse_021\": \"GBRDCMA=\", \"sparse_029\": \"GBRDCMA=\", \"sparse_028\": \"GBRDCMA=\", \"sparse_026\": \"GBRDCMA=\"}" ] [ "{\"nested_obj\": {\"num\": 5, \"str\": \"GBRDCMBR\"}, \"sparse_008\": \"GBRDA===\", \"sparse_009\": \"GBRDA===\", \"dyn2\": false, \"dyn1\": \"GBRDA===\", \"nested_arr\": [], \"sparse_007\": \"GBRDA===\", \"str2\": \"GBRDCMBR\", \"str1\": \"GBRDA===\", \"sparse_004\": \"GBRDA===\", \"sparse_003\": \"GBRDA===\", \"sparse_002\": \"GBRDA===\", \"sparse_001\": \"GBRDA===\", \"sparse_000\": \"GBRDA===\", \"num\": 0, \"bool\": false, \"sparse_006\": \"GBRDA===\", \"thousandth\": 0, \"sparse_005\": \"GBRDA===\"}" ] #select json.number(json.filter(js,'dyn1')) from bench10; -% sys. # table_name +% sys.%1 # table_name % %1 # name % double # type % 24 # length @@ -227,7 +227,7 @@ stdout of test 'nobench` in directory 's [ NULL ] [ 6 ] #select json."integer"(json.filter(js,'dyn1')) from bench10; -% sys. # table_name +% sys.%1 # table_name % %1 # name % bigint # type % 1 # length @@ -250,7 +250,7 @@ stdout of test 'nobench` in directory 's [ "{\"sparse_018\": \"GBRDC===\", \"nested_obj\": {\"num\": 6, \"str\": \"GBRDCMJQ\"}, \"dyn2\": \"GBRDC===\", \"dyn1\": 1, \"nested_arr\": [\"button-down\"], \"sparse_010\": \"GBRDC===\", \"str2\": \"GBRDCMJQ\", \"str1\": \"GBRDC===\", \"sparse_013\": \"GBRDC===\", \"sparse_014\": \"GBRDC===\", \"sparse_015\": \"GBRDC===\", \"sparse_016\": \"GBRDC===\", \"sparse_017\": \"GBRDC===\", \"num\": 1, \"bool\": true, \"sparse_011\": \"GBRDC===\", \"thousandth\": 1, \"sparse_019\": \"GBRDC===\", \"sparse_012\": \"GBRDC===\"}" ] [ "{\"nested_obj\": {\"num\": 7, \"str\": \"GBRDCMJR\"}, \"dyn2\": 2, \"dyn1\": 2, \"nested_arr\": [\"she\", \"beyond\"], \"str2\": \"GBRDCMJR\", \"str1\": \"GBRDCMA=\", \"thousandth\": 2, \"sparse_025\": \"GBRDCMA=\", \"sparse_024\": \"GBRDCMA=\", \"sparse_027\": \"GBRDCMA=\", \"num\": 2, \"bool\": false, \"sparse_020\": \"GBRDCMA=\", \"sparse_023\": \"GBRDCMA=\", \"sparse_022\": \"GBRDCMA=\", \"sparse_021\": \"GBRDCMA=\", \"sparse_029\": \"GBRDCMA=\", \"sparse_028\": \"GBRDCMA=\", \"sparse_026\": \"GBRDCMA=\"}" ] #select json.filter(js,'nested_arr') from bench10; -% sys. # table_name +% sys.%1 # table_name % %1 # name % json # type % 59 # length diff --git a/sql/test/BugTracker-2012/Tests/case_evaluated_too_early.Bug-3186.stable.out b/sql/test/BugTracker-2012/Tests/case_evaluated_too_early.Bug-3186.stable.out --- a/sql/test/BugTracker-2012/Tests/case_evaluated_too_early.Bug-3186.stable.out +++ b/sql/test/BugTracker-2012/Tests/case_evaluated_too_early.Bug-3186.stable.out @@ -33,7 +33,7 @@ stdout of test 'case_evaluated_too_early % .%3 # table_name % %3 # name % decimal # type -% 3 # length +% 4 # length [ -10 ] # 17:10:20 > diff --git a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err --- a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err +++ b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err @@ -32,7 +32,7 @@ stderr of test 'predicate_select.Bug-309 MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395 QUERY = select name, schema_id, query, type, system, commit_action, readonly, temporary from tbls where name; -ERROR = !conversion of string 'schemas' to type bit failed. +ERROR = !conversion of string to type bit failed. CODE = 22018 diff --git a/sql/test/BugTracker-2015/Tests/readonly.Bug-3709.stable.out b/sql/test/BugTracker-2015/Tests/readonly.Bug-3709.stable.out --- a/sql/test/BugTracker-2015/Tests/readonly.Bug-3709.stable.out +++ b/sql/test/BugTracker-2015/Tests/readonly.Bug-3709.stable.out @@ -39,19 +39,19 @@ stdout of test 'readonly.Bug-3709` in di % .trace, .trace # table_name % usec, statement # name % bigint, clob # type -% 3, 134 # length -[ 9, "X_1=0@0:void := querylog.define(\"trace select * from s10;\":str, \"default_pipe\":str, 13:int);" ] -[ 11, "X_4=0:int := sql.mvc();" ] -[ 61, "X_15=[1]:bat[:str] := bat.pack(\"x\":str);" ] -[ 63, "X_16=[1]:bat[:str] := bat.pack(\"int\":str);" ] -[ 59, "X_18=[1]:bat[:int] := bat.pack(0:int);" ] -[ 55, "X_17=[1]:bat[:int] := bat.pack(32:int);" ] -[ 109, "X_14=[1]:bat[:str] := bat.pack(\"sys.s10\":str);" ] -[ 323, "C_5=[1]:bat[:oid] := sql.tid(X_4=0:int, \"sys\":str, \"s10\":str);" ] -[ 33, "X_11=[1]:bat[:int] := sql.bind(X_4=0:int, \"sys\":str, \"s10\":str, \"x\":str, 0:int);" ] -[ 24, "X_12=[1]:bat[:int] := algebra.projection(C_5=[1]:bat[:oid], X_11=[1]:bat[:int]);" ] -[ 848, "barrier X_70=false:bit := language.dataflow();" ] -[ 62, "sql.resultSet(X_14=[1]:bat[:str], X_15=[1]:bat[:str], X_16=[1]:bat[:str], X_17=[1]:bat[:int], X_18=[1]:bat[:int], X_12=[1]:bat[:int]);" ] +% 1, 134 # length +[ 0, "X_1=0@0:void := querylog.define(\"trace select * from s10;\":str, \"default_pipe\":str, 13:int);" ] +[ 0, "X_18=[1]:bat[:int] := bat.pack(0:int);" ] +[ 0, "X_4=0:int := sql.mvc();" ] +[ 0, "X_17=[1]:bat[:int] := bat.pack(32:int);" ] +[ 0, "X_14=[1]:bat[:str] := bat.pack(\"sys.s10\":str);" ] +[ 0, "X_15=[1]:bat[:str] := bat.pack(\"x\":str);" ] +[ 0, "X_16=[1]:bat[:str] := bat.pack(\"int\":str);" ] +[ 0, "C_5=[1]:bat[:oid] := sql.tid(X_4=0:int, \"sys\":str, \"s10\":str);" ] +[ 0, "X_11=[1]:bat[:int] := sql.bind(X_4=0:int, \"sys\":str, \"s10\":str, \"x\":str, 0:int);" ] +[ 0, "X_12=[1]:bat[:int] := algebra.projection(C_5=[1]:bat[:oid], X_11=[1]:bat[:int]);" ] +[ 0, "barrier X_70=false:bit := language.dataflow();" ] +[ 0, "sql.resultSet(X_14=[1]:bat[:str], X_15=[1]:bat[:str], X_16=[1]:bat[:str], X_17=[1]:bat[:int], X_18=[1]:bat[:int], X_12=[1]:bat[:int]);" ] #rollback; #drop table s10; diff --git a/sql/test/BugTracker-2017/Tests/caching_stats_bug.6374.stable.out b/sql/test/BugTracker-2017/Tests/caching_stats_bug.6374.stable.out --- a/sql/test/BugTracker-2017/Tests/caching_stats_bug.6374.stable.out +++ b/sql/test/BugTracker-2017/Tests/caching_stats_bug.6374.stable.out @@ -35,21 +35,23 @@ stdout of test 'caching_stats_bug.6374` #alter table sub1 set read only; #alter table sub2 set read only; #select count(*) from mt where i >= 5 and i < 100; -% sys.%1 # table_name +% .%1 # table_name % %1 # name % bigint # type % 1 # length -[ 2 ] +[ 0 ] #plan select count(*) from mt where i >= 5 and i < 100; % .plan # table_name % rel # name % clob # type -% 50 # length +% 46 # length project ( | group by ( -| | select ( -| | | table(sys.sub2) [ "mt"."i" ] COUNT -| | ) [ int "5" <= "mt"."i" < int "100" BETWEEN ] +| | project ( +| | | select ( +| | | | [ boolean "true" ] +| | | ) [ boolean "false" ] +| | ) [ int "NULL" as "mt"."i" ] | ) [ ] [ sys.count() NOT NULL as "%1"."%1" ] ) [ "%1"."%1" NOT NULL ] #alter table sub1 set read write; @@ -57,21 +59,23 @@ project ( [ 2 ] #alter table sub1 set read only; #select count(*) from mt where i >= 5 and i < 100; -% sys.%1 # table_name +% .%1 # table_name % %1 # name % bigint # type % 1 # length -[ 2 ] +[ 0 ] #plan select count(*) from mt where i >= 5 and i < 100; % .plan # table_name % rel # name % clob # type -% 50 # length +% 46 # length project ( | group by ( -| | select ( -| | | table(sys.sub2) [ "mt"."i" ] COUNT -| | ) [ int "5" <= "mt"."i" < int "100" BETWEEN ] +| | project ( +| | | select ( +| | | | [ boolean "true" ] +| | | ) [ boolean "false" ] +| | ) [ int "NULL" as "mt"."i" ] | ) [ ] [ sys.count() NOT NULL as "%1"."%1" ] ) [ "%1"."%1" NOT NULL ] #drop table mt; diff --git a/sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out b/sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out --- a/sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out +++ b/sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out @@ -34,622 +34,622 @@ stdout of test 'duplicates-not-eliminate % 1023 # length function user.main():void; X_1:void := querylog.define("explain select sys.timestamp_to_str(case when task0.\"sys_created_on\" >= \\'1999-10-31 09:00:00\\' and task0.\"sys_created_on\" < \\'2000-04-02 10:00:00\\' then task0.\"sys_created_on\" + interval \\'-28800\\' second when task0.\"sys_created_on\" >= \\'2000-04-02 10:00:00\\' and task0.\"sys_created_on\" < \\'2000-10-29 09:00:00\\' then task0.\"sys_created_on\" + interval \\'-25200\\' second when task0.\"sys_created_on\" >= \\'2000-10-29 09:00:00\\' and task0.\"sys_created_on\" < \\'2001-04-01 10:00:00\\' then task0.\"sys_created_on\" + interval \\'-28800\\' second when task0.\"sys_created_on\" >= \\'2001-04-01 10:00:00\\' and task0.\"sys_created_on\" < \\'2001-10-28 09:00:00\\' then task0.\"sys_created_on\" + interval \\'-25200\\' second when task0.\"sys_created_on\" >= \\'2001-10-28 09:00:00\\' and task0.\"sys_created_on\" < \\'2002-04-07 10:00:00\\' then task0.\"sys_created_on\" + interval \\'-28800\\' second when task0.\"sys_created_on\" >= \\'20 02-04-07 10:00:00\\' and t -barrier X_1246:bit := language.dataflow(); - X_43:bat[:str] := bat.new(nil:str); - X_56:bat[:timestamp] := algebra.project(X_43:bat[:str], nil:timestamp); - X_45:bat[:timestamp] := bat.new(nil:timestamp); - X_51:bat[:bit] := batcalc.between(X_45:bat[:timestamp], "1999-10-31 09:00:00.000000":timestamp, "2000-04-02 10:00:00.000000":timestamp, false:bit, true:bit, false:bit, false:bit, false:bit); - C_58:bat[:oid] := algebra.thetaselect(X_51:bat[:bit], true:bit, "==":str); - X_61:bat[:timestamp] := batmtime.timestamp_add_msec_interval(X_45:bat[:timestamp], -28800000:lng); - X_64:bat[:timestamp] := algebra.projection(C_58:bat[:oid], X_61:bat[:timestamp]); - X_65:bat[:timestamp] := bat.replace(X_56:bat[:timestamp], C_58:bat[:oid], X_64:bat[:timestamp], true:bit); - X_66:bat[:bit] := batcalc.not(X_51:bat[:bit]); - X_69:bat[:bit] := batcalc.isnil(X_66:bat[:bit]); - X_71:bat[:bit] := batcalc.or(X_66:bat[:bit], X_69:bat[:bit]); - X_76:bat[:bit] := batcalc.between(X_45:bat[:timestamp], "2000-04-02 10:00:00.000000":timestamp, "2000-10-29 09:00:00.000000":timestamp, false:bit, true:bit, false:bit, false:bit, false:bit); - X_78:bat[:bit] := batcalc.and(X_71:bat[:bit], X_76:bat[:bit]); - C_81:bat[:oid] := algebra.thetaselect(X_78:bat[:bit], true:bit, "==":str); - X_85:bat[:timestamp] := batmtime.timestamp_add_msec_interval(X_45:bat[:timestamp], -25200000:lng); - X_86:bat[:timestamp] := algebra.projection(C_81:bat[:oid], X_85:bat[:timestamp]); - X_87:bat[:timestamp] := bat.replace(X_65:bat[:timestamp], C_81:bat[:oid], X_86:bat[:timestamp], true:bit); - X_88:bat[:bit] := batcalc.not(X_76:bat[:bit]); - X_89:bat[:bit] := batcalc.isnil(X_88:bat[:bit]); - X_90:bat[:bit] := batcalc.or(X_88:bat[:bit], X_89:bat[:bit]); - X_91:bat[:bit] := batcalc.and(X_71:bat[:bit], X_90:bat[:bit]); - X_96:bat[:bit] := batcalc.between(X_45:bat[:timestamp], "2000-10-29 09:00:00.000000":timestamp, "2001-04-01 10:00:00.000000":timestamp, false:bit, true:bit, false:bit, false:bit, false:bit); - X_99:bat[:bit] := batcalc.and(X_91:bat[:bit], X_96:bat[:bit]); - C_102:bat[:oid] := algebra.thetaselect(X_99:bat[:bit], true:bit, "==":str); - X_108:bat[:timestamp] := algebra.projection(C_102:bat[:oid], X_61:bat[:timestamp]); - X_109:bat[:timestamp] := bat.replace(X_87:bat[:timestamp], C_102:bat[:oid], X_108:bat[:timestamp], true:bit); - X_111:bat[:bit] := batcalc.not(X_96:bat[:bit]); - X_113:bat[:bit] := batcalc.isnil(X_111:bat[:bit]); - X_115:bat[:bit] := batcalc.or(X_111:bat[:bit], X_113:bat[:bit]); - X_117:bat[:bit] := batcalc.and(X_91:bat[:bit], X_115:bat[:bit]); - X_122:bat[:bit] := batcalc.between(X_45:bat[:timestamp], "2001-04-01 10:00:00.000000":timestamp, "2001-10-28 09:00:00.000000":timestamp, false:bit, true:bit, false:bit, false:bit, false:bit); - X_123:bat[:bit] := batcalc.and(X_117:bat[:bit], X_122:bat[:bit]); - C_125:bat[:oid] := algebra.thetaselect(X_123:bat[:bit], true:bit, "==":str); - X_130:bat[:timestamp] := algebra.projection(C_125:bat[:oid], X_85:bat[:timestamp]); - X_131:bat[:timestamp] := bat.replace(X_109:bat[:timestamp], C_125:bat[:oid], X_130:bat[:timestamp], true:bit); - X_132:bat[:bit] := batcalc.not(X_122:bat[:bit]); - X_134:bat[:bit] := batcalc.isnil(X_132:bat[:bit]); - X_135:bat[:bit] := batcalc.or(X_132:bat[:bit], X_134:bat[:bit]); - X_136:bat[:bit] := batcalc.and(X_117:bat[:bit], X_135:bat[:bit]); - X_141:bat[:bit] := batcalc.between(X_45:bat[:timestamp], "2001-10-28 09:00:00.000000":timestamp, "2002-04-07 10:00:00.000000":timestamp, false:bit, true:bit, false:bit, false:bit, false:bit); - X_144:bat[:bit] := batcalc.and(X_136:bat[:bit], X_141:bat[:bit]); - C_146:bat[:oid] := algebra.thetaselect(X_144:bat[:bit], true:bit, "==":str); - X_152:bat[:timestamp] := algebra.projection(C_146:bat[:oid], X_61:bat[:timestamp]); - X_153:bat[:timestamp] := bat.replace(X_131:bat[:timestamp], C_146:bat[:oid], X_152:bat[:timestamp], true:bit); - X_154:bat[:bit] := batcalc.not(X_141:bat[:bit]); - X_156:bat[:bit] := batcalc.isnil(X_154:bat[:bit]); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list