Update of /cvsroot/monetdb/MonetDB4/tests/by_Peter/Tests
In directory 
sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30304/tests/by_Peter/Tests

Modified Files:
        tst_append_readonly.stable.out 
        tst_append_readonly_commit.stable.out tst_updatestr.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: tst_updatestr.stable.out
===================================================================
RCS file: 
/cvsroot/monetdb/MonetDB4/tests/by_Peter/Tests/tst_updatestr.stable.out,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- tst_updatestr.stable.out    22 Dec 2006 15:29:20 -0000      1.1
+++ tst_updatestr.stable.out    4 Oct 2007 10:35:42 -0000       1.2
@@ -65,8 +65,8 @@
 #---------------------------------#
 # h            t                 # name
 # oid          str               # type
-#---------------------------------#
-[ [EMAIL PROTECTED],     "1000000"       ]
+#-------------------------#
+[ [EMAIL PROTECTED],     "500001"        ]
 [ [EMAIL PROTECTED],             "500002"        ]
 [ [EMAIL PROTECTED],             "500003"        ]
 #-----------------------------------------#
@@ -79,8 +79,8 @@
 #---------------------------------#
 # h            t                 # name
 # oid          str               # type
-#---------------------------------#
-[ [EMAIL PROTECTED],     "1500000"       ]
+#-------------------------#
+[ [EMAIL PROTECTED],     "1000001"       ]
 [ [EMAIL PROTECTED],             "1000002"       ]
 [ [EMAIL PROTECTED],             "1000003"       ]
 #-----------------------------------------#
@@ -93,8 +93,8 @@
 #---------------------------------#
 # h            t                 # name
 # oid          str               # type
-#---------------------------------#
-[ [EMAIL PROTECTED],     "2000000"       ]
+#-------------------------#
+[ [EMAIL PROTECTED],     "1500001"       ]
 [ [EMAIL PROTECTED],             "1500002"       ]
 [ [EMAIL PROTECTED],             "1500003"       ]
 #-----------------------------------------#
@@ -107,8 +107,8 @@
 #---------------------------------#
 # h            t                 # name
 # oid          str               # type
-#---------------------------------#
-[ [EMAIL PROTECTED],     "2500000"       ]
+#-------------------------#
+[ [EMAIL PROTECTED],     "2000001"       ]
 [ [EMAIL PROTECTED],             "2000002"       ]
 [ [EMAIL PROTECTED],             "2000003"       ]
 
@@ -116,8 +116,8 @@
 #---------------------------------#
 # h            t                 # name
 # oid          str               # type
-#---------------------------------#
-[ [EMAIL PROTECTED],     "2500000"       ]
+#-------------------------#
+[ [EMAIL PROTECTED],     "2000001"       ]
 [ [EMAIL PROTECTED],             "2000002"       ]
 [ [EMAIL PROTECTED],             "2000003"       ]
 quit();

Index: tst_append_readonly.stable.out
===================================================================
RCS file: 
/cvsroot/monetdb/MonetDB4/tests/by_Peter/Tests/tst_append_readonly.stable.out,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- tst_append_readonly.stable.out      22 Dec 2006 15:29:20 -0000      1.1
+++ tst_append_readonly.stable.out      4 Oct 2007 10:35:42 -0000       1.2
@@ -55,16 +55,16 @@
 #-----------------------------------------#
 # t                    h                 # name
 # str                  str               # type
-#-----------------------------------------#
-[ "theap.storage",       "malloced"      ]
+#-------------------------------------------------#
+[ "theap.storage",       "memory mapped"         ]
 [ 80000 ]
 
 bat("aa").info().reverse().select("theap.storage").reverse().print();
 #-----------------------------------------#
 # t                    h                 # name
 # str                  str               # type
-#-----------------------------------------#
-[ "theap.storage",       "malloced"      ]
+#-------------------------------------------------#
+[ "theap.storage",       "memory mapped"         ]
 bat("aa").persists(false);
 commit();
 

Index: tst_append_readonly_commit.stable.out
===================================================================
RCS file: 
/cvsroot/monetdb/MonetDB4/tests/by_Peter/Tests/tst_append_readonly_commit.stable.out,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- tst_append_readonly_commit.stable.out       31 Dec 2006 01:00:24 -0000      
1.2
+++ tst_append_readonly_commit.stable.out       4 Oct 2007 10:35:42 -0000       
1.3
@@ -57,16 +57,16 @@
 #-----------------------------------------#
 # t                    h                 # name
 # str                  str               # type
-#-----------------------------------------#
-[ "theap.storage",       "malloced"      ]
+#-------------------------------------------------#
+[ "theap.storage",       "memory mapped"         ]
 [ 80000 ]
 
 bat("aa").info().reverse().select("theap.storage").reverse().print();
 #-----------------------------------------#
 # t                    h                 # name
 # str                  str               # type
-#-----------------------------------------#
-[ "theap.storage",       "malloced"      ]
+#-------------------------------------------------#
+[ "theap.storage",       "memory mapped"         ]
 bat("aa").persists(false);
 commit();
 


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