Changeset: 576753e17327 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=576753e17327
Modified Files:
monetdb5/mal/Tests/tst870.mal
monetdb5/mal/Tests/tst870.stable.out
Branch: Apr2011
Log Message:
replaced obsolete group.min() & group.max() by aggr.min() & aggr.max()
Old group.*() that did grouping on head and aggration on tail in one go
have recently been removed.
Hence, we replace them by an equialent combination of
group.new() & aggr.*() with the necessary compensations around.
diffs (75 lines):
diff --git a/monetdb5/mal/Tests/tst870.mal b/monetdb5/mal/Tests/tst870.mal
--- a/monetdb5/mal/Tests/tst870.mal
+++ b/monetdb5/mal/Tests/tst870.mal
@@ -17,9 +17,15 @@
oa_a := io.print(na_a);
pa_a := io.printf("#~EndVariableOutput~#\n");
+bt:=algebra.markH(b);
+hb:=algebra.markT(b);
+bh:=bat.reverse(hb);
+(e,m):=group.new(bh);
-g:= group.min(b);
+i:=aggr.min(bt,m,e);
+g:=algebra.join(hb,i);
io.print(g);
-h:= group.max(b);
+a:=aggr.max(bt,m,e);
+h:=algebra.join(hb,a);
io.print(h);
diff --git a/monetdb5/mal/Tests/tst870.stable.out
b/monetdb5/mal/Tests/tst870.stable.out
--- a/monetdb5/mal/Tests/tst870.stable.out
+++ b/monetdb5/mal/Tests/tst870.stable.out
@@ -50,9 +50,15 @@
na_a := bat.info(b);
oa_a := io.print(na_a);
pa_a := io.printf("#~EndVariableOutput~#\n");
- g := group.min(b);
+ bt := algebra.markH(b);
+ hb := algebra.markT(b);
+ bh := bat.reverse(hb);
+ (e,m) := group.new(bh);
+ i := aggr.min(bt,m,e);
+ g := algebra.join(hb,i);
io.print(g);
- h := group.max(b);
+ a := aggr.max(bt,m,e);
+ h := algebra.join(hb,a);
io.print(h);
end main;
#-----------------#
@@ -73,8 +79,8 @@
# h t # name
# str str # type
#-----------------------------------------#
-[ "batId", "tmp_10" ]
-[ "batCacheid", "8" ]
+[ "batId", "tmp_364" ]
+[ "batCacheid", "244" ]
[ "hparentid", "0" ]
[ "tparentid", "0" ]
[ "batSharecnt", "0" ]
@@ -121,9 +127,9 @@
[ "batFirst", "0" ]
[ "htop", "72" ]
[ "ttop", "72" ]
-[ "batStamp", "5" ]
-[ "lastUsed", "160" ]
-[ "curStamp", "6" ]
+[ "batStamp", "510" ]
+[ "lastUsed", "32838" ]
+[ "curStamp", "511" ]
[ "batCopiedtodisk", "0" ]
[ "batDirtydesc", "dirty" ]
[ "H->heap.dirty", "dirty" ]
@@ -139,7 +145,7 @@
[ "tail.maxsize", "2048" ]
[ "tail.storage", "malloced" ]
[ "tail.newstorage", "malloced" ]
-[ "tail.filename", "10.tail" ]
+[ "tail.filename", "03/364.tail" ]
[ "H->vheap->dirty", "clean" ]
[ "T->vheap->dirty", "clean" ]
#~EndVariableOutput~#
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
