Update of /cvsroot/monetdb/MonetDB5/tests/suite_00/Tests
In directory 
sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32295/tests/suite_00/Tests

Modified Files:
        test_00.stable.out test_02.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_00.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/tests/suite_00/Tests/test_00.stable.out,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- test_00.stable.out  19 Aug 2007 20:03:45 -0000      1.34
+++ test_00.stable.out  4 Oct 2007 10:37:45 -0000       1.35
@@ -319,7 +319,8 @@
 [ "version",             "25105"         ]
 [ "batId",               "tmp_10"        ]
 [ "batCacheid",                  "8"             ]
-[ "batParentid",         "0"             ]
+[ "hparentid",           "0"             ]
+[ "tparentid",           "0"             ]
 [ "batSharecnt",         "0"             ]
 [ "head",                "int"           ]
 [ "tail",                "int"           ]
@@ -329,14 +330,11 @@
 [ "batLRefcnt",                  "1"             ]
 [ "batDirty",            "dirty"         ]
 [ "batSet",              "0"             ]
-[ "void_tid",            "-1"            ]
-[ "void_cnt",            "0"             ]
 [ "hsorted",             "65"            ]
 [ "hident",              "h"             ]
 [ "hdense",              "0"             ]
 [ "hseqbase",            "[EMAIL PROTECTED]"             ]
 [ "hkey",                "0"             ]
-[ "hloc",                "0"             ]
 [ "hvarsized",           "0"             ]
 [ "halign",              "20000000"      ]
 [ "hnosorted",           "0"             ]
@@ -349,7 +347,6 @@
 [ "tseqbase",            "[EMAIL PROTECTED]"             ]
 [ "tsorted",             "65"            ]
 [ "tkey",                "0"             ]
-[ "tloc",                "4"             ]
 [ "tvarsized",           "0"             ]
 [ "talign",              "20000001"      ]
 [ "tnosorted",           "0"             ]
@@ -360,18 +357,24 @@
 [ "batInserted",         "0"             ]
 [ "batDeleted",                  "0"             ]
 [ "batFirst",            "0"             ]
-[ "top",                 "0"             ]
+[ "htop",                "0"             ]
+[ "ttop",                "0"             ]
 [ "batStamp",            "8"             ]
 [ "lastUsed",            "158"           ]
 [ "curStamp",            "9"             ]
 [ "batCopiedtodisk",     "0"             ]
 [ "batDirtydesc",        "dirty"         ]
 [ "batDirtybuns",        "clean"         ]
-[ "batBuns.free",        "0"             ]
-[ "batBuns.size",        "2048"          ]
-[ "batBuns.maxsize",     "2048"          ]
-[ "batBuns.storage",     "malloced"      ]
-[ "batBuns.filename",    "10.buns"       ]
+[ "head.free",           "0"             ]
+[ "head.size",           "1024"          ]
+[ "head.maxsize",        "1024"          ]
+[ "head.storage",        "malloced"      ]
+[ "head.filename",       "10.head"       ]
+[ "tail.free",           "0"             ]
+[ "tail.size",           "1024"          ]
+[ "tail.maxsize",        "1024"          ]
+[ "tail.storage",        "malloced"      ]
+[ "tail.filename",       "10.tail"       ]
 [ "hheapdirty",                  "clean"         ]
 [ "theapdirty",                  "clean"         ]
 #~EndVariableOutput~#

Index: test_02.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/tests/suite_00/Tests/test_02.stable.out,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- test_02.stable.out  19 Aug 2007 20:03:45 -0000      1.29
+++ test_02.stable.out  4 Oct 2007 10:37:46 -0000       1.30
@@ -156,7 +156,8 @@
 [ "version",             "25105"         ]
 [ "batId",               "tmp_10"        ]
 [ "batCacheid",                  "8"             ]
-[ "batParentid",         "0"             ]
+[ "hparentid",           "0"             ]
+[ "tparentid",           "0"             ]
 [ "batSharecnt",         "0"             ]
 [ "head",                "str"           ]
 [ "tail",                "int"           ]
@@ -166,14 +167,11 @@
 [ "batLRefcnt",                  "1"             ]
 [ "batDirty",            "dirty"         ]
 [ "batSet",              "0"             ]
-[ "void_tid",            "-1"            ]
-[ "void_cnt",            "0"             ]
 [ "hsorted",             "0"             ]
 [ "hident",              "h"             ]
 [ "hdense",              "0"             ]
 [ "hseqbase",            "[EMAIL PROTECTED]"             ]
 [ "hkey",                "0"             ]
-[ "hloc",                "0"             ]
 [ "hvarsized",           "1"             ]
 [ "halign",              "0"             ]
 [ "hnosorted",           "1"             ]
@@ -186,7 +184,6 @@
 [ "tseqbase",            "[EMAIL PROTECTED]"             ]
 [ "tsorted",             "65"            ]
 [ "tkey",                "1"             ]
-[ "tloc",                "8"             ]
 [ "tvarsized",           "0"             ]
 [ "talign",              "0"             ]
 [ "tnosorted",           "0"             ]
@@ -197,18 +194,24 @@
 [ "batInserted",         "0"             ]
 [ "batDeleted",                  "0"             ]
 [ "batFirst",            "0"             ]
-[ "top",                 "8"             ]
+[ "htop",                "64"            ]
+[ "ttop",                "32"            ]
 [ "batStamp",            "4"             ]
 [ "lastUsed",            "165"           ]
 [ "curStamp",            "5"             ]
 [ "batCopiedtodisk",     "0"             ]
 [ "batDirtydesc",        "dirty"         ]
 [ "batDirtybuns",        "clean"         ]
-[ "batBuns.free",        "128"           ]
-[ "batBuns.size",        "4096"          ]
-[ "batBuns.maxsize",     "4096"          ]
-[ "batBuns.storage",     "malloced"      ]
-[ "batBuns.filename",    "10.buns"       ]
+[ "head.free",           "64"            ]
+[ "head.size",           "2048"          ]
+[ "head.maxsize",        "2048"          ]
+[ "head.storage",        "malloced"      ]
+[ "head.filename",       "10.head"       ]
+[ "tail.free",           "32"            ]
+[ "tail.size",           "1024"          ]
+[ "tail.maxsize",        "1024"          ]
+[ "tail.storage",        "malloced"      ]
+[ "tail.filename",       "10.tail"       ]
 [ "hheapdirty",                  "clean"         ]
 [ "hheap.free",                  "8304"          ]
 [ "hheap.size",                  "11272"         ]


-------------------------------------------------------------------------
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

Reply via email to