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

Modified Files:
        tst225.stable.out tst270.stable.out tst450.stable.out 
        tst870.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: tst870.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/Tests/tst870.stable.out,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- tst870.stable.out   3 Dec 2006 22:42:08 -0000       1.4
+++ tst870.stable.out   4 Oct 2007 10:37:11 -0000       1.5
@@ -74,9 +74,10 @@
 # str                  str               # type
 #-----------------------------------------#
 [ "version",             "25105"         ]
-[ "batId",               "tmp_7"         ]
-[ "batCacheid",                  "7"             ]
-[ "batParentid",         "0"             ]
+[ "batId",               "tmp_10"        ]
+[ "batCacheid",                  "8"             ]
+[ "hparentid",           "0"             ]
+[ "tparentid",           "0"             ]
 [ "batSharecnt",         "0"             ]
 [ "head",                "oid"           ]
 [ "tail",                "oid"           ]
@@ -86,14 +87,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",              "0"             ]
 [ "hnosorted",           "0"             ]
@@ -106,29 +104,34 @@
 [ "tseqbase",            "[EMAIL PROTECTED]"             ]
 [ "tsorted",             "0"             ]
 [ "tkey",                "0"             ]
-[ "tloc",                "8"             ]
 [ "tvarsized",           "0"             ]
 [ "talign",              "0"             ]
 [ "tnosorted",           "4"             ]
 [ "tnosorted_rev",       "0"             ]
-[ "tnodense",            "0"             ]
+[ "tnodense",            "4"             ]
 [ "tnokey[0]",           "3"             ]
 [ "tnokey[1]",           "4"             ]
 [ "batInserted",         "0"             ]
 [ "batDeleted",                  "0"             ]
 [ "batFirst",            "0"             ]
-[ "top",                 "9"             ]
+[ "htop",                "72"            ]
+[ "ttop",                "72"            ]
 [ "batStamp",            "4"             ]
 [ "lastUsed",            "167"           ]
 [ "curStamp",            "5"             ]
 [ "batCopiedtodisk",     "0"             ]
 [ "batDirtydesc",        "dirty"         ]
-[ "batDirtybuns",        "clean"         ]
-[ "batBuns.free",        "144"           ]
-[ "batBuns.size",        "4096"          ]
-[ "batBuns.maxsize",     "4096"          ]
-[ "batBuns.storage",     "malloced"      ]
-[ "batBuns.filename",    "7.buns"        ]
+[ "batDirtybuns",        "dirty"         ]
+[ "head.free",           "72"            ]
+[ "head.size",           "2048"          ]
+[ "head.maxsize",        "2048"          ]
+[ "head.storage",        "malloced"      ]
+[ "head.filename",       "no file"       ]
+[ "tail.free",           "72"            ]
+[ "tail.size",           "2048"          ]
+[ "tail.maxsize",        "2048"          ]
+[ "tail.storage",        "malloced"      ]
+[ "tail.filename",       "10.tail"       ]
 [ "hheapdirty",                  "clean"         ]
 [ "theapdirty",                  "clean"         ]
 #~EndVariableOutput~#

Index: tst450.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/Tests/tst450.stable.out,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -d -r1.190 -r1.191
--- tst450.stable.out   20 Aug 2007 21:48:27 -0000      1.190
+++ tst450.stable.out   4 Oct 2007 10:37:10 -0000       1.191
@@ -97,7 +97,6 @@
 [ "color",       nil     ]
 [ "const",       nil     ]
 [ "constraints",  nil    ]
-[ "crackers",    nil     ]
 [ "date",        nil     ]
 [ "daytime",     nil     ]
 [ "factory",     nil     ]
@@ -164,328 +163,6 @@
 command bpm.insert(pb:bat[:any_1,:any_2],b:bat[:any_1,:any_2]):void address 
BPMinsert;
 #Insert elements into the BAT partitions
 
