Update of /cvsroot/monetdb/sql/src/storage/bat
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16985/src/storage/bat
Modified Files:
Tag: SQL_2-24
bat_storage.mx bat_utils.mx
Log Message:
make all bats read_only, we use forced inserts/appends anyway
U bat_storage.mx
Index: bat_storage.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/storage/bat/bat_storage.mx,v
retrieving revision 1.16.2.2
retrieving revision 1.16.2.3
diff -u -d -r1.16.2.2 -r1.16.2.3
--- bat_storage.mx 28 May 2008 06:41:51 -0000 1.16.2.2
+++ bat_storage.mx 11 Jun 2008 08:25:23 -0000 1.16.2.3
@@ -108,6 +108,7 @@
BATseqbase(c, ibase );
c->batDirty |= 2;
BATcommit(c);
+ bat_set_access(c, BAT_READ);
r = temp_create(c);
bat_destroy(c);
} else {
@@ -133,6 +134,7 @@
c = BATcopy(o, TYPE_oid, o->ttype, TRUE);
BATcommit(c);
r = temp_create(c);
+ bat_set_access(c, BAT_READ);
bat_destroy(c);
} else {
c = eubats[o->ttype];
@@ -452,6 +454,7 @@
u = quick_descriptor(logger_find_bat(bat_logger, bat->uname));
if (!u) {
u = bat_new(TYPE_oid, b->ttype, 0);
+ bat_set_access(u, BAT_READ);
destroy = 1;
}
bat->ubid = temp_create(u);
@@ -484,6 +487,7 @@
if (!u) {
u = bat_new(TYPE_oid, b->ttype, 0);
+ bat_set_access(u, BAT_READ);
bat->ubid = temp_create(u);
}
@@ -508,6 +512,7 @@
(void)tr;
/* snapshot large bats */
+ bat_set_access(b, BAT_READ);
if (BATcount(b) > SNAPSHOT_MINSIZE)
BATmode(b, PERSISTENT);
if (BATcount(b) > (size_t) REMAP_PAGE_MAXSIZE)
@@ -529,6 +534,7 @@
bat_destroy(b);
i = bat_new(TYPE_void, type, sz);
+ bat_set_access(i, BAT_READ);
BATseqbase(i, bat->ibase);
bat->ibid = temp_create(i);
bat_destroy(i);
@@ -561,6 +567,7 @@
BAT *b = bat_new(TYPE_void, type, c->t->sz);
if (!b)
return LOG_ERR;
+ bat_set_access(b, BAT_READ);
bat->ibid = temp_create(b);
bat_destroy(b);
}
@@ -623,6 +630,7 @@
BAT *b = bat_new(TYPE_void, type, ni->t->sz);
if (!b)
return LOG_ERR;
+ bat_set_access(b, BAT_READ);
bat->ibid = temp_create(b);
bat_destroy(b);
}
@@ -666,6 +674,7 @@
bat_destroy(b);
} else if (!bat->dbid) {
b = bat_new(TYPE_void, TYPE_oid, t->sz);
+ bat_set_access(b, BAT_READ);
bat->dbid = temp_create(b);
bat_destroy(b);
}
@@ -695,6 +704,7 @@
(void)tr;
/* snapshot large bats */
+ bat_set_access(b, BAT_READ);
if (BATcount(b) > SNAPSHOT_MINSIZE)
BATmode(b, PERSISTENT);
if (BATcount(b) > (size_t) REMAP_PAGE_MAXSIZE)
@@ -724,6 +734,7 @@
} else if (oc_isnew) {
/* move the bat to the new col, fixup the old col*/
b = bat_new(TYPE_void, type, t->sz);
+ bat_set_access(b, BAT_READ);
obat->ibid = temp_create(b);
if (c_isnew && tr->parent == gtrans) {
/* new cols are moved to gtrans and bat.bid */
@@ -746,11 +757,13 @@
bat->ubid = eubat_copy(bat->ubid, 0);
} else {
BAT *b = bat_new(TYPE_oid, type, t->sz);
+ bat_set_access(b, BAT_READ);
bat->ubid = temp_create(b);
bat_destroy(b);
/* old needs an update bat too */
b = bat_new(TYPE_oid, type, t->sz);
+ bat_set_access(b, BAT_READ);
obat->ubid = temp_create(b);
bat_destroy(b);
}
@@ -1327,6 +1340,8 @@
eubats[t] = BATnew(TYPE_oid, t, 0);
ebats[t] = BATnew(TYPE_void, t, 0);
BATseqbase(ebats[t],0);
+ bat_set_access(eubats[t], BAT_READ);
+ bat_set_access(ebats[t], BAT_READ);
}
}
return LOG_OK;
U bat_utils.mx
Index: bat_utils.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/storage/bat/bat_utils.mx,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -d -r1.4 -r1.4.4.1
--- bat_utils.mx 15 Jan 2008 10:40:25 -0000 1.4
+++ bat_utils.mx 11 Jun 2008 08:25:23 -0000 1.4.4.1
@@ -144,6 +144,7 @@
if (!temp) {
c = BATcopy(o, o->htype, o->ttype, TRUE);
+ bat_set_access(c, BAT_READ);
BATcommit(c);
} else {
c = bat_new(o->htype, o->ttype, COLSIZE);
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
