Changeset: f44edf3c31f6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f44edf3c31f6
Removed Files:
monetdb5/mal/Tests/tst017.mal
monetdb5/optimizer/Tests/mat02.mal
monetdb5/optimizer/Tests/mat02.stable.err
monetdb5/optimizer/Tests/mat02.stable.out
monetdb5/optimizer/Tests/mat03.mal
monetdb5/optimizer/Tests/mat03.stable.err
monetdb5/optimizer/Tests/mat03.stable.out
monetdb5/optimizer/Tests/mat04.mal
monetdb5/optimizer/Tests/mat04.stable.err
monetdb5/optimizer/Tests/mat04.stable.out
Modified Files:
monetdb5/mal/Tests/All
monetdb5/mal/Tests/recycle03.mal
monetdb5/mal/Tests/recycle03.stable.out
monetdb5/mal/Tests/recycle04.mal
monetdb5/mal/Tests/recycle04.stable.out
monetdb5/mal/Tests/tst1602.mal
monetdb5/mal/Tests/tst1602.stable.out
monetdb5/mal/Tests/venks.mal
monetdb5/mal/Tests/venks.stable.out
Branch: Oct2014
Log Message:
Approve output and modified tests
diffs (truncated from 1470 to 300 lines):
diff --git a/monetdb5/mal/Tests/All b/monetdb5/mal/Tests/All
--- a/monetdb5/mal/Tests/All
+++ b/monetdb5/mal/Tests/All
@@ -14,7 +14,6 @@ tst013
tst014
tst015
tst016
-tst017
tst018
tst019
tst020
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.join(s1,b);
+ j:= algebra.semijoin(s1,b);
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.join(s1,b);
+ j := algebra.semijoin(s1,b);
io.print(j);
end qry;
#
@@ -85,62 +85,57 @@ 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.join(s1,b);
+ j := algebra.semijoin(s1,b);
io.print(j);
end qry;
[ "start" ]
#-----------------#
# h t # name
-# void int # type
-#-----------------#
-[ 0@0, 1 ]
-[ 1@0, 2 ]
-[ 2@0, 3 ]
-[ 3@0, 4 ]
-[ 4@0, 5 ]
-[ 5@0, 6 ]
-[ 6@0, 7 ]
-[ 7@0, 8 ]
-[ 8@0, 9 ]
-[ 9@0, 10 ]
+# 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 ]
[ "zoom in" ]
#-----------------#
# h t # name
-# void int # type
-#-----------------#
-[ 0@0, 1 ]
-[ 1@0, 2 ]
-[ 2@0, 3 ]
-[ 3@0, 4 ]
-[ 4@0, 5 ]
+# void void # type
+#--------------------------#
+[ 0@0, 1@0 ]
+[ 1@0, 2@0 ]
+[ 2@0, 3@0 ]
+[ 3@0, 4@0 ]
+[ 4@0, 5@0 ]
[ "next step" ]
#-----------------#
# h t # name
-# void int # type
-#-----------------#
-[ 0@0, 2 ]
-[ 1@0, 3 ]
+# void void # type
+#--------------------------#
+[ 0@0, 2@0 ]
+[ 1@0, 3@0 ]
[ "last" ]
#-----------------#
# h t # name
-# void int # type
-#-----------------#
-[ 0@0, 1 ]
-[ 1@0, 2 ]
-[ 2@0, 3 ]
-[ 3@0, 4 ]
-[ 4@0, 5 ]
-[ 5@0, 6 ]
-[ 6@0, 7 ]
-[ 7@0, 8 ]
-[ 8@0, 9 ]
-[ 9@0, 10 ]
-#RECYCLER CATALOG admission ADM_ALL
-#CACHE= policy PROFIT limit= 20000
-#RESOURCES hard stmt = 20000 hard var = 100000 hard mem=16741163008
-#recycled = 8 incache= 11 executed = 1560 memory(KB)= 896 PersBat memory=0
-#RPremoved = 0 RPactive= 11 RPmisses = 0
-#Cache search time= 0(usec)
+# 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
# 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.join(s1,b);
+ j:= algebra.semijoin(s1,b);
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.join(s1,b);
+ j := algebra.semijoin(s1,b);
io.print(j);
end qry;
#recycle instruction: m := sql.mvc();
@@ -78,7 +78,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.join(s1,b);
+ j := algebra.semijoin(s1,b);
io.print(j);
end qry;
[ "start" ]
@@ -91,16 +91,16 @@ end qry;
# h t # name
# void int # type
#--------------------------#
-[ 0@0, 1 ]
-[ 1@0, 2 ]
-[ 2@0, 3 ]
-[ 3@0, 4 ]
-[ 4@0, 5 ]
-[ 5@0, 6 ]
-[ 6@0, 7 ]
-[ 7@0, 8 ]
-[ 8@0, 9 ]
-[ 9@0, 10 ]
+[ 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 ]
[ "zoom in" ]
#REUSED [ 0] m := sql.mvc();
#REUSED [ 1] x:bat[:oid,:oid] := sql.tid(m,"sys","tbl");
@@ -113,11 +113,11 @@ end qry;
# h t # name
# void int # type
#--------------------------#
-[ 0@0, 1 ]
-[ 1@0, 2 ]
-[ 2@0, 3 ]
-[ 3@0, 4 ]
-[ 4@0, 5 ]
+[ 0@0, 1@0 ]
+[ 1@0, 2@0 ]
+[ 2@0, 3@0 ]
+[ 3@0, 4@0 ]
+[ 4@0, 5@0 ]
[ "next step" ]
#POOL BEFORE CLEANUP
#RECYCLER CATALOG admission ADM_ALL
@@ -159,8 +159,8 @@ end qry;
# h t # name
# void int # type
#--------------------------#
-[ 0@0, 2 ]
-[ 1@0, 3 ]
+[ 0@0, 2@0 ]
+[ 1@0, 3@0 ]
[ "last" ]
#REUSED [ 0] m := sql.mvc();
#REUSED [ 1] x:bat[:oid,:oid] := sql.tid(m,"sys","tbl");
@@ -171,22 +171,27 @@ end qry;
# h t # name
# void int # type
#--------------------------#
-[ 0@0, 1 ]
-[ 1@0, 2 ]
-[ 2@0, 3 ]
-[ 3@0, 4 ]
-[ 4@0, 5 ]
-[ 5@0, 6 ]
-[ 6@0, 7 ]
-[ 7@0, 8 ]
-[ 8@0, 9 ]
-[ 9@0, 10 ]
-#RECYCLER CATALOG admission ADM_ALL
-#CACHE= policy PROFIT limit= 20000
-#RESOURCES hard stmt = 20000 hard var = 100000 hard mem=16741163008
-#recycled = 7 incache= 7 executed = 1574 memory(KB)= 944 PersBat memory=0
-#RPremoved = 0 RPactive= 7 RPmisses = 0
-#Cache search time= 0(usec)
+[ 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
+# 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");
+#2 2 925058 0 48 X_15 :=
sql.bind(X_0=1,X_2="sys",X_1="tbl",X_5="col",X_4=0);
+#3 1 9 136 0 X_18 :=
algebra.subselect(X_15=<tmp_1036>,X_3=<tmp_1027>,X_17=2,X_16=3,X_8=true,X_8=true,X_7=false);
+#4 1 10 48 0 X_19 :=
algebra.semijoin(X_18=<tmp_1035>,X_15=<tmp_1036>);
+#5 1 10 136 0 X_21 :=
algebra.subselect(X_15=<tmp_1036>,X_3=<tmp_1027>,X_0=1,X_20=11,X_8=true,X_8=true,X_7=false);
+#6 1 6 48 0 X_22 :=
algebra.semijoin(X_21=<tmp_1041>,X_15=<tmp_1036>);
+#RECYCLE drop
+#RECYCLER CATALOG cached 7 instructions, MAL recycled = 12 total MAL executed
= 1744 memory= 184 total searchtime=26.25(usec) savings=7398704
# CL lru cnt ticks rd wr Instr
# 0 427369 4 44 0 0 X_0 := sql.mvc();
# 1 427380 4 57 88 0 X_1 :=
sql.tid(1,"sys","tbl");
diff --git a/monetdb5/mal/Tests/tst017.mal b/monetdb5/mal/Tests/tst017.mal
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst017.mal
+++ /dev/null
@@ -1,9 +0,0 @@
-# reference setting tables
- b := bat.new(:oid,nil:int);
- aa_a := bat.append(b,1);
- ba_a := bat.append(b,2);
- z := bbp.getLRefCount(b);
- io.print(z);
- br := bat.reverse(b);
- c := algebra.join(b,br);
- io.print(c);
diff --git a/monetdb5/mal/Tests/tst1602.mal b/monetdb5/mal/Tests/tst1602.mal
--- a/monetdb5/mal/Tests/tst1602.mal
+++ b/monetdb5/mal/Tests/tst1602.mal
@@ -21,8 +21,7 @@ exit sj_a;
mdb.setDebug(dbgmsk_restore);
t := alarm.time();
- ug_a := bat.reverse(int_1M);
- vg_a := algebra.join(int_1M,ug_a);
+ (vg_a,xg_b) := algebra.join(int_1M,int_1M);
wg_a := aggr.count(vg_a);
xg_a := io.printf("#count %d = ",wg_a);
x:= alarm.time();
@@ -31,8 +30,7 @@ mdb.setDebug(dbgmsk_restore);
t := alarm.time();
- ug_a := bat.reverse(int_1M);
- vg_a := algebra.join(int_1M,ug_a);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