-command 
crackers.insert(b:bat[:oid,:date],bp:bat[:oid,:date],c:bat[:date,:date]):void 
address CRKinsert;
-#Keep the insertions BAT separatelly and merge in the future on demand with 
the Ripple
-
-command 
crackers.insert(b:bat[:oid,:date],bp:bat[:oid,:dbl],c:bat[:date,:dbl]):void 
address CRKinsert;
-#Keep the insertions BAT separatelly and merge in the future on demand with 
the Ripple
-
-command 
crackers.insert(b:bat[:oid,:date],bp:bat[:oid,:flt],c:bat[:date,:flt]):void 
address CRKinsert;
-#Keep the insertions BAT separatelly and merge in the future on demand with 
the Ripple
-
-command 
crackers.insert(b:bat[:oid,:date],bp:bat[:oid,:lng],c:bat[:date,:lng]):void 
address CRKinsert;
-#Keep the insertions BAT separatelly and merge in the future on demand with 
the Ripple
-
-command 
crackers.insert(b:bat[:oid,:date],bp:bat[:oid,:int],c:bat[:date,:int]):void 
address CRKinsert;
-#Keep the insertions BAT separatelly and merge in the future on demand with 
the Ripple
-
-command 
crackers.insert(b:bat[:oid,:date],bp:bat[:oid,:sht],c:bat[:date,:sht]):void 
address CRKinsert;
-#Keep the insertions BAT separatelly and merge in the future on demand with 
the Ripple
-
-command 
crackers.insert(b:bat[:oid,:date],bp:bat[:oid,:chr],c:bat[:date,:chr]):void 
address CRKinsert;
-#Keep the insertions BAT separatelly and merge in the future on demand with 
the Ripple
-
-command 
crackers.insert(b:bat[:oid,:int],bp:bat[:oid,:date],c:bat[:int,:date]):void 
address CRKinsert;
-#Keep the insertions BAT separatelly and merge in the future on demand with 
the Ripple
-
-command 
crackers.insert(b:bat[:oid,:int],bp:bat[:oid,:dbl],c:bat[:int,:dbl]):void 
address CRKinsert;
-#Keep the insertions BAT separatelly and merge in the future on demand with 
the Ripple
-
-command 
crackers.insert(b:bat[:oid,:int],bp:bat[:oid,:flt],c:bat[:int,:flt]):void 
address CRKinsert;
-#Keep the insertions BAT separatelly and merge in the future on demand with 
the Ripple
-
-command 
crackers.insert(b:bat[:oid,:int],bp:bat[:oid,:lng],c:bat[:int,:lng]):void 
address CRKinsert;
-#Keep the insertions BAT separatelly and merge in the future on demand with 
the Ripple
-
-command 
crackers.insert(b:bat[:oid,:int],bp:bat[:oid,:int],c:bat[:int,:int]):void 
address CRKinsert;
-#Keep the insertions BAT separatelly and merge in the future on demand with 
the Ripple
-
-command 
crackers.insert(b:bat[:oid,:int],bp:bat[:oid,:sht],c:bat[:int,:sht]):void 
address CRKinsert;
-#Keep the insertions BAT separatelly and merge in the future on demand with 
the Ripple
-
-command 
crackers.insert(b:bat[:oid,:int],bp:bat[:oid,:chr],c:bat[:int,:chr]):void 
address CRKinsert;
-#Keep the insertions BAT separatelly and merge in the future on demand with 
the Ripple
-
-command 
crackers.insertionsBOnNeedGraduallyRipple(b:bat[:any_1,:date],c:bat[:any_1,:date]):void
 address CRKmergeInsertionsB_OnNeedGraduallyRipple;
-#Keep the insertions BAT separatelly and merge only what is needed 
-#using the ripple strategy if a relevant query arrives in the future
-
-command 
crackers.insertionsBOnNeedGradually(b:bat[:any_1,:date],c:bat[:any_1,:date]):void
 address CRKmergeInsertionsB_OnNeedGradually;
