Changeset: 7d3adf14d7c2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7d3adf14d7c2
Modified Files:
monetdb5/optimizer/Tests/ARexample.malC
monetdb5/optimizer/Tests/ARexample.stable.out
monetdb5/optimizer/Tests/All
monetdb5/optimizer/Tests/CXexample.malC
monetdb5/optimizer/Tests/CXexample.stable.out
monetdb5/optimizer/Tests/DCexample.malC
monetdb5/optimizer/Tests/DCexample.stable.out
monetdb5/optimizer/Tests/DCexample2.malC
monetdb5/optimizer/Tests/FTexample.malC
monetdb5/optimizer/Tests/GCexample01.malC
monetdb5/optimizer/Tests/JPexample.malC
monetdb5/optimizer/Tests/Mexample.malC
monetdb5/optimizer/Tests/Mexample.stable.out
monetdb5/optimizer/Tests/cst00.stable.out
monetdb5/optimizer/Tests/cst01.stable.out
monetdb5/optimizer/Tests/cst02.malC
monetdb5/optimizer/Tests/cst02.stable.out
monetdb5/optimizer/Tests/dataflow.stable.out
monetdb5/optimizer/Tests/dataflow3.stable.out
monetdb5/optimizer/Tests/dataflow4.stable.out
monetdb5/optimizer/Tests/dataflow5.stable.out
monetdb5/optimizer/Tests/ifthencst.malC
monetdb5/optimizer/Tests/ifthencst.stable.out
monetdb5/optimizer/Tests/inline00.stable.out
monetdb5/optimizer/Tests/inline01.stable.out
monetdb5/optimizer/Tests/inline04.stable.out
monetdb5/optimizer/Tests/inlineFunction1.malC
monetdb5/optimizer/Tests/inlineFunction2.stable.out
monetdb5/optimizer/Tests/inlineFunction3.stable.out
monetdb5/optimizer/Tests/inlineFunction4.stable.out
monetdb5/optimizer/Tests/joinchain.malC
monetdb5/optimizer/Tests/manifold2.stable.out
monetdb5/optimizer/Tests/tst4000.malC
monetdb5/optimizer/Tests/tst4001.stable.out
monetdb5/optimizer/Tests/tst4002.malC
monetdb5/optimizer/Tests/tst4002.stable.out
monetdb5/optimizer/Tests/tst4003.malC
monetdb5/optimizer/Tests/tst4004.malC
monetdb5/optimizer/Tests/tst4005.stable.out
monetdb5/optimizer/Tests/tst4010.malC
monetdb5/optimizer/Tests/tst4030.malC
monetdb5/optimizer/Tests/tst4030.stable.out
monetdb5/optimizer/Tests/tst4601.malC
monetdb5/optimizer/Tests/tst4602.malC
monetdb5/optimizer/Tests/tst4630.stable.out
Branch: default
Log Message:
MAL test approvals
diffs (truncated from 1658 to 300 lines):
diff --git a/monetdb5/optimizer/Tests/ARexample.malC
b/monetdb5/optimizer/Tests/ARexample.malC
--- a/monetdb5/optimizer/Tests/ARexample.malC
+++ b/monetdb5/optimizer/Tests/ARexample.malC
@@ -1,3 +1,4 @@
+function foo();
i:=0;
b:= "done";
barrier go:= true;
@@ -9,4 +10,7 @@ barrier go:= true;
redo go:= i<2;
exit go;
io.print(b);
-optimizer.aliases();
+end;
+mdb.list("user","foo");
+optimizer.aliases("user","foo");
+mdb.list("user","foo");
diff --git a/monetdb5/optimizer/Tests/ARexample.stable.out
b/monetdb5/optimizer/Tests/ARexample.stable.out
--- a/monetdb5/optimizer/Tests/ARexample.stable.out
+++ b/monetdb5/optimizer/Tests/ARexample.stable.out
@@ -9,10 +9,40 @@ stdout of test 'ARexample` in directory
# Serving database 'mTests_src_optimizer', using 4 threads
# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008- MonetDB B.V., all rights reserved
-# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:32348/
-function user.main():void;
+# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://vienna.da.cwi.nl:37175/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-27236/.s.monetdb.37175
+# MonetDB/GIS module loaded
+# Start processing logs sql/sql_logs version 52200
+# Start reading the write-ahead log 'sql_logs/sql/log.4'
+# Finished reading the write-ahead log 'sql_logs/sql/log.4'
+# Finished processing logs sql/sql_logs
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+
+# 15:36:17 >
+# 15:36:17 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-27236" "--port=37175"
+# 15:36:17 >
+
+#mdb.list("user","foo");
+function user.foo():void;
+ i := 0;
+ b := "done";
+barrier go := true;
+ c := calc.+(i,1);
+ d := "step";
+ v := d;
+ io.print(v);
+ i := c;
+ redo go := calc.<(i,2);
+exit go;
+ io.print(b);
+end user.foo;
+#mdb.list("user","foo");
+function user.foo():void;
i := 0;
barrier go := true;
c := calc.+(i,1);
@@ -21,10 +51,7 @@ barrier go := true;
redo go := calc.<(i,2);
exit go;
io.print("done");
-end user.main;
-[ "step" ]
-[ "step" ]
-[ "done" ]
+end user.foo;
# 23:53:02 >
# 23:53:02 > Done.
diff --git a/monetdb5/optimizer/Tests/All b/monetdb5/optimizer/Tests/All
--- a/monetdb5/optimizer/Tests/All
+++ b/monetdb5/optimizer/Tests/All
@@ -9,8 +9,8 @@ tst4030
tst4601
tst4602
tst4630
-tst4700
-tst4701
+#tst4700 no compiler
+#tst4701
#qep00 deprecated optimizer
#qep01 ,,
diff --git a/monetdb5/optimizer/Tests/CXexample.malC
b/monetdb5/optimizer/Tests/CXexample.malC
--- a/monetdb5/optimizer/Tests/CXexample.malC
+++ b/monetdb5/optimizer/Tests/CXexample.malC
@@ -1,7 +1,6 @@
# The 4000 series deals with strategic optimizer constructs
# common subexpression evaluation
-optimizer.commonTerms();
-optimizer.aliases();
+function foo();
b:= bat.new(:oid,:int);
c:= bat.new(:oid,:int);
d:= algebra.subselect(b,0,100,true,true,false);
@@ -11,5 +10,10 @@ k2:= 27;
l:= k1+k2;
l2:= k1+k2;
l3:= l2+k1;
-mdb.List();
+end;
+mdb.List("user","foo");
+optimizer.commonTerms("user","foo");
+optimizer.aliases("user","foo");
+mdb.List("user","foo");
+
diff --git a/monetdb5/optimizer/Tests/CXexample.stable.out
b/monetdb5/optimizer/Tests/CXexample.stable.out
--- a/monetdb5/optimizer/Tests/CXexample.stable.out
+++ b/monetdb5/optimizer/Tests/CXexample.stable.out
@@ -9,31 +9,46 @@ stdout of test 'CXexample` in directory
# Serving database 'mTests_src_optimizer', using 4 threads
# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008- MonetDB B.V., all rights reserved
-# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:32348/
-function user.main():void;
-# The 4000 series deals with strategic optimizer constructs
-# common subexpression evaluation
- b := bat.new(:oid,:int);
- c := bat.new(:oid,:int);
- d := algebra.subselect(b,0,100,true,true,false);
- l := calc.+(24,27);
- l3 := calc.+(l,24);
- mdb.List();
-end user.main;
-function user.main():void; #[0] 0
-# The 4000 series deals with strategic optimizer constructs
-# common subexpression evaluation
- b:bat[:oid,:int] := bat.new(:oid,:int); #[3] CMDBATnew 5 <- 6 7
- c:bat[:oid,:int] := bat.new(:oid,:int); #[4] CMDBATnew 8 <- 6 7
- d:bat[:oid,:oid] :=
algebra.subselect(b:bat[:oid,:int],0:int,100:int,true:bit,true:bit,false:bit);
#[5] ALGsubselect1 9 <- 5 10 11 12 13 14
- l:int := calc.+(24:int,27:int); #[6] CMDvarADDsignal 20 <- 17
19
- l3:int := calc.+(l:int,24:int); #[7] CMDvarADDsignal 22 <- 20
17
- mdb.List(); #[8] MDBlistDetail 23
-end user.main; #[9]
+# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://vienna.da.cwi.nl:37175/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-27236/.s.monetdb.37175
+# MonetDB/GIS module loaded
+# Start processing logs sql/sql_logs version 52200
+# Start reading the write-ahead log 'sql_logs/sql/log.4'
+# Finished reading the write-ahead log 'sql_logs/sql/log.4'
+# Finished processing logs sql/sql_logs
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
-# 23:53:03 >
-# 23:53:03 > Done.
-# 23:53:03 >
+Ready.
+# 15:36:19 >
+# 15:36:19 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-27236" "--port=37175"
+# 15:36:19 >
+
+#mdb.List("user","foo");
+function user.foo():void; #[0] 0
+ b:bat[:oid,:int] := bat.new(:oid,:int); #[1] CMDBATnew 1 <- 2 3
+ c:bat[:oid,:int] := bat.new(:oid,:int); #[2] CMDBATnew 4 <- 2 3
+ d:bat[:oid,:oid] :=
algebra.subselect(b:bat[:oid,:int],0:int,100:int,true:bit,true:bit,false:bit);
#[3] ALGsubselect1 5 <- 1 6 7 8 9 10
+ e:bat[:oid,:oid] :=
algebra.subselect(b:bat[:oid,:int],0:int,100:int,true:bit,true:bit,false:bit);
#[4] ALGsubselect1 11 <- 1 6 7 8 8 10
+ k1:int := 24:int; #[5] 12 <- 13
+ k2:int := 27:int; #[6] 14 <- 15
+ l:int := calc.+(k1:int,k2:int); #[7] CMDvarADDsignal 16 <- 12
14
+ l2:int := calc.+(k1:int,k2:int); #[8] CMDvarADDsignal 17 <- 12
14
+ l3:int := calc.+(l2:int,k1:int); #[9] CMDvarADDsignal 18 <- 17
12
+end user.foo; #[10]
+#mdb.List("user","foo");
+function user.foo():void; #[0] 0
+ b:bat[:oid,:int] := bat.new(:oid,:int); #[1] CMDBATnew 1 <- 2 3
+ c:bat[:oid,:int] := bat.new(:oid,:int); #[2] CMDBATnew 4 <- 2 3
+ d:bat[:oid,:oid] :=
algebra.subselect(b:bat[:oid,:int],0:int,100:int,true:bit,true:bit,false:bit);
#[3] ALGsubselect1 5 <- 1 6 7 8 9 10
+ l:int := calc.+(24:int,27:int); #[4] CMDvarADDsignal 16 <- 13
15
+ l3:int := calc.+(l:int,24:int); #[5] CMDvarADDsignal 18 <- 16
13
+end user.foo; #[6]
+
+# 15:36:19 >
+# 15:36:19 > "Done."
+# 15:36:19 >
+
diff --git a/monetdb5/optimizer/Tests/DCexample.malC
b/monetdb5/optimizer/Tests/DCexample.malC
--- a/monetdb5/optimizer/Tests/DCexample.malC
+++ b/monetdb5/optimizer/Tests/DCexample.malC
@@ -1,3 +1,4 @@
+function foo();
V7 := bat.new(:oid,:oid);
V10 := bat.new(:oid,:oid);
V16 := V7;
@@ -7,6 +8,8 @@
V22 := bat.new(:oid,:oid);
(V17,V17b) :=
algebra.subjoin(V16,V22,nil:bat[:oid,:oid],nil:bat[:oid,:oid],true, 0:lng);
io.print("done");
+end;
-optimizer.deadcode();
-mdb.List();
+mdb.List("user","foo");
+optimizer.deadcode("user","foo");
+mdb.List("user","foo");
diff --git a/monetdb5/optimizer/Tests/DCexample.stable.out
b/monetdb5/optimizer/Tests/DCexample.stable.out
--- a/monetdb5/optimizer/Tests/DCexample.stable.out
+++ b/monetdb5/optimizer/Tests/DCexample.stable.out
@@ -9,18 +9,39 @@ stdout of test 'DCexample` in directory
# Serving database 'mTests_src_optimizer', using 4 threads
# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008- MonetDB B.V., all rights reserved
-# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:32348/
-function user.main():void;
- io.print("done");
- mdb.List();
-end user.main;
-[ "done" ]
-function user.main():void; #[0] 0
+# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://vienna.da.cwi.nl:37175/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-27236/.s.monetdb.37175
+# MonetDB/GIS module loaded
+# Start processing logs sql/sql_logs version 52200
+# Start reading the write-ahead log 'sql_logs/sql/log.4'
+# Finished reading the write-ahead log 'sql_logs/sql/log.4'
+# Finished processing logs sql/sql_logs
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+
+# 15:36:17 >
+# 15:36:17 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-27236" "--port=37175"
+# 15:36:17 >
+
+#mdb.List("user","foo");
+function user.foo():void; #[0] 0
+ V7:bat[:oid,:oid] := bat.new(:oid,:oid); #[1] CMDBATnew 1 <- 2 2
+ V10:bat[:oid,:oid] := bat.new(:oid,:oid); #[2] CMDBATnew 3 <- 2 2
+ V16:bat[:oid,:oid] := V7:bat[:oid,:oid]; #[3] 4 <- 1
+ (V17:bat[:oid,:oid],V17b:bat[:oid,:oid]) :=
algebra.subjoin(V16:bat[:oid,:oid],V7:bat[:oid,:oid],nil:bat[:oid,:oid],nil:bat[:oid,:oid],true:bit,0:lng);
#[4] ALGsubjoin 5 6 <- 4 1 7 8 9 10
+ V19:bat[:oid,:oid] := bat.new(:oid,:oid); #[5] CMDBATnew 11 <- 2 2
+ V22:bat[:oid,:oid] := bat.new(:oid,:oid); #[6] CMDBATnew 12 <- 2 2
+ (V17:bat[:oid,:oid],V17b:bat[:oid,:oid]) :=
algebra.subjoin(V16:bat[:oid,:oid],V22:bat[:oid,:oid],nil:bat[:oid,:oid],nil:bat[:oid,:oid],true:bit,0:lng);
#[7] ALGsubjoin 5 6 <- 4 12 13 14 9 10
+ io.print("done":str); #[8] IOprint_val 15 <- 16
+end user.foo; #[9]
+#mdb.List("user","foo");
+function user.foo():void; #[0] 0
io.print("done":str); #[1] IOprint_val 15 <- 16
- mdb.List(); #[2] MDBlistDetail 18
-end user.main; #[3]
+end user.foo; #[2]
# 23:53:03 >
# 23:53:03 > Done.
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,10 +1,12 @@
-#Suggested by Nayden.
-
+function foo();
b:= bat.new(:oid,:int);
bat.append(b,2);
bat.append(b,5);
bat.append(b,3);
b:= algebra.subsort(b,false,false);
+end;
+
#should throw out the last statement
-optimizer.deadcode();
-mdb.List();
+mdb.List("user","foo");
+optimizer.deadcode("user","foo");
+mdb.List("user","foo");
diff --git a/monetdb5/optimizer/Tests/FTexample.malC
b/monetdb5/optimizer/Tests/FTexample.malC
--- a/monetdb5/optimizer/Tests/FTexample.malC
+++ b/monetdb5/optimizer/Tests/FTexample.malC
@@ -6,5 +6,7 @@ function test(s:str):wrd;
i:= aggr.count(z);
return test:=i;
end test;
+mdb.List("user","test");
optimizer.factorize("user","test");
+mdb.List("user","qry");
mdb.List("user","test");
diff --git a/monetdb5/optimizer/Tests/GCexample01.malC
b/monetdb5/optimizer/Tests/GCexample01.malC
--- a/monetdb5/optimizer/Tests/GCexample01.malC
+++ b/monetdb5/optimizer/Tests/GCexample01.malC
@@ -21,5 +21,6 @@ barrier go:=true;
exit go;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
