Changeset: 0314fa9c90d0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0314fa9c90d0
Modified Files:
sql/test/BugTracker-2012/Tests/aggregate_incorrect_precision_scale.Bug-3182.stable.out
sql/test/BugTracker-2012/Tests/aggregate_incorrect_precision_scale.Bug-3182.stable.out.int128
sql/test/BugTracker-2012/Tests/algebra_find.Bug-2728.stable.out
sql/test/BugTracker-2012/Tests/cast_varchar_to_double.Bug-3071.stable.out
sql/test/BugTracker-2012/Tests/correlated_groupby_in_selection.Bug-3011.stable.out
sql/test/BugTracker-2012/Tests/fixed_limit_for_prepare.Bug-3208.stable.out
sql/test/BugTracker-2012/Tests/many-columns-truncated.Bug-3161.stable.out
sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
sql/test/BugTracker-2012/Tests/row_number_does_not_work_in_complex_query.Bug-2805.stable.out
sql/test/BugTracker-2012/Tests/server-crash.Bug-3046.stable.out
sql/test/BugTracker-2012/Tests/set_operation.Bug-3059.stable.out
sql/test/BugTracker-2012/Tests/simple_select.Bug-2988.stable.out
sql/test/BugTracker-2012/Tests/tuples_INTERSECT_vs_count_intersect_differs.Bug-2659.stable.out
sql/test/BugTracker-2012/Tests/with_and_exists.Bug-3099.stable.out
sql/test/BugTracker-2017/Tests/side-effect.Bug-6397.stable.out
sql/test/BugTracker/Tests/auto_increment.SF-1834820.stable.out
sql/test/BugTracker/Tests/bug_in_selection.SF-1892413.stable.out
sql/test/BugTracker/Tests/case_in_aggr_bug.SF-1506545.stable.out
sql/test/BugTracker/Tests/case_with_aggr.SF-1876779.stable.out.int128
sql/test/BugTracker/Tests/count_crash.SF-1918780.stable.out
sql/test/BugTracker/Tests/crash_on_delete.SF-1639108.stable.out
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/groupby_with_alias.SF-1520575.stable.out.int128
sql/test/BugTracker/Tests/insert_not_exists.SF-1380287.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/BugTracker/Tests/large_prepare_2.SF-1363729.stable.out
sql/test/BugTracker/Tests/proc_insert_into.SF-1958572.stable.out
sql/test/BugTracker/Tests/rand_not_executed_for_every_row.SF-1723791.stable.out
sql/test/remote/Tests/partition_elim.stable.out
sql/test/remote/Tests/ssbm.stable.out.int128
Branch: Apr2019
Log Message:
Approve MAL plan changes.
diffs (truncated from 986 to 300 lines):
diff --git
a/sql/test/BugTracker-2012/Tests/aggregate_incorrect_precision_scale.Bug-3182.stable.out
b/sql/test/BugTracker-2012/Tests/aggregate_incorrect_precision_scale.Bug-3182.stable.out
---
a/sql/test/BugTracker-2012/Tests/aggregate_incorrect_precision_scale.Bug-3182.stable.out
+++
b/sql/test/BugTracker-2012/Tests/aggregate_incorrect_precision_scale.Bug-3182.stable.out
@@ -36,14 +36,14 @@ Ready.
[ 1.3, 1.300 ]
[ 8.252, 8.252 ]
#select count(dval), count(nval) from type_test;
-% sys.L4, sys.L7 # table_name
-% L3, L6 # name
+% sys.L3, sys.L5 # table_name
+% L3, L5 # name
% bigint, bigint # type
% 1, 1 # length
[ 3, 3 ]
#select sum(dval), sum(nval) from type_test;
-% sys.L4, sys.L7 # table_name
-% L3, L6 # name
+% sys.L3, sys.L5 # table_name
+% L3, L5 # name
% double, decimal # type
% 24, 20 # length
[ 14.952, 14.952 ]
diff --git
a/sql/test/BugTracker-2012/Tests/aggregate_incorrect_precision_scale.Bug-3182.stable.out.int128
b/sql/test/BugTracker-2012/Tests/aggregate_incorrect_precision_scale.Bug-3182.stable.out.int128
---
a/sql/test/BugTracker-2012/Tests/aggregate_incorrect_precision_scale.Bug-3182.stable.out.int128
+++
b/sql/test/BugTracker-2012/Tests/aggregate_incorrect_precision_scale.Bug-3182.stable.out.int128
@@ -36,14 +36,14 @@ Ready.
[ 1.3, 1.300 ]
[ 8.252, 8.252 ]
#select count(dval), count(nval) from type_test;
-% sys.L4, sys.L7 # table_name
-% L3, L6 # name
+% sys.L3, sys.L5 # table_name
+% L3, L5 # name
% bigint, bigint # type
% 1, 1 # length
[ 3, 3 ]
#select sum(dval), sum(nval) from type_test;
-% sys.L4, sys.L7 # table_name
-% L3, L6 # name
+% sys.L3, sys.L5 # table_name
+% L3, L5 # name
% double, decimal # type
% 24, 40 # length
[ 14.952, 14.952 ]
diff --git a/sql/test/BugTracker-2012/Tests/algebra_find.Bug-2728.stable.out
b/sql/test/BugTracker-2012/Tests/algebra_find.Bug-2728.stable.out
--- a/sql/test/BugTracker-2012/Tests/algebra_find.Bug-2728.stable.out
+++ b/sql/test/BugTracker-2012/Tests/algebra_find.Bug-2728.stable.out
@@ -77,7 +77,7 @@ Ready.
#insert into kvk values (1, 'test', 1, 0, 'Oude Trambaan 8', '2265CA',
'Leidschendam', 'iets', 'geen');
[ 1 ]
#select count(*) from vve, kvk where toevoeging is null and vve.huisnummer is
not null and vve.postcode = kvk.postcode and kvk.adres like '
%'||vve.huisnummer;
-% sys.L4 # table_name
+% sys.L3 # table_name
% L3 # name
% bigint # type
% 1 # length
diff --git
a/sql/test/BugTracker-2012/Tests/cast_varchar_to_double.Bug-3071.stable.out
b/sql/test/BugTracker-2012/Tests/cast_varchar_to_double.Bug-3071.stable.out
--- a/sql/test/BugTracker-2012/Tests/cast_varchar_to_double.Bug-3071.stable.out
+++ b/sql/test/BugTracker-2012/Tests/cast_varchar_to_double.Bug-3071.stable.out
@@ -49,7 +49,7 @@ Ready.
#insert into t3071 values ('42.42');
[ 1 ]
#select avg ( cast (s as double)) from t3071;
-% sys.L5 # table_name
+% sys.L4 # table_name
% L4 # name
% double # type
% 24 # length
diff --git
a/sql/test/BugTracker-2012/Tests/correlated_groupby_in_selection.Bug-3011.stable.out
b/sql/test/BugTracker-2012/Tests/correlated_groupby_in_selection.Bug-3011.stable.out
---
a/sql/test/BugTracker-2012/Tests/correlated_groupby_in_selection.Bug-3011.stable.out
+++
b/sql/test/BugTracker-2012/Tests/correlated_groupby_in_selection.Bug-3011.stable.out
@@ -43,7 +43,7 @@ Ready.
# counter.timinglinkorder < test.timinglinkorder and
# counter.userstopcodebegin = test.userstopcodebegin
# group by dataownercode, lineplanningnumber, journeypatterncode) as
-% .test, .test, .test, .test, .test, .test, .L16 # table_name
+% .test, .test, .test, .test, .test, .test, .L15 # table_name
% dataownercode, lineplanningnumber, journeypatterncode,
timinglinkorder, userstopcodebegin, istimingstop,
passagesequencenumber # name
% varchar, varchar, varchar, decimal, varchar,
boolean, bigint # type
% 0, 0, 0, 4, 0, 5, 1 # length
@@ -56,7 +56,7 @@ Ready.
# counter.timinglinkorder < test.timinglinkorder and
# counter.userstopcodebegin = test.userstopcodebegin) as
#passagesequencenumber
-% .test, .test, .test, .test, .test, .test, .L16 # table_name
+% .test, .test, .test, .test, .test, .test, .L15 # table_name
% dataownercode, lineplanningnumber, journeypatterncode,
timinglinkorder, userstopcodebegin, istimingstop,
passagesequencenumber # name
% varchar, varchar, varchar, decimal, varchar,
boolean, bigint # type
% 0, 0, 0, 4, 0, 5, 1 # length
@@ -78,7 +78,7 @@ Ready.
# counter.timinglinkorder < test.timinglinkorder and
# counter.userstopcodebegin = test.userstopcodebegin
# group by dataownercode, lineplanningnumber, journeypatterncode) as
-% .test, .test, .test, .test, .test, .test, .L16 # table_name
+% .test, .test, .test, .test, .test, .test, .L15 # table_name
% dataownercode, lineplanningnumber, journeypatterncode,
timinglinkorder, userstopcodebegin, istimingstop,
passagesequencenumber # name
% varchar, varchar, varchar, decimal, varchar,
boolean, bigint # type
% 3, 4, 1, 4, 8, 5, 1 # length
@@ -101,7 +101,7 @@ Ready.
# counter.timinglinkorder < test.timinglinkorder and
# counter.userstopcodebegin = test.userstopcodebegin) as
#passagesequencenumber
-% .test, .test, .test, .test, .test, .test, .L16 # table_name
+% .test, .test, .test, .test, .test, .test, .L15 # table_name
% dataownercode, lineplanningnumber, journeypatterncode,
timinglinkorder, userstopcodebegin, istimingstop,
passagesequencenumber # name
% varchar, varchar, varchar, decimal, varchar,
boolean, bigint # type
% 3, 4, 1, 4, 8, 5, 1 # length
diff --git
a/sql/test/BugTracker-2012/Tests/fixed_limit_for_prepare.Bug-3208.stable.out
b/sql/test/BugTracker-2012/Tests/fixed_limit_for_prepare.Bug-3208.stable.out
--- a/sql/test/BugTracker-2012/Tests/fixed_limit_for_prepare.Bug-3208.stable.out
+++ b/sql/test/BugTracker-2012/Tests/fixed_limit_for_prepare.Bug-3208.stable.out
@@ -209,7 +209,7 @@ Ready.
# '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
'', '',
[ 1 ]
#select count(*) from wide;
-% sys.L4 # table_name
+% sys.L3 # table_name
% L3 # name
% bigint # type
% 1 # length
diff --git
a/sql/test/BugTracker-2012/Tests/many-columns-truncated.Bug-3161.stable.out
b/sql/test/BugTracker-2012/Tests/many-columns-truncated.Bug-3161.stable.out
--- a/sql/test/BugTracker-2012/Tests/many-columns-truncated.Bug-3161.stable.out
+++ b/sql/test/BugTracker-2012/Tests/many-columns-truncated.Bug-3161.stable.out
@@ -86,7 +86,7 @@ Ready.
#RT,SERIALNO,DIVISION,PUMA,REGION,ST,ADJHSG,ADJINC,WGTP,NP,TYPE,ACR,AGS,BATH,BDSP,BLD,BUS,CONP,ELEP,FS,FULP,GASP,HFL,INSP,MHP,MRGI,MRGP,MRGT,MRGX,REFR,RMSP,RNTM,RNTP,RWAT,SINK,SMP,STOV,TEL,TEN,TOIL,VACS,VALP,VEH,WATP,YBL,FES,FINCP,FPARC,GRNTP,GRPIP,HHL,HHT,HINCP,HUGCL,HUPAC,HUPAOC,HUPARC,KIT,LNGI,MULTG,MV,NOC,NPF,NPP,NR,NRC,OCPIP,PARTNER,PLM,PSF,R18,R60,R65,RESMODE,SMOCP,SMX,SRNT,SVAL,TAXP,WIF,WKEXREL,WORKSTAT,FACRP,FAGSP,FBATHP,FBDSP,FBLDP,FBUSP,FCONP,FELEP,FFSP,FFULP,FGASP,FHFLP,FINSP,FKITP,FMHP,FMRGIP,FMRGP,FMRGTP,FMRGXP,FMVP,FPLMP,FREFRP,FRMSP,FRNTMP,FRNTP,FRWATP,FSINKP,FSMP,FSMXHP,FSMXSP,FSTOVP,FTAXP,FTELP,FTENP,FTOILP,FVACSP,FVALP,FVEHP,FWATP,FYBLP,wgtp1,wgtp2,wgtp3,wgtp4,wgtp5,wgtp6,wgtp7,wgtp8,wgtp9,wgtp10,wgtp11,wgtp12,wgtp13,wgtp14,wgtp15,wgtp16,wgtp17,wgtp18,wgtp19,wgtp20,wgtp21,wgtp22,wgtp23,wgtp24,wgtp25,wgtp26,wgtp27,wgtp28,wgtp29,wgtp30,wgtp31,wgtp32,wgtp33,wgtp34,wgtp35,wgtp36,wgtp37,wgtp38,wgtp39,wgtp40,wgtp41,wgtp42,wgtp43,wgtp44,wgtp45,wgtp46,wgtp47,wgtp48,wgtp49,
wgtp50,wgtp51,wgtp52,wgtp53,wgtp54,wgtp55,wgtp56,wgtp57,wgtp58,wgtp59,wgtp60,wgtp61,wgtp62,wgtp63,wgtp64,wgtp65,wgtp66,wgtp67,wgtp68,wgtp69,wgtp70,wgtp71,wgtp72,wgtp73,wgtp74,wgtp75,wgtp76,wgtp77,wgtp78,wgtp79,wgtp80
[ 5 ]
#select count(*) from household;
-% sys.L4 # table_name
+% sys.L3 # table_name
% L3 # name
% bigint # type
% 1 # length
diff --git
a/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
b/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
---
a/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
+++
b/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
@@ -303,19 +303,18 @@ function user.s20_1():void;
X_40:bat[:str] := bat.new(nil:str);
X_39:bat[:str] := bat.new(nil:str);
X_5:int := sql.mvc();
- C_6:bat[:oid] := sql.tid(X_5:int, "sys":str, "functions":str);
X_9:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str, "name":str,
0:int);
(X_14:bat[:oid], X_15:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "name":str, 2:int);
X_12:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"name":str, 1:int);
- X_18:bat[:str] := sql.projectdelta(C_6:bat[:oid], X_9:bat[:str],
X_14:bat[:oid], X_15:bat[:str], X_12:bat[:str]);
- X_100:bat[:bit] := batalgebra.like(X_18:bat[:str], "%optimizers%":str);
- C_32:bat[:oid] := algebra.thetaselect(X_100:bat[:bit], true:bit, "==":str);
+ X_17:bat[:str] := sql.delta(X_9:bat[:str], X_14:bat[:oid], X_15:bat[:str],
X_12:bat[:str]);
+ X_101:bat[:bit] := batalgebra.like(X_17:bat[:str], "%optimizers%":str);
+ C_6:bat[:oid] := sql.tid(X_5:int, "sys":str, "functions":str);
+ C_32:bat[:oid] := algebra.thetaselect(X_101:bat[:bit], C_6:bat[:oid],
true:bit, "==":str);
X_19:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"func":str, 0:int);
(X_22:bat[:oid], X_23:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "func":str, 2:int);
X_21:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"func":str, 1:int);
- X_25:bat[:str] := sql.projectdelta(C_6:bat[:oid], X_19:bat[:str],
X_22:bat[:oid], X_23:bat[:str], X_21:bat[:str]);
- X_35:bat[:str] := algebra.projection(C_32:bat[:oid], X_25:bat[:str]);
- X_34:bat[:str] := algebra.projection(C_32:bat[:oid], X_18:bat[:str]);
+ X_35:bat[:str] := sql.projectdelta(C_32:bat[:oid], X_19:bat[:str],
X_22:bat[:oid], X_23:bat[:str], X_21:bat[:str]);
+ X_34:bat[:str] := sql.projectdelta(C_32:bat[:oid], X_9:bat[:str],
X_14:bat[:oid], X_15:bat[:str], X_12:bat[:str]);
X_44:bat[:str] := bat.append(X_37:bat[:str], "sys.functions":str);
X_46:bat[:str] := bat.append(X_39:bat[:str], "name":str);
X_48:bat[:str] := bat.append(X_40:bat[:str], "varchar":str);
@@ -364,19 +363,18 @@ function user.s22_1():void;
X_40:bat[:str] := bat.new(nil:str);
X_39:bat[:str] := bat.new(nil:str);
X_5:int := sql.mvc();
- C_6:bat[:oid] := sql.tid(X_5:int, "sys":str, "functions":str);
X_9:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str, "name":str,
0:int);
(X_14:bat[:oid], X_15:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "name":str, 2:int);
X_12:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"name":str, 1:int);
- X_18:bat[:str] := sql.projectdelta(C_6:bat[:oid], X_9:bat[:str],
X_14:bat[:oid], X_15:bat[:str], X_12:bat[:str]);
- X_100:bat[:bit] := batalgebra.not_like(X_18:bat[:str], "%optimizers%":str);
- C_32:bat[:oid] := algebra.thetaselect(X_100:bat[:bit], true:bit, "==":str);
+ X_17:bat[:str] := sql.delta(X_9:bat[:str], X_14:bat[:oid], X_15:bat[:str],
X_12:bat[:str]);
+ X_101:bat[:bit] := batalgebra.not_like(X_17:bat[:str], "%optimizers%":str);
+ C_6:bat[:oid] := sql.tid(X_5:int, "sys":str, "functions":str);
+ C_32:bat[:oid] := algebra.thetaselect(X_101:bat[:bit], C_6:bat[:oid],
true:bit, "==":str);
X_19:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"func":str, 0:int);
(X_22:bat[:oid], X_23:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "func":str, 2:int);
X_21:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"func":str, 1:int);
- X_25:bat[:str] := sql.projectdelta(C_6:bat[:oid], X_19:bat[:str],
X_22:bat[:oid], X_23:bat[:str], X_21:bat[:str]);
- X_35:bat[:str] := algebra.projection(C_32:bat[:oid], X_25:bat[:str]);
- X_34:bat[:str] := algebra.projection(C_32:bat[:oid], X_18:bat[:str]);
+ X_35:bat[:str] := sql.projectdelta(C_32:bat[:oid], X_19:bat[:str],
X_22:bat[:oid], X_23:bat[:str], X_21:bat[:str]);
+ X_34:bat[:str] := sql.projectdelta(C_32:bat[:oid], X_9:bat[:str],
X_14:bat[:oid], X_15:bat[:str], X_12:bat[:str]);
X_44:bat[:str] := bat.append(X_37:bat[:str], "sys.functions":str);
X_46:bat[:str] := bat.append(X_39:bat[:str], "name":str);
X_48:bat[:str] := bat.append(X_40:bat[:str], "varchar":str);
@@ -425,19 +423,18 @@ function user.s24_1():void;
X_40:bat[:str] := bat.new(nil:str);
X_39:bat[:str] := bat.new(nil:str);
X_5:int := sql.mvc();
- C_6:bat[:oid] := sql.tid(X_5:int, "sys":str, "functions":str);
X_9:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str, "name":str,
0:int);
(X_14:bat[:oid], X_15:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "name":str, 2:int);
X_12:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"name":str, 1:int);
- X_18:bat[:str] := sql.projectdelta(C_6:bat[:oid], X_9:bat[:str],
X_14:bat[:oid], X_15:bat[:str], X_12:bat[:str]);
- X_100:bat[:bit] := batalgebra.ilike(X_18:bat[:str], "%optimizers%":str);
- C_32:bat[:oid] := algebra.thetaselect(X_100:bat[:bit], true:bit, "==":str);
+ X_17:bat[:str] := sql.delta(X_9:bat[:str], X_14:bat[:oid], X_15:bat[:str],
X_12:bat[:str]);
+ X_101:bat[:bit] := batalgebra.ilike(X_17:bat[:str], "%optimizers%":str);
+ C_6:bat[:oid] := sql.tid(X_5:int, "sys":str, "functions":str);
+ C_32:bat[:oid] := algebra.thetaselect(X_101:bat[:bit], C_6:bat[:oid],
true:bit, "==":str);
X_19:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"func":str, 0:int);
(X_22:bat[:oid], X_23:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "func":str, 2:int);
X_21:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"func":str, 1:int);
- X_25:bat[:str] := sql.projectdelta(C_6:bat[:oid], X_19:bat[:str],
X_22:bat[:oid], X_23:bat[:str], X_21:bat[:str]);
- X_35:bat[:str] := algebra.projection(C_32:bat[:oid], X_25:bat[:str]);
- X_34:bat[:str] := algebra.projection(C_32:bat[:oid], X_18:bat[:str]);
+ X_35:bat[:str] := sql.projectdelta(C_32:bat[:oid], X_19:bat[:str],
X_22:bat[:oid], X_23:bat[:str], X_21:bat[:str]);
+ X_34:bat[:str] := sql.projectdelta(C_32:bat[:oid], X_9:bat[:str],
X_14:bat[:oid], X_15:bat[:str], X_12:bat[:str]);
X_44:bat[:str] := bat.append(X_37:bat[:str], "sys.functions":str);
X_46:bat[:str] := bat.append(X_39:bat[:str], "name":str);
X_48:bat[:str] := bat.append(X_40:bat[:str], "varchar":str);
@@ -486,19 +483,18 @@ function user.s26_1():void;
X_40:bat[:str] := bat.new(nil:str);
X_39:bat[:str] := bat.new(nil:str);
X_5:int := sql.mvc();
- C_6:bat[:oid] := sql.tid(X_5:int, "sys":str, "functions":str);
X_9:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str, "name":str,
0:int);
(X_14:bat[:oid], X_15:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "name":str, 2:int);
X_12:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"name":str, 1:int);
- X_18:bat[:str] := sql.projectdelta(C_6:bat[:oid], X_9:bat[:str],
X_14:bat[:oid], X_15:bat[:str], X_12:bat[:str]);
- X_100:bat[:bit] := batalgebra.not_ilike(X_18:bat[:str],
"%optimizers%":str);
- C_32:bat[:oid] := algebra.thetaselect(X_100:bat[:bit], true:bit, "==":str);
+ X_17:bat[:str] := sql.delta(X_9:bat[:str], X_14:bat[:oid], X_15:bat[:str],
X_12:bat[:str]);
+ X_101:bat[:bit] := batalgebra.not_ilike(X_17:bat[:str],
"%optimizers%":str);
+ C_6:bat[:oid] := sql.tid(X_5:int, "sys":str, "functions":str);
+ C_32:bat[:oid] := algebra.thetaselect(X_101:bat[:bit], C_6:bat[:oid],
true:bit, "==":str);
X_19:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"func":str, 0:int);
(X_22:bat[:oid], X_23:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "func":str, 2:int);
X_21:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"func":str, 1:int);
- X_25:bat[:str] := sql.projectdelta(C_6:bat[:oid], X_19:bat[:str],
X_22:bat[:oid], X_23:bat[:str], X_21:bat[:str]);
- X_35:bat[:str] := algebra.projection(C_32:bat[:oid], X_25:bat[:str]);
- X_34:bat[:str] := algebra.projection(C_32:bat[:oid], X_18:bat[:str]);
+ X_35:bat[:str] := sql.projectdelta(C_32:bat[:oid], X_19:bat[:str],
X_22:bat[:oid], X_23:bat[:str], X_21:bat[:str]);
+ X_34:bat[:str] := sql.projectdelta(C_32:bat[:oid], X_9:bat[:str],
X_14:bat[:oid], X_15:bat[:str], X_12:bat[:str]);
X_44:bat[:str] := bat.append(X_37:bat[:str], "sys.functions":str);
X_46:bat[:str] := bat.append(X_39:bat[:str], "name":str);
X_48:bat[:str] := bat.append(X_40:bat[:str], "varchar":str);
diff --git
a/sql/test/BugTracker-2012/Tests/row_number_does_not_work_in_complex_query.Bug-2805.stable.out
b/sql/test/BugTracker-2012/Tests/row_number_does_not_work_in_complex_query.Bug-2805.stable.out
---
a/sql/test/BugTracker-2012/Tests/row_number_does_not_work_in_complex_query.Bug-2805.stable.out
+++
b/sql/test/BugTracker-2012/Tests/row_number_does_not_work_in_complex_query.Bug-2805.stable.out
@@ -252,8 +252,8 @@ Ready.
#insert into T values (30,30,30,30,30);
[ 1 ]
#with Raw as (select a,b,c,count(*) as value from T where e<10 and c<50 group
by a,b,c) select Raw.*, row_number() over (partition by a order by value desc)
from Raw;
-% sys.raw, sys.raw, sys.raw, sys.raw, sys.L15 #
table_name
-% a, b, c, value, L15 # name
+% sys.raw, sys.raw, sys.raw, sys.raw, sys.L14 #
table_name
+% a, b, c, value, L14 # name
% int, int, int, bigint, int # type
% 1, 1, 1, 1, 1 # length
[ 1, 1, 1, 1, 1 ]
diff --git a/sql/test/BugTracker-2012/Tests/server-crash.Bug-3046.stable.out
b/sql/test/BugTracker-2012/Tests/server-crash.Bug-3046.stable.out
--- a/sql/test/BugTracker-2012/Tests/server-crash.Bug-3046.stable.out
+++ b/sql/test/BugTracker-2012/Tests/server-crash.Bug-3046.stable.out
@@ -77,7 +77,7 @@ Ready.
# rank1.component_ref = component1.id AND
# rank1.node_ref = node1.id AND
# rank1.pre = rank2.parent AND
-% sys.L11 # table_name
+% sys.L10 # table_name
% L10 # name
% bigint # type
% 1 # length
diff --git a/sql/test/BugTracker-2012/Tests/set_operation.Bug-3059.stable.out
b/sql/test/BugTracker-2012/Tests/set_operation.Bug-3059.stable.out
--- a/sql/test/BugTracker-2012/Tests/set_operation.Bug-3059.stable.out
+++ b/sql/test/BugTracker-2012/Tests/set_operation.Bug-3059.stable.out
@@ -97,7 +97,7 @@ Ready.
[ 3, 1, 16 ]
[ 3, 2, 2 ]
#SELECT count(*) as c FROM ((SELECT * FROM S) INTERSECT (SELECT * FROM R)) as
inter;
-% sys.L15 # table_name
+% sys.L16 # table_name
% c # name
% bigint # type
% 1 # length
@@ -112,7 +112,7 @@ Ready.
[ 2, 1, 28 ]
[ 3, 0, 1 ]
#SELECT count(*) as c FROM ((SELECT * FROM S) EXCEPT (SELECT * FROM R)) as
diff;
-% sys.L15 # table_name
+% sys.L16 # table_name
% c # name
% bigint # type
% 1 # length
diff --git a/sql/test/BugTracker-2012/Tests/simple_select.Bug-2988.stable.out
b/sql/test/BugTracker-2012/Tests/simple_select.Bug-2988.stable.out
--- a/sql/test/BugTracker-2012/Tests/simple_select.Bug-2988.stable.out
+++ b/sql/test/BugTracker-2012/Tests/simple_select.Bug-2988.stable.out
@@ -24,7 +24,7 @@ Ready.
# 21:38:00 >
#select 1, (select 1) as x;
-% .L2, .L6 # table_name
+% .L2, .L7 # table_name
% L2, x # name
% tinyint, tinyint # type
% 1, 1 # length
diff --git
a/sql/test/BugTracker-2012/Tests/tuples_INTERSECT_vs_count_intersect_differs.Bug-2659.stable.out
b/sql/test/BugTracker-2012/Tests/tuples_INTERSECT_vs_count_intersect_differs.Bug-2659.stable.out
---
a/sql/test/BugTracker-2012/Tests/tuples_INTERSECT_vs_count_intersect_differs.Bug-2659.stable.out
+++
b/sql/test/BugTracker-2012/Tests/tuples_INTERSECT_vs_count_intersect_differs.Bug-2659.stable.out
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