-#Keep the insertions BAT separatelly and merge only what is 
-#needed if a relevant query arrives in the future
-
-command 
crackers.insertionsBOnNeed(b:bat[:any_1,:date],c:bat[:any_1,:date]):void 
address CRKmergeInsertionsB_OnNeed;
-#Keep the insertions BAT separatelly and do a complete merge 
-#only if a relevant query arrives in the future
-
-command 
crackers.insertionsForget(b:bat[:any_1,:date],c:bat[:any_1,:date]):void address 
CRKmergeInsertions_Forget;
-#Append c to the cracked BAT of b and completelly forget the cracker index
-
-command 
crackers.insertionsBForce(b:bat[:any_1,:date],c:bat[:any_1,:date]):void address 
CRKmergeInsertionsB_Force_date;
-#Merge the insertions BAT with the cracker bat and update the cracker index
-
-command 
crackers.insertionsPartiallyForget(b:bat[:any_1,:date],c:bat[:any_1,:date]):void
 address CRKmergeInsertions_PartiallyForget_date;
-#Append c to the cracked BAT of b and partially forget 
-#the cracker index, i.e., forget only what is affected
-
-command 
crackers.insertionsBOnNeedGraduallyRipple(b:bat[:any_1,:dbl],c:bat[:any_1,:dbl]):void
 address CRKmergeInsertionsB_OnNeedGraduallyRipple;
-#Keep the insertions BAT separatelly and merge only what is needed 
-#using the ripple strategy if a relevant query arrives in the future
-
-command 
crackers.insertionsBOnNeedGradually(b:bat[:any_1,:dbl],c:bat[:any_1,:dbl]):void 
address CRKmergeInsertionsB_OnNeedGradually;
-#Keep the insertions BAT separatelly and merge only what is 
-#needed if a relevant query arrives in the future
-
-command crackers.insertionsBOnNeed(b:bat[:any_1,:dbl],c:bat[:any_1,:dbl]):void 
address CRKmergeInsertionsB_OnNeed;
-#Keep the insertions BAT separatelly and do a complete merge 
-#only if a relevant query arrives in the future
-
-command crackers.insertionsForget(b:bat[:any_1,:dbl],c:bat[:any_1,:dbl]):void 
address CRKmergeInsertions_Forget;
-#Append c to the cracked BAT of b and completelly forget the cracker index
-
-command crackers.insertionsBForce(b:bat[:any_1,:dbl],c:bat[:any_1,:dbl]):void 
address CRKmergeInsertionsB_Force_dbl;
-#Merge the insertions BAT with the cracker bat and update the cracker index
-
-command 
crackers.insertionsPartiallyForget(b:bat[:any_1,:dbl],c:bat[:any_1,:dbl]):void 
address CRKmergeInsertions_PartiallyForget_dbl;
-#Append c to the cracked BAT of b and partially forget 
-#the cracker index, i.e., forget only what is affected
-
-command 
crackers.insertionsBOnNeedGraduallyRipple(b:bat[:any_1,:flt],c:bat[:any_1,:flt]):void
 address CRKmergeInsertionsB_OnNeedGraduallyRipple;
