Update of /cvsroot/monetdb/sql/src/storage/bat
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1792/src/storage/bat
Modified Files:
bat_storage.mx bat_table.mx bat_utils.mx
Log Message:
Type cleanup.
Counting and indexing BUNs in a BAT is now done exclusively using the
type BUN. This means that e.g. the BATcount function now returns a
BUN instead of a size_t (with many more similar changes). It also
means that all uses of the hash_t type have been replaced by BUN.
vheaps are now exclusively indexed using the type var_t.
A few new constants have been introduced:
VAR_MAX - maximum allowed value of a value of type var_t.
BUN_MAX - maximum allowed value of a value of type BUN.
OIDFMT (existed already) - format string to print a value of type oid.
BUNFMT - format string to print a value of type BUN.
VARFMT - format string to print a value of type var_t.
U bat_table.mx
Index: bat_table.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/storage/bat/bat_table.mx,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- bat_table.mx 22 Aug 2008 11:25:06 -0000 1.35
+++ bat_table.mx 25 Aug 2008 13:36:19 -0000 1.36
@@ -252,7 +252,7 @@
table_check(sql_trans *tr, sql_table *t)
{
node *n = cs_first_node(&t->columns);
- ssize_t cnt = -1;
+ BUN cnt = BUN_NONE;
(void)tr;
for (; n; n = n->next) {
@@ -260,9 +260,9 @@
sql_delta *bat = c->data;
BAT *b = temp_descriptor(bat->bid);
- if (cnt == -1) {
+ if (cnt == BUN_NONE) {
cnt = BATcount(b);
- } else if (cnt != (ssize_t)BATcount(b)) {
+ } else if (cnt != BATcount(b)) {
assert(0);
return (int)(cnt - BATcount(b));
}
U bat_storage.mx
Index: bat_storage.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/storage/bat/bat_storage.mx,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- bat_storage.mx 22 Aug 2008 09:50:30 -0000 1.22
+++ bat_storage.mx 25 Aug 2008 13:36:19 -0000 1.23
@@ -68,9 +68,9 @@
extern int destroy_dbat(sql_dbat *bat);
extern int log_destroy_delta(sql_delta *b);
extern int log_destroy_dbat(sql_dbat *bat);
-extern size_t clear_delta(sql_trans *tr, sql_delta *bat);
-extern size_t clear_dbat(sql_trans *tr, sql_dbat *bat);
-extern int tr_update_delta( sql_trans *tr, sql_delta *obat, sql_delta *cbat,
int cluster, size_t snapshot_minsize);
+extern BUN clear_delta(sql_trans *tr, sql_delta *bat);
+extern BUN clear_dbat(sql_trans *tr, sql_dbat *bat);
+extern int tr_update_delta( sql_trans *tr, sql_delta *obat, sql_delta *cbat,
int cluster, BUN snapshot_minsize);
extern int tr_update_dbat(sql_trans *tr, sql_dbat *tdb, sql_dbat *fdb, int
cleared);
extern int tr_log_delta( sql_trans *tr, sql_delta *cbat, int cleared);
extern int tr_log_dbat(sql_trans *tr, sql_dbat *fdb, int cleared);
@@ -83,7 +83,7 @@
#include "bat_utils.h"
#include <sql_string.h>
-#define SNAPSHOT_MINSIZE (1024)
+#define SNAPSHOT_MINSIZE ((BUN) 1024)
BAT *
delta_bind_ubat(sql_delta *bat, int access)
@@ -228,7 +228,7 @@
BUNins(b, (ptr) &rid, upd, TRUE);
} else {
b = temp_descriptor(bat->ibid);
- void_inplace(b, rid, upd, TRUE);
+ void_inplace(b, (oid) rid, upd, TRUE);
}
bat_destroy(b);
}
@@ -272,7 +272,7 @@
i->batDirty |= 2;
} else if (!isEbat(b)){
/* try to use mmap() */
- if (BATcount(b)+BATcount(i) > (size_t) REMAP_PAGE_MAXSIZE) {
+ if (BATcount(b)+BATcount(i) > (BUN) REMAP_PAGE_MAXSIZE) {
BATmmap(b, STORE_MMAP, STORE_MMAP, STORE_MMAP,
STORE_MMAP);
}
BATappend(b, i, TRUE);
@@ -401,7 +401,7 @@
b = quick_descriptor(bid);
bat->bid = temp_create(b);
bat->ibase = BATcount(b);
- bat->cnt = (size_t)bat->ibase;
+ bat->cnt = bat->ibase;
u = quick_descriptor(ubid);
if (!u) {
@@ -475,7 +475,7 @@
bat_set_access(b, BAT_READ);
if (BATcount(b) > SNAPSHOT_MINSIZE)
BATmode(b, PERSISTENT);
- if (BATcount(b) > (size_t) REMAP_PAGE_MAXSIZE)
+ if (BATcount(b) > (BUN) REMAP_PAGE_MAXSIZE)
BATmmap(b, STORE_MMAP, STORE_MMAP, STORE_MMAP,
STORE_MMAP);
bat_destroy(b);
return ok;
@@ -712,7 +712,7 @@
bat_set_access(b, BAT_READ);
if (BATcount(b) > SNAPSHOT_MINSIZE)
BATmode(b, PERSISTENT);
- if (BATcount(b) > (size_t) REMAP_PAGE_MAXSIZE)
+ if (BATcount(b) > (BUN) REMAP_PAGE_MAXSIZE)
BATmmap(b, STORE_MMAP, STORE_MMAP, STORE_MMAP,
STORE_MMAP);
bat_destroy(b);
return LOG_OK;
@@ -964,11 +964,11 @@
return log_destroy_dbat(t->data);
}
-size_t
+BUN
clear_delta(sql_trans *tr, sql_delta *bat)
{
BAT *b;
- size_t sz = 0;
+ BUN sz = 0;
if (bat->ibid) {
b = temp_descriptor(bat->ibid);
@@ -1001,7 +1001,7 @@
return sz;
}
-static size_t
+static BUN
clear_col(sql_trans *tr, sql_column *c)
{
if (c->data)
@@ -1009,7 +1009,7 @@
return 0;
}
-static size_t
+static BUN
clear_idx(sql_trans *tr, sql_idx *i)
{
if (i->data)
@@ -1017,10 +1017,10 @@
return 0;
}
-size_t
+BUN
clear_dbat(sql_trans *tr, sql_dbat *bat)
{
- size_t sz = 0;
+ BUN sz = 0;
(void)tr;
if (bat->dbid) {
@@ -1035,14 +1035,14 @@
return sz;
}
-static size_t
+static BUN
clear_del(sql_trans *tr, sql_table *t)
{
return clear_dbat(tr, t->data);
}
int
-tr_update_delta( sql_trans *tr, sql_delta *obat, sql_delta *cbat, int cluster,
size_t snapshot_minsize)
+tr_update_delta( sql_trans *tr, sql_delta *obat, sql_delta *cbat, int cluster,
BUN snapshot_minsize)
{
int ok = LOG_OK;
BAT *ups, *ins, *cur;
@@ -1081,7 +1081,7 @@
bat_destroy(cur);
cur = newcur;
} else {
- if (BATcount(cur)+BATcount(ins) > (size_t)
REMAP_PAGE_MAXSIZE) { /* try to use mmap() */
+ if (BATcount(cur)+BATcount(ins) > (BUN)
REMAP_PAGE_MAXSIZE) { /* try to use mmap() */
BATmmap(cur, STORE_MMAP,
STORE_MMAP, STORE_MMAP, STORE_MMAP);
}
BATappend(cur,ins,TRUE);
@@ -1302,7 +1302,7 @@
cur = temp_descriptor(cbat->bid);
if ((!cur || !BATcount(cur)) && BATcount(ins) >
SNAPSHOT_MINSIZE) {
BATmode(ins, PERSISTENT);
- if (BATcount(ins) > (size_t) REMAP_PAGE_MAXSIZE)
+ if (BATcount(ins) > (BUN) REMAP_PAGE_MAXSIZE)
BATmmap(ins, STORE_MMAP,
STORE_MMAP, STORE_MMAP, STORE_MMAP);
}
if (cur)
U bat_utils.mx
Index: bat_utils.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/storage/bat/bat_utils.mx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- bat_utils.mx 22 Aug 2008 09:50:30 -0000 1.6
+++ bat_utils.mx 25 Aug 2008 13:36:20 -0000 1.7
@@ -34,11 +34,11 @@
extern log_bid temp_copy(log_bid b, int temp);
extern void bat_destroy(BAT *b);
-extern BAT *bat_new(int ht, int tt, size_t size);
+extern BAT *bat_new(int ht, int tt, BUN size);
extern void update_table_bat(BAT *b, BAT *ub);
-extern size_t append_inserted(BAT *b, BAT *i );
-extern size_t copy_inserted(BAT *b, BAT *i );
+extern BUN append_inserted(BAT *b, BAT *i );
+extern BUN copy_inserted(BAT *b, BAT *i );
extern void leaks(void);
@@ -106,7 +106,7 @@
}
BAT *
-bat_new(int ht, int tt, size_t size)
+bat_new(int ht, int tt, BUN size)
{
BAT *nb = BATnew(ht, tt, size);
@@ -178,10 +178,10 @@
}
}
-size_t
+BUN
append_inserted(BAT *b, BAT *i )
{
- size_t nr = 0;
+ BUN nr = 0;
BUN r;
BATiter ii = bat_iterator(i);
@@ -192,10 +192,10 @@
return nr;
}
-size_t
+BUN
copy_inserted(BAT *b, BAT *i )
{
- size_t nr = 0;
+ BUN nr = 0;
BUN r;
BATiter ii = bat_iterator(i);
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
