Changeset: 190bf2e77fc3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=190bf2e77fc3
Removed Files:
monetdb5/mal/Tests/tst4700.mal
monetdb5/optimizer/Tests/common.mal
monetdb5/optimizer/Tests/common.stable.err
monetdb5/optimizer/Tests/common.stable.out
monetdb5/optimizer/Tests/common01.mal
monetdb5/optimizer/Tests/common01.stable.err
monetdb5/optimizer/Tests/common01.stable.out
monetdb5/optimizer/Tests/inliners.mal
monetdb5/optimizer/Tests/mapreduce00.mal
monetdb5/optimizer/Tests/reorder01.mal
monetdb5/optimizer/Tests/reorder01.stable.err
monetdb5/optimizer/Tests/reorder01.stable.out
monetdb5/optimizer/Tests/tst4631.mal
monetdb5/optimizer/Tests/tst4631.stable.err
monetdb5/optimizer/Tests/tst4631.stable.out
monetdb5/optimizer/Tests/tst4730.mal
monetdb5/optimizer/Tests/tst4730.stable.err
monetdb5/optimizer/Tests/tst4730.stable.out
monetdb5/tests/gdkTests/Tests/binsemijoin2.mal
monetdb5/tests/gdkTests/Tests/binsemijoin2.stable.err
monetdb5/tests/gdkTests/Tests/binsemijoin2.stable.out
monetdb5/tests/suite_00/Tests/All
monetdb5/tests/suite_00/Tests/test_10.mal
monetdb5/tests/suite_00/Tests/test_10.stable.err
monetdb5/tests/suite_00/Tests/test_10.stable.out
monetdb5/tests/suite_00/Tests/test_40.mal
monetdb5/tests/suite_00/Tests/test_40.stable.err
monetdb5/tests/suite_00/Tests/test_40.stable.out
monetdb5/tests/suite_00/Tests/test_50.mal
monetdb5/tests/suite_00/Tests/test_50.stable.err
monetdb5/tests/suite_00/Tests/test_50.stable.out
Modified Files:
monetdb5/mal/Tests/recycle03.mal
monetdb5/mal/Tests/recycle03.stable.out
monetdb5/mal/Tests/recycle04.mal
monetdb5/mal/Tests/recycle04.stable.out
monetdb5/optimizer/Tests/All
monetdb5/tests/BugReports/Tests/no.051.mal
monetdb5/tests/BugReports/Tests/no.051.stable.out
monetdb5/tests/gdkTests/Tests/All
Branch: default
Log Message:
Approve output
diffs (truncated from 4284 to 300 lines):
diff --git a/monetdb5/mal/Tests/recycle03.mal b/monetdb5/mal/Tests/recycle03.mal
--- a/monetdb5/mal/Tests/recycle03.mal
+++ b/monetdb5/mal/Tests/recycle03.mal
@@ -36,7 +36,7 @@ function qry(low:int, hgh:int);
x:bat[:oid,:oid] := sql.tid(m,"sys","tbl");
b:bat[:oid,:int]:= sql.bind(m,"sys","tbl","col",0);
s1:= algebra.subselect(b,x,low,hgh,true,true,false);
- j:= algebra.semijoin(s1,b);
+ j:= aggr.count(s1);
io.print(j);
end qry;
diff --git a/monetdb5/mal/Tests/recycle03.stable.out
b/monetdb5/mal/Tests/recycle03.stable.out
--- a/monetdb5/mal/Tests/recycle03.stable.out
+++ b/monetdb5/mal/Tests/recycle03.stable.out
@@ -49,7 +49,7 @@ function sql.qry(low:int,hgh:int):void;
x:bat[:oid,:oid] := sql.tid(m,"sys","tbl");
b:bat[:oid,:int] := sql.bind(m,"sys","tbl","col",0);
s1 := algebra.subselect(b,x,low,hgh,true,true,false);
- j := algebra.semijoin(s1,b);
+ j := aggr.count(s1);
io.print(j);
end qry;
#
@@ -85,57 +85,40 @@ function sql.qry(low:int,hgh:int):void;
x:bat[:oid,:oid] := sql.tid(m,"sys","tbl");
b:bat[:oid,:int] := sql.bind(m,"sys","tbl","col",0);
s1 := algebra.subselect(b,x,low,hgh,true,true,false);
- j := algebra.semijoin(s1,b);
+ j := aggr.count(s1);
io.print(j);
end qry;
[ "start" ]
-#-----------------#
-# h t # name
-# void void # type
-#--------------------------#
-[ 0@0, 1@0 ]
-[ 1@0, 2@0 ]
-[ 2@0, 3@0 ]
-[ 3@0, 4@0 ]
-[ 4@0, 5@0 ]
-[ 5@0, 6@0 ]
-[ 6@0, 7@0 ]
-[ 7@0, 8@0 ]
-[ 8@0, 9@0 ]
-[ 9@0, 10@0 ]
+#RECYCLE [ 0] cost 5 mem 0 srch -nan X_0 := sql.mvc();
+#RECYCLE [ 1] cost 48 mem 88 srch 17.00 X_3 :=
sql.tid(X_0=1,X_2="sys",X_1="tbl");
+#RECYCLE [ 2] cost 29 mem 48 srch 16.50 X_6 :=
sql.bind(X_0=1,X_2="sys",X_1="tbl",X_5="col",X_4=0);
+#RECYCLE [ 3] cost 12 mem 0 srch 15.00 X_10 :=
algebra.subselect(X_6=<tmp_1255>,X_3=<tmp_1254>,X_0=1,X_9=10,X_8=true,X_8=true,X_7=false);
+#RECYCLE [ 4] cost 1 mem 0 srch 14.50 X_11 := aggr.count(X_10=<tmp_1256>);
+[ 10 ]
[ "zoom in" ]
-#-----------------#
-# h t # name
-# void void # type
-#--------------------------#
-[ 0@0, 1@0 ]
-[ 1@0, 2@0 ]
-[ 2@0, 3@0 ]
-[ 3@0, 4@0 ]
-[ 4@0, 5@0 ]
+#REUSED [ 0] 729590 (usec) X_0 := sql.mvc();
+#REUSED [ 1] 729594 (usec) X_3 := sql.tid(X_0=1,X_2="sys",X_1="tbl");
+#REUSED [ 2] 729599 (usec) X_6 :=
sql.bind(X_0=1,X_2="sys",X_1="tbl",X_5="col",X_4=0);
+#RECYCLE [ 5] cost 10 mem 0 srch 12.80 X_13 :=
algebra.subselect(X_6=<tmp_1255>,X_10=<tmp_1256>,X_0=1,X_12=5,X_8=true,X_8=true,X_7=false);
+#REUSED [ 3] 12 (usec) X_10 :=
algebra.subselect(X_6=<tmp_1255>,X_3=<tmp_1254>,X_0=1,X_9=10,X_8=true,X_8=true,X_7=false);
+#RECYCLE [ 6] cost 1 mem 0 srch 12.83 X_14 := aggr.count(X_13=<tmp_1257>);
+[ 5 ]
[ "next step" ]
-#-----------------#
-# h t # name
-# void void # type
-#--------------------------#
-[ 0@0, 2@0 ]
-[ 1@0, 3@0 ]
+#REUSED [ 0] 729646 (usec) X_0 := sql.mvc();
+#REUSED [ 1] 729648 (usec) X_3 := sql.tid(X_0=1,X_2="sys",X_1="tbl");
+#REUSED [ 2] 729653 (usec) X_6 :=
sql.bind(X_0=1,X_2="sys",X_1="tbl",X_5="col",X_4=0);
+#RECYCLE [ 7] cost 8 mem 0 srch 11.86 X_17 :=
algebra.subselect(X_6=<tmp_1255>,X_13=<tmp_1257>,X_16=2,X_15=3,X_8=true,X_8=true,X_7=false);
+#REUSED [ 5] 10 (usec) X_13 :=
algebra.subselect(X_6=<tmp_1255>,X_10=<tmp_1256>,X_0=1,X_12=5,X_8=true,X_8=true,X_7=false);
+#RECYCLE [ 8] cost 1 mem 0 srch 11.88 X_18 := aggr.count(X_17=<tmp_1260>);
+[ 2 ]
[ "last" ]
-#-----------------#
-# h t # name
-# void void # type
-#--------------------------#
-[ 0@0, 1@0 ]
-[ 1@0, 2@0 ]
-[ 2@0, 3@0 ]
-[ 3@0, 4@0 ]
-[ 4@0, 5@0 ]
-[ 5@0, 6@0 ]
-[ 6@0, 7@0 ]
-[ 7@0, 8@0 ]
-[ 8@0, 9@0 ]
-[ 9@0, 10@0 ]
-#RECYCLER CATALOG cached 11 instructions, MAL recycled = 7 total MAL executed
= 1729 memory= 136 total searchtime=26.73(usec) savings=5564932
+#REUSED [ 0] 729697 (usec) X_0 := sql.mvc();
+#REUSED [ 1] 729699 (usec) X_3 := sql.tid(X_0=1,X_2="sys",X_1="tbl");
+#REUSED [ 2] 729704 (usec) X_6 :=
sql.bind(X_0=1,X_2="sys",X_1="tbl",X_5="col",X_4=0);
+#RECYCLE [ 9] cost 12 mem 0 srch 11.11 X_20 :=
algebra.subselect(X_6=<tmp_1255>,X_3=<tmp_1254>,X_0=1,X_19=11,X_8=true,X_8=true,X_7=false);
+#RECYCLE [ 10] cost 1 mem 0 srch 11.20 X_21 := aggr.count(X_20=<tmp_1261>);
+[ 10 ]
+#RECYCLER CATALOG cached 11 instructions, MAL recycled = 7 total MAL executed
= 99 memory= 136 total searchtime=10.73(usec) savings=6566830
# CL lru cnt ticks rd wr Instr
# 0 123173 4 47 0 0 X_0 := sql.mvc();
# 1 123183 4 58 88 0 X_1 :=
sql.tid(1,"sys","tbl");
diff --git a/monetdb5/mal/Tests/recycle04.mal b/monetdb5/mal/Tests/recycle04.mal
--- a/monetdb5/mal/Tests/recycle04.mal
+++ b/monetdb5/mal/Tests/recycle04.mal
@@ -36,7 +36,7 @@ function qry(low:int, hgh:int);
x:bat[:oid,:oid] := sql.tid(m,"sys","tbl");
b:bat[:oid,:int]:= sql.bind(m,"sys","tbl","col",0);
s1:= algebra.subselect(b,x,low,hgh,true,true,false);
- j:= algebra.semijoin(s1,b);
+ j:= aggr.count(s1);
io.print(j);
end qry;
diff --git a/monetdb5/mal/Tests/recycle04.stable.out
b/monetdb5/mal/Tests/recycle04.stable.out
--- a/monetdb5/mal/Tests/recycle04.stable.out
+++ b/monetdb5/mal/Tests/recycle04.stable.out
@@ -50,7 +50,7 @@ function sql.qry(low:int,hgh:int):void;
x:bat[:oid,:oid] := sql.tid(m,"sys","tbl");
b:bat[:oid,:int] := sql.bind(m,"sys","tbl","col",0);
s1 := algebra.subselect(b,x,low,hgh,true,true,false);
- j := algebra.semijoin(s1,b);
+ j := aggr.count(s1);
io.print(j);
end qry;
#recycle instruction: m := sql.mvc();
@@ -78,110 +78,45 @@ function sql.qry(low:int,hgh:int):void;
x:bat[:oid,:oid] := sql.tid(m,"sys","tbl");
b:bat[:oid,:int] := sql.bind(m,"sys","tbl","col",0);
s1 := algebra.subselect(b,x,low,hgh,true,true,false);
- j := algebra.semijoin(s1,b);
+ j := aggr.count(s1);
io.print(j);
end qry;
[ "start" ]
-#RECYCLE [ 0] X_0 := sql.mvc();
-#RECYCLE [ 1] X_1 := sql.tid(1,"sys","tbl");
-#RECYCLE [ 2] X_4 := sql.bind(1,"sys","tbl","col",0);
-#RECYCLE [ 3] X_7 :=
algebra.subselect(<tmp_1156>,<tmp_1155>,1,10,true,true,false);
-#RECYCLE [ 4] X_11 := algebra.join(<tmpr_1160>,<tmp_1156>);
-#--------------------------#
-# h t # name
-# void int # type
-#--------------------------#
-[ 0@0, 1@0 ]
-[ 1@0, 2@0 ]
-[ 2@0, 3@0 ]
-[ 3@0, 4@0 ]
-[ 4@0, 5@0 ]
-[ 5@0, 6@0 ]
-[ 6@0, 7@0 ]
-[ 7@0, 8@0 ]
-[ 8@0, 9@0 ]
-[ 9@0, 10@0 ]
+#RECYCLE [ 0] cost 5 mem 0 srch -nan X_0 := sql.mvc();
+#RECYCLE [ 1] cost 50 mem 88 srch 14.00 X_3 :=
sql.tid(X_0=1,X_2="sys",X_1="tbl");
+#RECYCLE [ 2] cost 33 mem 48 srch 15.50 X_6 :=
sql.bind(X_0=1,X_2="sys",X_1="tbl",X_5="col",X_4=0);
+#RECYCLE [ 3] cost 15 mem 0 srch 17.00 X_10 :=
algebra.subselect(X_6=<tmp_1255>,X_3=<tmp_1254>,X_0=1,X_9=10,X_8=true,X_8=true,X_7=false);
+#RECYCLE [ 4] cost 1 mem 0 srch 16.25 X_11 := aggr.count(X_10=<tmp_1256>);
+[ 10 ]
[ "zoom in" ]
-#REUSED [ 0] m := sql.mvc();
-#REUSED [ 1] x:bat[:oid,:oid] := sql.tid(m,"sys","tbl");
-#REUSED [ 2] b:bat[:oid,:int] := sql.bind(m,"sys","tbl","col",0);
-#RECYCLEreuse subselect using candidate list X_7 :=
algebra.subselect(<tmp_1156>,<tmp_1155>,1,10,true,true,false);
-#RECYCLE [ 5] X_12 :=
algebra.subselect(<tmp_1156>,<tmpr_1160>,1,5,true,true,false);
-#REUSED [ 3] s1 := algebra.subselect(b,x,low,hgh,true,true,false);
-#RECYCLE [ 6] X_14 := algebra.join(<tmpr_1166>,<tmp_1156>);
-#--------------------------#
-# h t # name
-# void int # type
-#--------------------------#
-[ 0@0, 1@0 ]
-[ 1@0, 2@0 ]
-[ 2@0, 3@0 ]
-[ 3@0, 4@0 ]
-[ 4@0, 5@0 ]
+#REUSED [ 0] 989767 (usec) X_0 := sql.mvc();
+#REUSED [ 1] 989770 (usec) X_3 := sql.tid(X_0=1,X_2="sys",X_1="tbl");
+#REUSED [ 2] 989777 (usec) X_6 :=
sql.bind(X_0=1,X_2="sys",X_1="tbl",X_5="col",X_4=0);
+#RECYCLE [ 5] cost 15 mem 0 srch 14.00 X_13 :=
algebra.subselect(X_6=<tmp_1255>,X_10=<tmp_1256>,X_0=1,X_12=5,X_8=true,X_8=true,X_7=false);
+#REUSED [ 3] 15 (usec) X_10 :=
algebra.subselect(X_6=<tmp_1255>,X_3=<tmp_1254>,X_0=1,X_9=10,X_8=true,X_8=true,X_7=false);
+#RECYCLE [ 6] cost 1 mem 0 srch 14.17 X_14 := aggr.count(X_13=<tmp_1257>);
+[ 5 ]
[ "next step" ]
-#POOL BEFORE CLEANUP
-#RECYCLER CATALOG admission ADM_ALL
-#CACHE= policy PROFIT limit= 20000
-#RESOURCES hard stmt = 20000 hard var = 100000 hard mem=16741163008
-#recycled = 3 incache= 7 executed = 1538 memory(KB)= 480 PersBat memory=0
-#RPremoved = 0 RPactive= 7 RPmisses = 0
-#Cache search time= 0(usec)
-# CL lru cnt ticks rd wr Instr
-# 0 426684 2 44 0 0 X_0 := sql.mvc();
-# 1 426694 2 57 88 0 X_1 :=
sql.tid(1,"sys","tbl");
-# 2 426706 2 41 48 0 X_4 :=
sql.bind(1,"sys","tbl","col",0);
-# 3 426740 2 36 80 136 X_7 :=
algebra.subselect(<tmp_1156>,<tmp_1155>,1,10,true,true,false);
-# 4 426598 1 60 0 128 X_11 :=
algebra.join(<tmpr_1160>,<tmp_1156>);
-# 5 426730 1 26 40 128 X_12 :=
algebra.subselect(<tmp_1156>,<tmpr_1160>,1,5,true,true,false);
-# 6 426768 1 49 0 88 X_14 :=
algebra.join(<tmpr_1166>,<tmp_1156>);
-#RECYCLEcolumn 2 3 5
-#Marked for eviction [2] X_4 := sql.bind(1,"sys","tbl","col",0);
-#Marked for eviction [3] X_7 :=
algebra.subselect(<tmp_1156>,<tmp_1155>,1,10,true,true,false);
-#Marked for eviction [4] X_11 := algebra.join(<tmpr_1160>,<tmp_1156>);
-#Marked for eviction [5] X_12 :=
algebra.subselect(<tmp_1156>,<tmpr_1160>,1,5,true,true,false);
-#Marked for eviction [6] X_14 := algebra.join(<tmpr_1166>,<tmp_1156>);
-#POOL AFTER CLEANUP
-#RECYCLER CATALOG admission ADM_ALL
-#CACHE= policy PROFIT limit= 20000
-#RESOURCES hard stmt = 20000 hard var = 100000 hard mem=16741163008
-#recycled = 3 incache= 2 executed = 1538 memory(KB)= 480 PersBat memory=0
-#RPremoved = 0 RPactive= 2 RPmisses = 0
-#Cache search time= 0(usec)
-# CL lru cnt ticks rd wr Instr
-# 0 426684 2 44 0 0 X_0 := sql.mvc();
-# 1 426694 2 57 88 0 X_1 :=
sql.tid(1,"sys","tbl");
-#REUSED [ 0] m := sql.mvc();
-#REUSED [ 1] x:bat[:oid,:oid] := sql.tid(m,"sys","tbl");
-#RECYCLE [ 2] X_15 := sql.bind(1,"sys","tbl","col",0);
-#RECYCLE [ 3] X_16 :=
algebra.subselect(<tmp_1165>,<tmp_1155>,2,3,true,true,false);
-#RECYCLE [ 4] X_19 := algebra.join(<tmpr_1167>,<tmp_1165>);
-#--------------------------#
-# h t # name
-# void int # type
-#--------------------------#
-[ 0@0, 2@0 ]
-[ 1@0, 3@0 ]
+#RECYCLEcolumn 2 1 5
+#Marked for eviction [2] X_6 :=
sql.bind(X_0=1,X_2="sys",X_1="tbl",X_5="col",X_4=0);
+#Marked for eviction [3] X_10 :=
algebra.subselect(X_6=<tmp_1255>,X_3=<tmp_1254>,X_0=1,X_9=10,X_8=true,X_8=true,X_7=false);
+#Marked for eviction [4] X_11 := aggr.count(X_10=<tmp_1256>);
+#Marked for eviction [5] X_13 :=
algebra.subselect(X_6=<tmp_1255>,X_10=<tmp_1256>,X_0=1,X_12=5,X_8=true,X_8=true,X_7=false);
+#Marked for eviction [6] X_14 := aggr.count(X_13=<tmp_1257>);
+#REUSED [ 0] 989862 (usec) X_0 := sql.mvc();
+#REUSED [ 1] 989865 (usec) X_3 := sql.tid(X_0=1,X_2="sys",X_1="tbl");
+#RECYCLE [ 2] cost 23 mem 48 srch 13.00 X_15 :=
sql.bind(X_0=1,X_2="sys",X_1="tbl",X_5="col",X_4=0);
+#RECYCLE [ 3] cost 10 mem 0 srch 12.50 X_18 :=
algebra.subselect(X_15=<tmp_1260>,X_3=<tmp_1254>,X_17=2,X_16=3,X_8=true,X_8=true,X_7=false);
+#RECYCLE [ 4] cost 1 mem 0 srch 12.44 X_19 := aggr.count(X_18=<tmp_1261>);
+[ 2 ]
[ "last" ]
-#REUSED [ 0] m := sql.mvc();
-#REUSED [ 1] x:bat[:oid,:oid] := sql.tid(m,"sys","tbl");
-#REUSED [ 2] b:bat[:oid,:int] := sql.bind(m,"sys","tbl","col",0);
-#RECYCLE [ 5] X_20 :=
algebra.subselect(<tmp_1165>,<tmp_1155>,1,11,true,true,false);
-#RECYCLE [ 6] X_22 := algebra.join(<tmpr_1175>,<tmp_1165>);
-#--------------------------#
-# h t # name
-# void int # type
-#--------------------------#
-[ 0@0, 1@0 ]
-[ 1@0, 2@0 ]
-[ 2@0, 3@0 ]
-[ 3@0, 4@0 ]
-[ 4@0, 5@0 ]
-[ 5@0, 6@0 ]
-[ 6@0, 7@0 ]
-[ 7@0, 8@0 ]
-[ 8@0, 9@0 ]
-[ 9@0, 10@0 ]
-#RECYCLER CATALOG cached 7 instructions, MAL recycled = 12 total MAL executed
= 1743 memory= 184 total searchtime=26.25(usec) savings=7398704
+#REUSED [ 0] 989935 (usec) X_0 := sql.mvc();
+#REUSED [ 1] 989937 (usec) X_3 := sql.tid(X_0=1,X_2="sys",X_1="tbl");
+#REUSED [ 2] 989941 (usec) X_15 :=
sql.bind(X_0=1,X_2="sys",X_1="tbl",X_5="col",X_4=0);
+#RECYCLE [ 5] cost 9 mem 0 srch 11.70 X_21 :=
algebra.subselect(X_15=<tmp_1260>,X_3=<tmp_1254>,X_0=1,X_20=11,X_8=true,X_8=true,X_7=false);
+#RECYCLE [ 6] cost 1 mem 0 srch 11.64 X_22 := aggr.count(X_21=<tmp_1262>);
+[ 10 ]
+#RECYCLER CATALOG cached 7 instructions, MAL recycled = 12 total MAL executed
= 113 memory= 184 total searchtime=12.08(usec) savings=7918854
# CL lru cnt ticks rd wr Instr
#0 4 925030 0 0 X_0 := sql.mvc();
#1 4 925043 0 88 X_3 :=
sql.tid(X_0=1,X_2="sys",X_1="tbl");
diff --git a/monetdb5/mal/Tests/tst4700.mal b/monetdb5/mal/Tests/tst4700.mal
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst4700.mal
+++ /dev/null
@@ -1,108 +0,0 @@
-# The first MAL compiler test
-# the result is retained in MCCtst903.c
-# which can be compiled and linked with the system.
-
-
-function tst903();
- t0:= alarm.usec();
- b:= new(:void,:lng);
- barrier (go,i):= mal.newRange(0:lng);
- k:= rand();
- l:= lng(k);
- insert(b,nil,l);
- redo (go,i):= mal.nextElement(1:lng,1000000:lng);
- exit (go,i);
- t1:= alarm.usec();
- d0:= t1-t0;
- io.printf("#loop %d",d0);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