-#Keep the insertions BAT separatelly and merge only what is needed 
-#using the ripple strategy if a relevant query arrives in the future
-
-command 
crackers.insertionsBOnNeedGradually(b:bat[:any_1,:flt],c:bat[:any_1,:flt]):void 
address CRKmergeInsertionsB_OnNeedGradually;
-#Keep the insertions BAT separatelly and merge only what is 
-#needed if a relevant query arrives in the future
-
-command crackers.insertionsBOnNeed(b:bat[:any_1,:flt],c:bat[:any_1,:flt]):void 
address CRKmergeInsertionsB_OnNeed;
-#Keep the insertions BAT separatelly and do a complete merge 
-#only if a relevant query arrives in the future
-
-command crackers.insertionsForget(b:bat[:any_1,:flt],c:bat[:any_1,:flt]):void 
address CRKmergeInsertions_Forget;
-#Append c to the cracked BAT of b and completelly forget the cracker index
-
-command crackers.insertionsBForce(b:bat[:any_1,:flt],c:bat[:any_1,:flt]):void 
address CRKmergeInsertionsB_Force_flt;
-#Merge the insertions BAT with the cracker bat and update the cracker index
-
-command 
crackers.insertionsPartiallyForget(b:bat[:any_1,:flt],c:bat[:any_1,:flt]):void 
address CRKmergeInsertions_PartiallyForget_flt;
-#Append c to the cracked BAT of b and partially forget 
-#the cracker index, i.e., forget only what is affected
-
-command 
crackers.insertionsBOnNeedGraduallyRipple(b:bat[:any_1,:lng],c:bat[:any_1,:lng]):void
 address CRKmergeInsertionsB_OnNeedGraduallyRipple;
-#Keep the insertions BAT separatelly and merge only what is needed 
-#using the ripple strategy if a relevant query arrives in the future
-
-command 
crackers.insertionsBOnNeedGradually(b:bat[:any_1,:lng],c:bat[:any_1,:lng]):void 
address CRKmergeInsertionsB_OnNeedGradually;
-#Keep the insertions BAT separatelly and merge only what is 
-#needed if a relevant query arrives in the future
-
-command crackers.insertionsBOnNeed(b:bat[:any_1,:lng],c:bat[:any_1,:lng]):void 
address CRKmergeInsertionsB_OnNeed;
-#Keep the insertions BAT separatelly and do a complete merge 
-#only if a relevant query arrives in the future
-
-command crackers.insertionsForget(b:bat[:any_1,:lng],c:bat[:any_1,:lng]):void 
address CRKmergeInsertions_Forget;
-#Append c to the cracked BAT of b and completelly forget the cracker index
-
-command crackers.insertionsBForce(b:bat[:any_1,:lng],c:bat[:any_1,:lng]):void 
address CRKmergeInsertionsB_Force_lng;
-#Merge the insertions BAT with the cracker bat and update the cracker index
-
-command 
crackers.insertionsPartiallyForget(b:bat[:any_1,:lng],c:bat[:any_1,:lng]):void 
address CRKmergeInsertions_PartiallyForget_lng;
-#Append c to the cracked BAT of b and partially forget 
-#the cracker index, i.e., forget only what is affected
-
-command 
crackers.insertionsBOnNeedGraduallyRipple(b:bat[:any_1,:int],c:bat[:any_1,:int]):void
 address CRKmergeInsertionsB_OnNeedGraduallyRipple;
-#Keep the insertions BAT separatelly and merge only what is needed 
-#using the ripple strategy if a relevant query arrives in the future
-
-command 
crackers.insertionsBOnNeedGradually(b:bat[:any_1,:int],c:bat[:any_1,:int]):void 
address CRKmergeInsertionsB_OnNeedGradually;
-#Keep the insertions BAT separatelly and merge only what is 
-#needed if a relevant query arrives in the future
-
-command crackers.insertionsBOnNeed(b:bat[:any_1,:int],c:bat[:any_1,:int]):void 
address CRKmergeInsertionsB_OnNeed;
-#Keep the insertions BAT separatelly and do a complete merge 
-#only if a relevant query arrives in the future
-
-command crackers.insertionsForget(b:bat[:any_1,:int],c:bat[:any_1,:int]):void 
address CRKmergeInsertions_Forget;
-#Append c to the cracked BAT of b and completelly forget the cracker index
-
-command crackers.insertionsBForce(b:bat[:any_1,:int],c:bat[:any_1,:int]):void 
address CRKmergeInsertionsB_Force_int;
-#Merge the insertions BAT with the cracker bat and update the cracker index
-
-command 
crackers.insertionsPartiallyForget(b:bat[:any_1,:int],c:bat[:any_1,:int]):void 
address CRKmergeInsertions_PartiallyForget_int;
-#Append c to the cracked BAT of b and partially forget 
-#the cracker index, i.e., forget only what is affected
-
-command 
crackers.insertionsBOnNeedGraduallyRipple(b:bat[:any_1,:sht],c:bat[:any_1,:sht]):void
 address CRKmergeInsertionsB_OnNeedGraduallyRipple;
