Changeset: bc0cca426a63 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bc0cca426a63
Modified Files:
monetdb5/optimizer/Tests/inline02.stable.out
monetdb5/optimizer/Tests/inline03.stable.out
monetdb5/optimizer/Tests/inline06.stable.out
monetdb5/optimizer/Tests/inlineFunction2.mal
monetdb5/optimizer/Tests/inlineFunction2.stable.out
Branch: default
Log Message:
Approval of new output
diffs (104 lines):
diff --git a/monetdb5/optimizer/Tests/inline02.stable.out
b/monetdb5/optimizer/Tests/inline02.stable.out
--- a/monetdb5/optimizer/Tests/inline02.stable.out
+++ b/monetdb5/optimizer/Tests/inline02.stable.out
@@ -35,9 +35,9 @@
zz := X_16; # 4 zz:int := _16:int
# base line test for inlining
X_20 := batcalc.+(b,b); # 6 _20:bat[:oid,:int] :=
CMDbatADD_int_int_int(b:bat[:oid,:int], b:bat[:oid,:int]) {G}
- z:bat[:oid,:int] {inline} := X_20; # 7 z:bat[:oid,:int] :=
_20:bat[:oid,:int] {G}
+ z:bat[:oid,:int] := X_20; # 7 z:bat[:oid,:int] :=
_20:bat[:oid,:int] {G}
X_24 := batcalc.+(b,2); # 8 _24:bat[:oid,:int] :=
CMDbatADDcst_int_int_int(b:bat[:oid,:int], _8:int) {G}
- z:bat[:oid,:int] {inline} := X_24; # 9 z:bat[:oid,:int] :=
_24:bat[:oid,:int] {G}
+ z:bat[:oid,:int] := X_24; # 9 z:bat[:oid,:int] :=
_24:bat[:oid,:int] {G}
end qry; # 10
# 18:00:43 >
diff --git a/monetdb5/optimizer/Tests/inline03.stable.out
b/monetdb5/optimizer/Tests/inline03.stable.out
--- a/monetdb5/optimizer/Tests/inline03.stable.out
+++ b/monetdb5/optimizer/Tests/inline03.stable.out
@@ -34,11 +34,11 @@
X_14 := 1; # 3 _14:int := _6:int
X_15 := batcalc.+(b,b); # 4 _15:bat[:oid,:int] :=
CMDbatADD_int_int_int(b:bat[:oid,:int], b:bat[:oid,:int]) {G}
X_15 := batcalc.*(X_15,X_14); # 5 _15:bat[:oid,:int] :=
CMDbatMULcst_int_int_int(_15:bat[:oid,:int], _14:int) {G}
- z:bat[:oid,:int] {inline} := X_15; # 6 z:bat[:oid,:int] :=
_15:bat[:oid,:int] {G}
+ z:bat[:oid,:int] := X_15; # 6 z:bat[:oid,:int] :=
_15:bat[:oid,:int] {G}
X_19 := 1; # 7 _19:int := _6:int
X_20 := batcalc.+(b,2); # 8 _20:bat[:oid,:int] :=
CMDbatADDcst_int_int_int(b:bat[:oid,:int], _10:int) {G}
X_20 := batcalc.*(X_20,X_19); # 9 _20:bat[:oid,:int] :=
CMDbatMULcst_int_int_int(_20:bat[:oid,:int], _19:int) {G}
- z:bat[:oid,:int] {inline} := X_20; # 10 z:bat[:oid,:int] :=
_20:bat[:oid,:int] {G}
+ z:bat[:oid,:int] := X_20; # 10 z:bat[:oid,:int] :=
_20:bat[:oid,:int] {G}
end qry; # 11
# 18:00:43 >
diff --git a/monetdb5/optimizer/Tests/inline06.stable.out
b/monetdb5/optimizer/Tests/inline06.stable.out
--- a/monetdb5/optimizer/Tests/inline06.stable.out
+++ b/monetdb5/optimizer/Tests/inline06.stable.out
@@ -36,12 +36,12 @@
X_15 := mmath.rand(); # 4 _15:int := MATHrandint()
#
X_14 := batcalc.*(X_14,X_15); # 6 _14:bat[:oid,:int] :=
CMDbatMULcst_int_int_int(_14:bat[:oid,:int], _15:int) {G}
- z:bat[:oid,:int] {inline} := X_14; # 7 z:bat[:oid,:int] :=
_14:bat[:oid,:int] {G}
+ z:bat[:oid,:int] := X_14; # 7 z:bat[:oid,:int] :=
_14:bat[:oid,:int] {G}
X_20 := batcalc.+(b,2); # 8 _20:bat[:oid,:int] :=
CMDbatADDcst_int_int_int(b:bat[:oid,:int], _10:int) {G}
X_21 := mmath.rand(); # 9 _21:int := MATHrandint()
#
X_20 := batcalc.*(X_20,X_21); # 11 _20:bat[:oid,:int] :=
CMDbatMULcst_int_int_int(_20:bat[:oid,:int], _21:int) {G}
- z:bat[:oid,:int] {inline} := X_20; # 12 z:bat[:oid,:int] :=
_20:bat[:oid,:int] {G}
+ z:bat[:oid,:int] := X_20; # 12 z:bat[:oid,:int] :=
_20:bat[:oid,:int] {G}
end qry; # 13
# 18:00:44 >
diff --git a/monetdb5/optimizer/Tests/inlineFunction2.mal
b/monetdb5/optimizer/Tests/inlineFunction2.mal
--- a/monetdb5/optimizer/Tests/inlineFunction2.mal
+++ b/monetdb5/optimizer/Tests/inlineFunction2.mal
@@ -1,10 +1,11 @@
-function my{inline}(Av:int):int;
- X3 := Av+1;
+function my{inline}(A:int,B:int):int;
+ X3 := A+B;
return my:= X3;
end my;
function tst();
- z:bat[:oid,:int]:= mal.multiplex("user","my",1);
+ b:= bat.new(:oid,:int);
+ z:bat[:oid,:int]:= mal.multiplex("user","my",b,1);
end tst;
optimizer.inline("user","tst");
io.printf("#result of inline\n");
diff --git a/monetdb5/optimizer/Tests/inlineFunction2.stable.out
b/monetdb5/optimizer/Tests/inlineFunction2.stable.out
--- a/monetdb5/optimizer/Tests/inlineFunction2.stable.out
+++ b/monetdb5/optimizer/Tests/inlineFunction2.stable.out
@@ -16,12 +16,13 @@
# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:35482/
# MonetDB/GIS module loaded
# MonetDB/SQL module loaded
-function user.my{inline}(Av:int):int;
- X3 := calc.+(Av,1);
+function user.my{inline}(A:int,B:int):int;
+ X3 := calc.+(A,B);
return my := X3;
end my;
function user.tst():void;
- z:bat[:oid,:int] := mal.multiplex("user","my",1);
+ b := bat.new(:oid,:int);
+ z:bat[:oid,:int] := mal.multiplex("user","my",b,1);
end tst;
function user.main():void;
io.printf("#result of inline\n");
@@ -30,10 +31,12 @@
end main;
#result of inline
function user.tst():void;
- z:bat[:oid,:int] := mal.multiplex("user","my",1);
+ b := bat.new(:oid,:int);
+ X_11 := batcalc.+(b,1);
+ z:bat[:oid,:int] := X_11;
end tst;
-function user.my{inline}(Av:int):int;
- X3 := calc.+(Av,1);
+function user.my{inline}(A:int,B:int):int;
+ X3 := calc.+(A,B);
return my := X3;
end my;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
