Changeset: 19f92bd3c954 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=19f92bd3c954
Modified Files:
MonetDB5/src/optimizer/Tests/groupderive.stable.out
MonetDB5/src/optimizer/Tests/partitions07.stable.out
MonetDB5/src/optimizer/Tests/tst4005.stable.out
MonetDB5/src/optimizer/Tests/tst4631.stable.out
MonetDB5/src/optimizer/Tests/tst4730.stable.out
MonetDB5/src/optimizer/opt_derivepath.mx
Branch: default
Log Message:
Accept the new signature resolution based on SQL
The pre-loading of all modules may render tests failing as they
may overload the core definitions.
diffs (112 lines):
diff -r 0b864ae0aa6b -r 19f92bd3c954
MonetDB5/src/optimizer/Tests/groupderive.stable.out
--- a/MonetDB5/src/optimizer/Tests/groupderive.stable.out Sun May 16
18:43:52 2010 +0200
+++ b/MonetDB5/src/optimizer/Tests/groupderive.stable.out Sun May 16
18:44:52 2010 +0200
@@ -27,7 +27,7 @@
b := bat.new(:oid,:int);
c := bat.new(:oid,:str);
d := bat.new(:oid,:flt);
- (ext1,grp1) := group.new(b);
+ (ext1,grp1) := group.derivePath(b);
(ext2,grp2) := group.derivePath(b,c);
(ext3,grp3) := group.derivePath(b,c,d);
end tst;
diff -r 0b864ae0aa6b -r 19f92bd3c954
MonetDB5/src/optimizer/Tests/partitions07.stable.out
--- a/MonetDB5/src/optimizer/Tests/partitions07.stable.out Sun May 16
18:43:52 2010 +0200
+++ b/MonetDB5/src/optimizer/Tests/partitions07.stable.out Sun May 16
18:44:52 2010 +0200
@@ -58,7 +58,7 @@
x11{rows=1:lng} :=
algebra.markT(x1{notnil=true,rows=1:lng,bid=769},0...@0);# 8
x11:bat[:oid,:oid] := ALGtmark(x1:bat[:oid,:int], _20:oid) {G}
x12{rows=1:lng} := bat.reverse(x11{rows=1:lng});# 9 x12:bat[:oid,:oid] :=
BKCreverse(x11:bat[:oid,:oid]) {G}
x13{rows=1:lng} :=
algebra.join(x12{rows=1:lng},x1{notnil=true,rows=1:lng,bid=769});# 10
x13:bat[:oid,:int] := ALGjoin(x12:bat[:oid,:oid], x1:bat[:oid,:int]) {G}
- x14{rows=1:lng} := batcalc.flt(x13{rows=1:lng});# 11 x14:bat[:oid,:flt] :=
CMDconvert_int_flt(x13:bat[:oid,:int]) {G}
+ x14{rows=1:lng} := batcalc.flt(x13{rows=1:lng});# 11 x14:bat[:oid,:flt] :=
batint_2_flt(x13:bat[:oid,:int]) {G}
x31 := bat.new(nil:oid,nil:flt); # 12 x31:bat[:oid,:flt] :=
CMDBATnew(_25:oid, _26:flt) {G}
barrier (x35,x36,x37) := bat.newIterator(x14{rows=1:lng});# 13 (x35:lng,
x36:oid, x37:flt) := CHPbunIterator(x14:bat[:oid,:flt]) {GJ20}
x39 := mmath.sin(x37); # 14 x39:flt :=
MATHunary_SINflt(x37:flt)
diff -r 0b864ae0aa6b -r 19f92bd3c954
MonetDB5/src/optimizer/Tests/tst4005.stable.out
--- a/MonetDB5/src/optimizer/Tests/tst4005.stable.out Sun May 16 18:43:52
2010 +0200
+++ b/MonetDB5/src/optimizer/Tests/tst4005.stable.out Sun May 16 18:44:52
2010 +0200
@@ -49,13 +49,13 @@
end main;
function user.getz(p:int):int; # 0 getz:int := user.getz(p:int)
x := nil:int; # 1 x:int := _3:int
- V6 := calc.sht(10); # 2 V6:sht := CALCint2sht(_6:int)
- V9 := calc.int(V6); # 3 V9:int := CALCsht2int(V6:sht)
+ V6 := calc.sht(10); # 2 V6:sht := int_2_sht(_6:int)
+ V9 := calc.int(V6); # 3 V9:int := sht_2_int(V6:sht)
V11 := calc.>(p,V9); # 4 V11:bit :=
CALCcompGTintint(p:int, V9:int)
barrier V12 := V11; # 5 V12:bit := V11:bit {J10}
- V15 := calc.int(2); # 6 V15:int := CALCint2int(_12:int)
+ V15 := calc.int(2); # 6 V15:int := int_2_int(_12:int)
V22 := calc.*(p,V15); # 7 V22:int :=
CALCbinaryMULintint(p:int, V15:int)
- V24 := calc.int(V22); # 8 V24:int := CALCint2int(V22:int)
+ V24 := calc.int(V22); # 8 V24:int := int_2_int(V22:int)
x := V24; # 9 x:int := V24:int
exit V12; # 10 V12:bit
barrier V27 := calc.not(V11); # 11 V27:bit :=
CALCunarybitNOT(V11:bit) {J13}
diff -r 0b864ae0aa6b -r 19f92bd3c954
MonetDB5/src/optimizer/Tests/tst4631.stable.out
--- a/MonetDB5/src/optimizer/Tests/tst4631.stable.out Sun May 16 18:43:52
2010 +0200
+++ b/MonetDB5/src/optimizer/Tests/tst4631.stable.out Sun May 16 18:44:52
2010 +0200
@@ -157,7 +157,7 @@
V61 := algebra.kdifference(V57,V9); # 28 V61:bat[:oid,:flt] :=
ALGkdiff(V57:bat[:oid,:flt], V9:bat[:oid,:oid]) {G}
V62 := algebra.join(V18,V61); # 29 V62:bat[:oid,:flt] :=
ALGjoin(V18:bat[:oid,:oid], V61:bat[:oid,:flt]) {G}
V63 := aggr.sum(V62,V32,V34); # 30 V63:bat[:oid,:dbl] :=
AX3aggrX3_sum3_flt_dbl(V62:bat[:oid,:flt], V32:bat[:oid,:oid],
V34:bat[:oid,:oid]) {G}
- V69 := calc.lng(1); # 31 V69:lng := CALCint2lng(_67:int)
+ V69 := calc.lng(1); # 31 V69:lng := int_2_lng(_67:int)
V71 := calc.*(V69,100); # 32 V71:lng :=
CALCbinaryMULlngint(V69:lng, _69:int)
V72:bat[:oid,:flt] := user.bind("sys","lineitem","l_discount",0);# 33
V72:bat[:oid,:flt] := user.bind(_2:str, _3:str, _71:str, _5:int) {G}
V79 := algebra.kdifference(V72,V9); # 34 V79:bat[:oid,:flt] :=
ALGkdiff(V72:bat[:oid,:flt], V9:bat[:oid,:oid]) {G}
diff -r 0b864ae0aa6b -r 19f92bd3c954
MonetDB5/src/optimizer/Tests/tst4730.stable.out
--- a/MonetDB5/src/optimizer/Tests/tst4730.stable.out Sun May 16 18:43:52
2010 +0200
+++ b/MonetDB5/src/optimizer/Tests/tst4730.stable.out Sun May 16 18:44:52
2010 +0200
@@ -136,18 +136,18 @@
V64{rows=1:lng} :=
algebra.kdifference(V60{rows=1000:lng},V12{rows=1000:lng});# 32
V64:bat[:oid,:flt] := ALGkdiff(V60:bat[:oid,:flt], V12:bat[:oid,:oid]) {G}
V65{rows=1:lng} := algebra.join(V21{rows=1:lng},V64{rows=1:lng});# 33
V65:bat[:oid,:flt] := ALGjoin(V21:bat[:oid,:oid], V64:bat[:oid,:flt]) {G}
V66{rows=1:lng} := aggr.sum(V65{rows=1:lng},V35,V37);# 34
V66:bat[:oid,:dbl] := AX3aggrX3_sum3_flt_dbl(V65:bat[:oid,:flt],
V35:bat[:oid,:oid], V37:bat[:oid,:oid]) {G}
- V72 := calc.lng(A0); # 35 V72:lng := CALCsht2lng(A0:sht)
+ V72 := calc.lng(A0); # 35 V72:lng := sht_2_lng(A0:sht)
V74 := calc.*(V72,100); # 36 V74:lng :=
CALCbinaryMULlngint(V72:lng, _58:int)
V82{rows=1:lng} :=
algebra.kdifference(V75{rows=1000:lng},V12{rows=1000:lng});# 37
V82:bat[:oid,:flt] := ALGkdiff(V75:bat[:oid,:flt], V12:bat[:oid,:oid]) {G}
V83{rows=1:lng} := algebra.join(V21{rows=1:lng},V82{rows=1:lng});# 38
V83:bat[:oid,:flt] := ALGjoin(V21:bat[:oid,:oid], V82:bat[:oid,:flt]) {G}
V84:bat[:oid,:flt] := mal.multiplex("calc.-",V74,V83{rows=1:lng});# 39
V84:bat[:oid,:flt] := OPTremapMultiplex(_62:str, V74:lng, V83:bat[:oid,:flt])
{G}
V86{rows=1:lng} := batcalc.*(V65{rows=1:lng},V84);# 40 V86:bat[:oid,:flt]
:= CMDbatMUL_flt_flt_flt(V65:bat[:oid,:flt], V84:bat[:oid,:flt]) {G}
V88{rows=1:lng} := aggr.sum(V86{rows=1:lng},V35,V37);# 41
V88:bat[:oid,:dbl] := AX3aggrX3_sum3_flt_dbl(V86:bat[:oid,:flt],
V35:bat[:oid,:oid], V37:bat[:oid,:oid]) {G}
- V94 := calc.lng(A1); # 42 V94:lng := CALCsht2lng(A1:sht)
+ V94 := calc.lng(A1); # 42 V94:lng := sht_2_lng(A1:sht)
V95 := calc.*(V94,100); # 43 V95:lng :=
CALCbinaryMULlngint(V94:lng, _58:int)
V100:bat[:oid,:flt] := mal.multiplex("calc.-",V95,V83{rows=1:lng});# 44
V100:bat[:oid,:flt] := OPTremapMultiplex(_62:str, V95:lng, V83:bat[:oid,:flt])
{G}
V101{rows=1:lng} := batcalc.*(V65{rows=1:lng},V100);# 45
V101:bat[:oid,:flt] := CMDbatMUL_flt_flt_flt(V65:bat[:oid,:flt],
V100:bat[:oid,:flt]) {G}
- V103 := calc.lng(A2); # 46 V103:lng := CALCsht2lng(A2:sht)
+ V103 := calc.lng(A2); # 46 V103:lng := sht_2_lng(A2:sht)
V104 := calc.*(V103,100); # 47 V104:lng :=
CALCbinaryMULlngint(V103:lng, _58:int)
V109{rows=1:lng} :=
algebra.kdifference(V105{rows=1000:lng},V12{rows=1000:lng});# 48
V109:bat[:oid,:flt] := ALGkdiff(V105:bat[:oid,:flt], V12:bat[:oid,:oid]) {G}
V110{rows=1:lng} := algebra.join(V21{rows=1:lng},V109{rows=1:lng});# 49
V110:bat[:oid,:flt] := ALGjoin(V21:bat[:oid,:oid], V109:bat[:oid,:flt]) {G}
diff -r 0b864ae0aa6b -r 19f92bd3c954 MonetDB5/src/optimizer/opt_derivepath.mx
--- a/MonetDB5/src/optimizer/opt_derivepath.mx Sun May 16 18:43:52 2010 +0200
+++ b/MonetDB5/src/optimizer/opt_derivepath.mx Sun May 16 18:44:52 2010 +0200
@@ -72,7 +72,7 @@
#include "opt_support.h"
#include "mal_interpreter.h"
-#define DEBUG_OPT_DERIVEPATH /**/
+/* #define DEBUG_OPT_DERIVEPATH */
opt_export str ALGderivePath(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
opt_export str ALGderiveCount(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
opt_export str ALGderiveSum(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
@@ -120,7 +120,7 @@
pc[getArg(p,1)] = i;
actions++;
#ifdef DEBUG_OPT_DERIVEPATH
- stream_printf(cntxt->fdout,"new derivePath
instruction\n");
+ stream_printf(cntxt->fdout,"#new derivePath
instruction\n");
printInstruction(cntxt->fdout,mb, 0, p,
LIST_MAL_ALL);
#endif
}
@@ -139,7 +139,7 @@
freeInstruction(p);
p= q;
#ifdef DEBUG_OPT_DERIVEPATH
- stream_printf(cntxt->fdout,"new derivePath
instruction extension\n");
+ stream_printf(cntxt->fdout,"#new derivePath
instruction extension\n");
printInstruction(cntxt->fdout,mb, 0, p,
LIST_MAL_ALL);
#endif
}
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