-#Keep the insertions BAT separatelly and merge only what is needed 
-#using the ripple strategy if a relevant query arrives in the future
-
-command 
crackers.insertionsBOnNeedGradually(b:bat[:any_1,:sht],c:bat[:any_1,:sht]):void 
address CRKmergeInsertionsB_OnNeedGradually;
-#Keep the insertions BAT separatelly and merge only what is 
-#needed if a relevant query arrives in the future
-
-command crackers.insertionsBOnNeed(b:bat[:any_1,:sht],c:bat[:any_1,:sht]):void 
address CRKmergeInsertionsB_OnNeed;
-#Keep the insertions BAT separatelly and do a complete merge 
-#only if a relevant query arrives in the future
-
-command crackers.insertionsForget(b:bat[:any_1,:sht],c:bat[:any_1,:sht]):void 
address CRKmergeInsertions_Forget;
-#Append c to the cracked BAT of b and completelly forget the cracker index
-
-command crackers.insertionsBForce(b:bat[:any_1,:sht],c:bat[:any_1,:sht]):void 
address CRKmergeInsertionsB_Force_sht;
-#Merge the insertions BAT with the cracker bat and update the cracker index
-
-command 
crackers.insertionsPartiallyForget(b:bat[:any_1,:sht],c:bat[:any_1,:sht]):void 
address CRKmergeInsertions_PartiallyForget_sht;
-#Append c to the cracked BAT of b and partially forget 
-#the cracker index, i.e., forget only what is affected
-
-command 
crackers.insertionsBOnNeedGraduallyRipple(b:bat[:any_1,:chr],c:bat[:any_1,:chr]):void
 address CRKmergeInsertionsB_OnNeedGraduallyRipple;
