Update of /cvsroot/monetdb/MonetDB4/tests/suite_00/Tests
In directory
sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30304/tests/suite_00/Tests
Modified Files:
test_00.stable.out test_02.stable.out test_60.stable.out
Log Message:
Merged GDK-2 branch into development branch.
Current changes were mostly started for
fixing the void concurrency problem
As a side action, the bun/bat layout was also changed.
We now have a split head and tail. This means many of the well known
macros are changed (ie BUN{h,t}{loc,var} BUN{head,tail})
BAT iteration now needs a special struct
BATiter which can be correctly created as
BATiter bi = bat_iterator(b);
TODO
1 some modules aren't ported (maybe be dropped as they aren't used)
2 some more bugs to find
Next improvements which are now possible
views based on 2 bats
(or a bat where head is real and the tail a view (or vs))
many more....
For a presentation about the changes, see
http://www.cwi.nl/~niels/download/gdk2.pdf
Index: test_02.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/tests/suite_00/Tests/test_02.stable.out,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- test_02.stable.out 22 Dec 2006 15:29:38 -0000 1.1
+++ test_02.stable.out 4 Oct 2007 10:35:47 -0000 1.2
@@ -26,10 +26,11 @@
# h t # name
# str str # type
#-----------------------------------------#
-[ "version", "20749" ]
-[ "batId", "tmp_33" ]
-[ "batCacheid", "27" ]
-[ "batParentid", "0" ]
+[ "version", "25105" ]
+[ "batId", "tmp_32" ]
+[ "batCacheid", "26" ]
+[ "hparentid", "0" ]
+[ "tparentid", "0" ]
[ "batSharecnt", "0" ]
[ "head", "str" ]
[ "tail", "int" ]
@@ -39,14 +40,11 @@
[ "batLRefcnt", "1" ]
[ "batDirty", "dirty" ]
[ "batSet", "0" ]
-[ "void_tid", "0" ]
-[ "void_cnt", "0" ]
[ "hsorted", "0" ]
[ "hident", "h" ]
[ "hdense", "0" ]
[ "hseqbase", "[EMAIL PROTECTED]" ]
[ "hkey", "0" ]
-[ "hloc", "0" ]
[ "hvarsized", "1" ]
[ "halign", "20000029" ]
[ "hnosorted", "1" ]
@@ -59,7 +57,6 @@
[ "tseqbase", "[EMAIL PROTECTED]" ]
[ "tsorted", "65" ]
[ "tkey", "1" ]
-[ "tloc", "4" ]
[ "tvarsized", "0" ]
[ "talign", "20000028" ]
[ "tnosorted", "0" ]
@@ -70,24 +67,30 @@
[ "batInserted", "0" ]
[ "batDeleted", "0" ]
[ "batFirst", "0" ]
-[ "top", "8" ]
-[ "batStamp", "-162" ]
-[ "lastUsed", "4995" ]
-[ "curStamp", "170" ]
+[ "htop", "64" ]
+[ "ttop", "32" ]
+[ "batStamp", "-114" ]
+[ "lastUsed", "4743" ]
+[ "curStamp", "122" ]
[ "batCopiedtodisk", "0" ]
[ "batDirtydesc", "dirty" ]
[ "batDirtybuns", "clean" ]
-[ "batBuns.free", "64" ]
-[ "batBuns.size", "400" ]
-[ "batBuns.maxsize", "400" ]
-[ "batBuns.storage", "malloced" ]
-[ "batBuns.filename", "33.buns" ]
+[ "head.free", "64" ]
+[ "head.size", "2048" ]
+[ "head.maxsize", "2048" ]
+[ "head.storage", "malloced" ]
+[ "head.filename", "32.head" ]
+[ "tail.free", "32" ]
+[ "tail.size", "1024" ]
+[ "tail.maxsize", "1024" ]
+[ "tail.storage", "malloced" ]
+[ "tail.filename", "32.tail" ]
[ "hheapdirty", "clean" ]
-[ "hheap.free", "4180" ]
-[ "hheap.size", "4700" ]
-[ "hheap.maxsize", "4700" ]
+[ "hheap.free", "8304" ]
+[ "hheap.size", "11272" ]
+[ "hheap.maxsize", "11272" ]
[ "hheap.storage", "malloced" ]
-[ "hheap.filename", "33.hheap" ]
+[ "hheap.filename", "32.hheap" ]
[ "theapdirty", "clean" ]
#~EndVariableOutput~#
print(find(s,"cello"));
Index: test_60.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/tests/suite_00/Tests/test_60.stable.out,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- test_60.stable.out 22 Dec 2006 15:29:42 -0000 1.1
+++ test_60.stable.out 4 Oct 2007 10:35:47 -0000 1.2
@@ -163,9 +163,9 @@
# BAT: tmp_46 #
# (int) (BAT) #
#-------------------------#
-[ 0, <tmp_64> ]
-[ 1, <tmp_65> ]
-[ 2, <tmp_66> ]
+[ 0, <tmp_61> ]
+[ 1, <tmp_62> ]
+[ 2, <tmp_63> ]
[EMAIL PROTECTED]() { $t.print(); }
#-----------------#
# BAT: tmp_47 #
Index: test_00.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/tests/suite_00/Tests/test_00.stable.out,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- test_00.stable.out 22 Dec 2006 15:29:38 -0000 1.1
+++ test_00.stable.out 4 Oct 2007 10:35:46 -0000 1.2
@@ -21,10 +21,11 @@
# h t # name
# str str # type
#-----------------------------------------#
-[ "version", "20749" ]
-[ "batId", "tmp_33" ]
-[ "batCacheid", "27" ]
-[ "batParentid", "0" ]
+[ "version", "25105" ]
+[ "batId", "tmp_32" ]
+[ "batCacheid", "26" ]
+[ "hparentid", "0" ]
+[ "tparentid", "0" ]
[ "batSharecnt", "0" ]
[ "head", "int" ]
[ "tail", "int" ]
@@ -34,14 +35,11 @@
[ "batLRefcnt", "1" ]
[ "batDirty", "dirty" ]
[ "batSet", "0" ]
-[ "void_tid", "0" ]
-[ "void_cnt", "0" ]
-[ "hsorted", "1" ]
+[ "hsorted", "65" ]
[ "hident", "h" ]
[ "hdense", "0" ]
[ "hseqbase", "[EMAIL PROTECTED]" ]
-[ "hkey", "0" ]
-[ "hloc", "0" ]
+[ "hkey", "1" ]
[ "hvarsized", "0" ]
[ "halign", "20000000" ]
[ "hnosorted", "0" ]
@@ -52,9 +50,8 @@
[ "tident", "t" ]
[ "tdense", "0" ]
[ "tseqbase", "[EMAIL PROTECTED]" ]
-[ "tsorted", "1" ]
-[ "tkey", "0" ]
-[ "tloc", "4" ]
+[ "tsorted", "65" ]
+[ "tkey", "1" ]
[ "tvarsized", "0" ]
[ "talign", "20000001" ]
[ "tnosorted", "0" ]
@@ -65,18 +62,24 @@
[ "batInserted", "0" ]
[ "batDeleted", "0" ]
[ "batFirst", "0" ]
-[ "top", "0" ]
-[ "batStamp", "-162" ]
-[ "lastUsed", "4888" ]
-[ "curStamp", "163" ]
+[ "htop", "0" ]
+[ "ttop", "0" ]
+[ "batStamp", "-114" ]
+[ "lastUsed", "4636" ]
+[ "curStamp", "115" ]
[ "batCopiedtodisk", "0" ]
-[ "batDirtydesc", "clean" ]
+[ "batDirtydesc", "dirty" ]
[ "batDirtybuns", "clean" ]
-[ "batBuns.free", "0" ]
-[ "batBuns.size", "400" ]
-[ "batBuns.maxsize", "400" ]
-[ "batBuns.storage", "malloced" ]
-[ "batBuns.filename", "33.buns" ]
+[ "head.free", "0" ]
+[ "head.size", "1024" ]
+[ "head.maxsize", "1024" ]
+[ "head.storage", "malloced" ]
+[ "head.filename", "32.head" ]
+[ "tail.free", "0" ]
+[ "tail.size", "1024" ]
+[ "tail.maxsize", "1024" ]
+[ "tail.storage", "malloced" ]
+[ "tail.filename", "32.tail" ]
[ "hheapdirty", "clean" ]
[ "theapdirty", "clean" ]
#~EndVariableOutput~#
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
