Changeset: 53ac5f049d8c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=53ac5f049d8c
Modified Files:
monetdb5/optimizer/Tests/tst4631.stable.out
monetdb5/optimizer/Tests/tst4730.stable.out
Branch: default
Log Message:
Approve after changeset 619584163e99.
diffs (34 lines):
diff --git a/monetdb5/optimizer/Tests/tst4631.stable.out
b/monetdb5/optimizer/Tests/tst4631.stable.out
--- a/monetdb5/optimizer/Tests/tst4631.stable.out
+++ b/monetdb5/optimizer/Tests/tst4631.stable.out
@@ -173,10 +173,10 @@ function user.qry1():void;
V106:bat[:oid,:flt] := mal.multiplex("calc","+",V71,V105);# 44
V106:bat[:oid,:flt] := OPTremapMultiplex(_80:str, _105:str, V71:lng,
V105:bat[:oid,:flt]) {G}
V108 := batcalc.*(V97,V106); # 45 V108:bat[:oid,:flt] :=
CMDbatMULsignal(V97:bat[:oid,:flt], V106:bat[:oid,:flt]) {G}
V109 := aggr.sum(V108,V32,V34); # 46 V109:bat[:oid,:dbl] :=
AGGRsum3_dbl(V108:bat[:oid,:flt], V32:bat[:oid,:oid], V34:bat[:oid,:oid]) {G}
- V117 := aggr.avg(V55,V32,V34); # 47 V117:bat[:oid,:dbl] :=
AGGRavg3_dbl(V55:bat[:oid,:int], V32:bat[:oid,:oid], V34:bat[:oid,:oid]) {G}
- V122 := aggr.avg(V62,V32,V34); # 48 V122:bat[:oid,:dbl] :=
AGGRavg3_dbl(V62:bat[:oid,:flt], V32:bat[:oid,:oid], V34:bat[:oid,:oid]) {G}
+ V117 := aggr.avg(V55,V32,V34); # 47 V117:bat[:oid,:dbl] :=
AGGRavg13_dbl(V55:bat[:oid,:int], V32:bat[:oid,:oid], V34:bat[:oid,:oid]) {G}
+ V122 := aggr.avg(V62,V32,V34); # 48 V122:bat[:oid,:dbl] :=
AGGRavg13_dbl(V62:bat[:oid,:flt], V32:bat[:oid,:oid], V34:bat[:oid,:oid]) {G}
V124:bat[:oid,:int] := mal.multiplex("calc","round",V122,100);# 49
V124:bat[:oid,:int] := OPTremapMultiplex(_122:str, _123:str,
V122:bat[:oid,:dbl], _124:int) {G}
- V130 := aggr.avg(V80,V32,V34); # 50 V130:bat[:oid,:dbl] :=
AGGRavg3_dbl(V80:bat[:oid,:flt], V32:bat[:oid,:oid], V34:bat[:oid,:oid]) {G}
+ V130 := aggr.avg(V80,V32,V34); # 50 V130:bat[:oid,:dbl] :=
AGGRavg13_dbl(V80:bat[:oid,:flt], V32:bat[:oid,:oid], V34:bat[:oid,:oid]) {G}
V131 := mal.multiplex("calc","round",V130,100);# 51 V131:any :=
OPTremapMultiplex(_122:str, _123:str, V130:bat[:oid,:dbl], _124:int) {G}
V132 := aggr.count(V32,V32,V34); # 52 V132:bat[:oid,:wrd] :=
AGGRcount3nils(V32:bat[:oid,:oid], V32:bat[:oid,:oid], V34:bat[:oid,:oid]) {G}
end qry1; # 53
diff --git a/monetdb5/optimizer/Tests/tst4730.stable.out
b/monetdb5/optimizer/Tests/tst4730.stable.out
--- a/monetdb5/optimizer/Tests/tst4730.stable.out
+++ b/monetdb5/optimizer/Tests/tst4730.stable.out
@@ -154,10 +154,10 @@ barrier always := true;
V111:bat[:oid,:flt] := mal.multiplex("calc.+",V104,V110);# 50
V111:bat[:oid,:flt] := OPTremapMultiplex(_74:str, V104:lng,
V110:bat[:oid,:flt]) {G}
V113 := batcalc.*(V101,V111); # 51 V113:bat[:oid,:flt] :=
CMDbatMULsignal(V101:bat[:oid,:flt], V111:bat[:oid,:flt]) {G}
V114 := aggr.sum(V113,V35,V37); # 52 V114:bat[:oid,:dbl] :=
AGGRsum3_dbl(V113:bat[:oid,:flt], V35:bat[:oid,:oid], V37:bat[:oid,:oid]) {G}
- V122 := aggr.avg(V58,V35,V37); # 53 V122:bat[:oid,:dbl] :=
AGGRavg3_dbl(V58:bat[:oid,:int], V35:bat[:oid,:oid], V37:bat[:oid,:oid]) {G}
- V127 := aggr.avg(V65,V35,V37); # 54 V127:bat[:oid,:dbl] :=
AGGRavg3_dbl(V65:bat[:oid,:flt], V35:bat[:oid,:oid], V37:bat[:oid,:oid]) {G}
+ V122 := aggr.avg(V58,V35,V37); # 53 V122:bat[:oid,:dbl] :=
AGGRavg13_dbl(V58:bat[:oid,:int], V35:bat[:oid,:oid], V37:bat[:oid,:oid]) {G}
+ V127 := aggr.avg(V65,V35,V37); # 54 V127:bat[:oid,:dbl] :=
AGGRavg13_dbl(V65:bat[:oid,:flt], V35:bat[:oid,:oid], V37:bat[:oid,:oid]) {G}
V129 := mal.multiplex("calc.round",V127,100);# 55 V129:any :=
OPTremapMultiplex(_80:str, V127:bat[:oid,:dbl], _58:int) {G}
- V135 := aggr.avg(V83,V35,V37); # 56 V135:bat[:oid,:dbl] :=
AGGRavg3_dbl(V83:bat[:oid,:flt], V35:bat[:oid,:oid], V37:bat[:oid,:oid]) {G}
+ V135 := aggr.avg(V83,V35,V37); # 56 V135:bat[:oid,:dbl] :=
AGGRavg13_dbl(V83:bat[:oid,:flt], V35:bat[:oid,:oid], V37:bat[:oid,:oid]) {G}
V136 := mal.multiplex("calc.round",V135,100);# 57 V136:any :=
OPTremapMultiplex(_80:str, V135:bat[:oid,:dbl], _58:int) {G}
V137 := aggr.count(V35,V35,V37); # 58 V137:bat[:oid,:wrd] :=
AGGRcount3nils(V35:bat[:oid,:oid], V35:bat[:oid,:oid], V37:bat[:oid,:oid]) {G}
#sql.column(V42,"l_returnflag","varchar",1,0);
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