-#Keep the insertions BAT separatelly and merge only what is needed 
-#using the ripple strategy if a relevant query arrives in the future
-
-command 
crackers.insertionsBOnNeedGradually(b:bat[:any_1,:chr],c:bat[:any_1,:chr]):void 
address CRKmergeInsertionsB_OnNeedGradually;
-#Keep the insertions BAT separatelly and merge only what is 
-#needed if a relevant query arrives in the future
-
-command crackers.insertionsBOnNeed(b:bat[:any_1,:chr],c:bat[:any_1,:chr]):void 
address CRKmergeInsertionsB_OnNeed;
-#Keep the insertions BAT separatelly and do a complete merge 
-#only if a relevant query arrives in the future
-
-command crackers.insertionsForget(b:bat[:any_1,:chr],c:bat[:any_1,:chr]):void 
address CRKmergeInsertions_Forget;
-#Append c to the cracked BAT of b and completelly forget the cracker index
-
-command crackers.insertionsBForce(b:bat[:any_1,:chr],c:bat[:any_1,:chr]):void 
address CRKmergeInsertionsB_Force_chr;
-#Merge the insertions BAT with the cracker bat and update the cracker index
-
-command 
crackers.insertionsPartiallyForget(b:bat[:any_1,:chr],c:bat[:any_1,:chr]):void 
address CRKmergeInsertions_PartiallyForget_chr;
-#Append c to the cracked BAT of b and partially forget 
-#the cracker index, i.e., forget only what is affected
-
-command 
crackers.printPendingInsertions(b:bat[:oid,:date],bp:bat[:oid,:date]):void 
address CRKprintPendingInsertions;
-#Print the pending insertions
-
-command 
crackers.printPendingInsertions(b:bat[:oid,:date],bp:bat[:oid,:dbl]):void 
address CRKprintPendingInsertions;
-#Print the pending insertions
-
-command 
crackers.printPendingInsertions(b:bat[:oid,:date],bp:bat[:oid,:flt]):void 
address CRKprintPendingInsertions;
-#Print the pending insertions
-
-command 
crackers.printPendingInsertions(b:bat[:oid,:date],bp:bat[:oid,:lng]):void 
address CRKprintPendingInsertions;
-#Print the pending insertions
-
-command 
crackers.printPendingInsertions(b:bat[:oid,:date],bp:bat[:oid,:int]):void 
address CRKprintPendingInsertions;
-#Print the pending insertions
-
-command 
crackers.printPendingInsertions(b:bat[:oid,:date],bp:bat[:oid,:sht]):void 
address CRKprintPendingInsertions;
-#Print the pending insertions
-
-command 
crackers.printPendingInsertions(b:bat[:oid,:date],bp:bat[:oid,:chr]):void 
address CRKprintPendingInsertions;
-#Print the pending insertions
-
-command 
crackers.printPendingInsertions(b:bat[:oid,:int],bp:bat[:oid,:date]):void 
address CRKprintPendingInsertions;
-#Print the pending insertions
-
-command 
crackers.printPendingInsertions(b:bat[:oid,:int],bp:bat[:oid,:dbl]):void 
address CRKprintPendingInsertions;
-#Print the pending insertions
-
-command 
crackers.printPendingInsertions(b:bat[:oid,:int],bp:bat[:oid,:flt]):void 
address CRKprintPendingInsertions;
-#Print the pending insertions
-
-command 
crackers.printPendingInsertions(b:bat[:oid,:int],bp:bat[:oid,:lng]):void 
address CRKprintPendingInsertions;
-#Print the pending insertions
-
-command 
crackers.printPendingInsertions(b:bat[:oid,:int],bp:bat[:oid,:int]):void 
address CRKprintPendingInsertions;
-#Print the pending insertions
-
-command 
crackers.printPendingInsertions(b:bat[:oid,:int],bp:bat[:oid,:sht]):void 
address CRKprintPendingInsertions;
-#Print the pending insertions
-
-command 
crackers.printPendingInsertions(b:bat[:oid,:int],bp:bat[:oid,:chr]):void 
address CRKprintPendingInsertions;
-#Print the pending insertions
-
-command crackers.printCrackerInsertions(b:bat[:any_1,:date]):void address 
CRKprintCrackerInsertions;
-#Print the pending insertions of the cracker BAT of b
-
-command crackers.printCrackerInsertions(b:bat[:any_1,:dbl]):void address 
CRKprintCrackerInsertions;
-#Print the pending insertions of the cracker BAT of b
-
-command crackers.printCrackerInsertions(b:bat[:any_1,:flt]):void address 
CRKprintCrackerInsertions;
-#Print the pending insertions of the cracker BAT of b
-
-command crackers.printCrackerInsertions(b:bat[:any_1,:lng]):void address 
CRKprintCrackerInsertions;
-#Print the pending insertions of the cracker BAT of b
-
-command crackers.printCrackerInsertions(b:bat[:any_1,:int]):void address 
CRKprintCrackerInsertions;
-#Print the pending insertions of the cracker BAT of b
-
-command crackers.printCrackerInsertions(b:bat[:any_1,:sht]):void address 
CRKprintCrackerInsertions;
-#Print the pending insertions of the cracker BAT of b
-
-command crackers.printCrackerInsertions(b:bat[:any_1,:chr]):void address 
CRKprintCrackerInsertions;
-#Print the pending insertions of the cracker BAT of b
-
-command 
crackers.sizePendingInsertions(b:bat[:oid,:date],bp:bat[:oid,:date]):void 
address CRKsizePendingInsertions;
-#Get the size of the pending insertions for this map
-
-command 
crackers.sizePendingInsertions(b:bat[:oid,:date],bp:bat[:oid,:dbl]):void 
address CRKsizePendingInsertions;
-#Get the size of the pending insertions for this map
-
-command 
crackers.sizePendingInsertions(b:bat[:oid,:date],bp:bat[:oid,:flt]):void 
address CRKsizePendingInsertions;
-#Get the size of the pending insertions for this map
-
-command 
crackers.sizePendingInsertions(b:bat[:oid,:date],bp:bat[:oid,:lng]):void 
address CRKsizePendingInsertions;
-#Get the size of the pending insertions for this map
-
-command 
crackers.sizePendingInsertions(b:bat[:oid,:date],bp:bat[:oid,:int]):void 
address CRKsizePendingInsertions;
-#Get the size of the pending insertions for this map
-
-command 
crackers.sizePendingInsertions(b:bat[:oid,:date],bp:bat[:oid,:sht]):void 
address CRKsizePendingInsertions;
-#Get the size of the pending insertions for this map
-
-command 
crackers.sizePendingInsertions(b:bat[:oid,:date],bp:bat[:oid,:chr]):void 
address CRKsizePendingInsertions;
-#Get the size of the pending insertions for this map
-
-command 
crackers.sizePendingInsertions(b:bat[:oid,:int],bp:bat[:oid,:date]):void 
address CRKsizePendingInsertions;
-#Get the size of the pending insertions for this map
-
-command 
crackers.sizePendingInsertions(b:bat[:oid,:int],bp:bat[:oid,:dbl]):void address 
CRKsizePendingInsertions;
-#Get the size of the pending insertions for this map
-
-command 
crackers.sizePendingInsertions(b:bat[:oid,:int],bp:bat[:oid,:flt]):void address 
CRKsizePendingInsertions;
-#Get the size of the pending insertions for this map
-
-command 
crackers.sizePendingInsertions(b:bat[:oid,:int],bp:bat[:oid,:lng]):void address 
CRKsizePendingInsertions;
-#Get the size of the pending insertions for this map
-
-command 
crackers.sizePendingInsertions(b:bat[:oid,:int],bp:bat[:oid,:int]):void address 
CRKsizePendingInsertions;
-#Get the size of the pending insertions for this map
-
-command 
crackers.sizePendingInsertions(b:bat[:oid,:int],bp:bat[:oid,:sht]):void address 
CRKsizePendingInsertions;
-#Get the size of the pending insertions for this map
-
-command 
crackers.sizePendingInsertions(b:bat[:oid,:int],bp:bat[:oid,:chr]):void address 
CRKsizePendingInsertions;
-#Get the size of the pending insertions for this map
-
-command crackers.sizeCrackerInsertions(b:bat[:any_1,:date]):void address 
CRKsizeCrackerInsertions;
-#Get the size of the pending insertions of the cracker BAT of b
-
-command crackers.sizeCrackerInsertions(b:bat[:any_1,:dbl]):void address 
CRKsizeCrackerInsertions;
-#Get the size of the pending insertions of the cracker BAT of b
-
-command crackers.sizeCrackerInsertions(b:bat[:any_1,:flt]):void address 
CRKsizeCrackerInsertions;
-#Get the size of the pending insertions of the cracker BAT of b
-
-command crackers.sizeCrackerInsertions(b:bat[:any_1,:lng]):void address 
CRKsizeCrackerInsertions;
-#Get the size of the pending insertions of the cracker BAT of b
-
-command crackers.sizeCrackerInsertions(b:bat[:any_1,:int]):void address 
CRKsizeCrackerInsertions;
-#Get the size of the pending insertions of the cracker BAT of b
-
-command crackers.sizeCrackerInsertions(b:bat[:any_1,:sht]):void address 
CRKsizeCrackerInsertions;
-#Get the size of the pending insertions of the cracker BAT of b
-
-command crackers.sizeCrackerInsertions(b:bat[:any_1,:chr]):void address 
CRKsizeCrackerInsertions;
-#Get the size of the pending insertions of the cracker BAT of b
-
 command io.import(b:bat[:any_1,:any_2],filepath:str):bat[:any_1,:any_2] 
