Changeset: 564ec8ed4845 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=564ec8ed4845
Modified Files:
monetdb5/optimizer/Tests/DCexample2.malC
monetdb5/optimizer/Tests/DCexample2.stable.out
monetdb5/optimizer/Tests/dataflow3.malC
monetdb5/optimizer/Tests/dataflow3.stable.out
Branch: Jul2017
Log Message:
Approve output
diffs (95 lines):
diff --git a/monetdb5/optimizer/Tests/DCexample2.malC
b/monetdb5/optimizer/Tests/DCexample2.malC
--- a/monetdb5/optimizer/Tests/DCexample2.malC
+++ b/monetdb5/optimizer/Tests/DCexample2.malC
@@ -1,9 +1,9 @@
function foo();
b:= bat.new(:int);
-bat.append(b,2);
-bat.append(b,5);
-bat.append(b,3);
-b:= algebra.sort(b,false,false);
+b1:= bat.append(b,2);
+b2:= bat.append(b1,5);
+b3:= bat.append(b2,3);
+b5:= algebra.sort(b3,false,false);
end;
#should throw out the last statement
diff --git a/monetdb5/optimizer/Tests/DCexample2.stable.out
b/monetdb5/optimizer/Tests/DCexample2.stable.out
--- a/monetdb5/optimizer/Tests/DCexample2.stable.out
+++ b/monetdb5/optimizer/Tests/DCexample2.stable.out
@@ -31,18 +31,18 @@ Ready.
function user.foo():void; #[0] (0) 0
b:bat[:int] := bat.new(:int); #[1] (0) CMDBATnew 1 <- 2
- bat.append(b:bat[:int], 2:int); #[2] (0) BKCappend_val_wrap 3
<- 1 4
- bat.append(b:bat[:int], 5:int); #[3] (0) BKCappend_val_wrap 5
<- 1 6
- bat.append(b:bat[:int], 3:int); #[4] (0) BKCappend_val_wrap 7
<- 1 8
- b:bat[:int] := algebra.sort(b:bat[:int], false:bit, false:bit); #[5]
(0) ALGsort11 1 <- 1 9 10
-end user.foo; #[6] (0)
+ b1:bat[:int] := bat.append(b:bat[:int], 2:int); #[2] (0)
BKCappend_val_wrap 3 <- 1 4
+ b2:bat[:int] := bat.append(b1:bat[:int], 5:int); #[3] (0)
BKCappend_val_wrap 5 <- 3 6
+ b3:bat[:int] := bat.append(b2:bat[:int], 3:int); #[4] (0)
BKCappend_val_wrap 7 <- 5 8
+end user.foo; #[5] (0)
+#deadcode actions= 1 time=5 usec
function user.foo():void; #[0] (0) 0
b:bat[:int] := bat.new(:int); #[1] (0) CMDBATnew 1 <- 2
- bat.append(b:bat[:int], 2:int); #[2] (0) BKCappend_val_wrap 3
<- 1 4
- bat.append(b:bat[:int], 5:int); #[3] (0) BKCappend_val_wrap 5
<- 1 6
- bat.append(b:bat[:int], 3:int); #[4] (0) BKCappend_val_wrap 7
<- 1 8
- b:bat[:int] := algebra.sort(b:bat[:int], false:bit, false:bit); #[5]
(0) ALGsort11 1 <- 1 9 10
-end user.foo; #[6] (0)
+ b1:bat[:int] := bat.append(b:bat[:int], 2:int); #[2] (0)
BKCappend_val_wrap 3 <- 1 4
+ b2:bat[:int] := bat.append(b1:bat[:int], 5:int); #[3] (0)
BKCappend_val_wrap 5 <- 3 6
+ b3:bat[:int] := bat.append(b2:bat[:int], 3:int); #[4] (0)
BKCappend_val_wrap 7 <- 5 8
+end user.foo; #[5] (0)
+#deadcode actions= 1 time=5 usec
# 06:41:05 >
# 06:41:05 > "Done."
diff --git a/monetdb5/optimizer/Tests/dataflow3.malC
b/monetdb5/optimizer/Tests/dataflow3.malC
--- a/monetdb5/optimizer/Tests/dataflow3.malC
+++ b/monetdb5/optimizer/Tests/dataflow3.malC
@@ -37,14 +37,14 @@ function user.s1_0():void;
_507 := remote.get(_84,_87);
remote.disconnect(_84);
- bat.append(_17,_54);
- bat.append(_17,_55);
- bat.append(_17,_56);
- bat.append(_17,_57);
- io.print(_17);
+ _98 := bat.append(_17,_54);
+ _97 := bat.append(_98,_55);
+ _96 := bat.append(_97,_56);
+ _95 := bat.append(_96,_57);
+ io.print(_95);
#COUNT/SUM
- _19 := aggr.sum(_17);
+ _19 := aggr.sum(_95);
io.print(_19);
end s1_0;
optimizer.mergetable("user","s1_0");
diff --git a/monetdb5/optimizer/Tests/dataflow3.stable.out
b/monetdb5/optimizer/Tests/dataflow3.stable.out
--- a/monetdb5/optimizer/Tests/dataflow3.stable.out
+++ b/monetdb5/optimizer/Tests/dataflow3.stable.out
@@ -57,12 +57,12 @@ exit X_52;
X88 := remote.exec(X84, "user", "s1_0map");
X507 := remote.get(X84, X87);
remote.disconnect(X84);
- bat.append(X17, X54);
- bat.append(X17, X55);
- bat.append(X17, X56);
- bat.append(X17, X57);
- io.print(X17);
- X19 := aggr.sum(X17);
+ X98 := bat.append(X17, X54);
+ X97 := bat.append(X98, X55);
+ X96 := bat.append(X97, X56);
+ X95 := bat.append(X96, X57);
+ io.print(X95);
+ X19 := aggr.sum(X95);
io.print(X19);
end user.s1_0;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