address IOimport;
 #Import a BAT from an ASCII dump. The new tuples are *inserted* into the
 #parameter BAT. You have to create it! Its signature must match the dump,

Index: tst270.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/Tests/tst270.stable.out,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- tst270.stable.out   31 Mar 2007 16:05:04 -0000      1.28
+++ tst270.stable.out   4 Oct 2007 10:37:10 -0000       1.29
@@ -97,9 +97,10 @@
 # str                          str               # type
 #-----------------------------------------#
 [ "version",             "25105"         ]
-[ "batId",               "tmp_7"         ]
-[ "batCacheid",                  "7"             ]
-[ "batParentid",                 "0"             ]
+[ "batId",               "tmp_10"        ]
+[ "batCacheid",                  "8"             ]
+[ "hparentid",           "0"             ]
+[ "tparentid",           "0"             ]
 [ "batSharecnt",                 "0"             ]
 [ "head",                        "int"           ]
 [ "tail",                        "int"           ]
@@ -109,14 +110,11 @@
 [ "batLRefcnt",                          "1"             ]
 [ "batDirty",                    "dirty"         ]
 [ "batSet",                      "0"             ]
-[ "void_tid",            "-1"            ]
-[ "void_cnt",                    "0"             ]
 [ "hsorted",             "65"            ]
 [ "hident",                      "h"             ]
 [ "hdense",                      "0"             ]
 [ "hseqbase",                    "[EMAIL PROTECTED]"             ]
-[ "hkey",                "1"             ]
-[ "hloc",                        "0"             ]
+[ "hkey",                "0"             ]
 [ "hvarsized",                   "0"             ]
 [ "halign",                      "20000000"      ]
 [ "hnosorted",           "0"             ]
@@ -128,8 +126,7 @@
 [ "tdense",                      "0"             ]
 [ "tseqbase",                    "[EMAIL PROTECTED]"             ]
 [ "tsorted",             "65"            ]
-[ "tkey",                "1"             ]
-[ "tloc",                        "4"             ]
+[ "tkey",                "0"             ]
 [ "tvarsized",                   "0"             ]
 [ "talign",                      "20000001"      ]
 [ "tnosorted",           "0"             ]
@@ -140,18 +137,24 @@
 [ "batInserted",         "0"             ]
 [ "batDeleted",                          "0"             ]
 [ "batFirst",            "0"             ]
-[ "top",                 "0"             ]
+[ "htop",                "0"             ]
+[ "ttop",                "0"             ]
 [ "batStamp",            "4"             ]
 [ "lastUsed",            "165"           ]
 [ "curStamp",            "5"             ]
 [ "batCopiedtodisk",             "0"             ]
 [ "batDirtydesc",        "dirty"         ]
 [ "batDirtybuns",                "clean"         ]
-[ "batBuns.free",        "0"             ]
-[ "batBuns.size",        "2048"          ]
-[ "batBuns.maxsize",     "2048"          ]
-[ "batBuns.storage",             "malloced"      ]
-[ "batBuns.filename",    "7.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: tst225.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/Tests/tst225.stable.out,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- tst225.stable.out   28 Dec 2006 22:16:10 -0000      1.24
+++ tst225.stable.out   4 Oct 2007 10:37:08 -0000       1.25
@@ -38,7 +38,7 @@
 # int  int       # type
 #-----------------#
 [ [EMAIL PROTECTED],     2       ]
-!MALException:batcalc.+:Cannot access descriptor
+!MALException:batcalc.+:cannot access descriptor
 
 # 08:58:54 >  
 # 08:58:54 >  Done.


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