Changeset: 1d0b3c132506 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/1d0b3c132506
Modified Files:
sql/storage/bat/bat_storage.c
Branch: default
Log Message:
update bats are no longer fetched via the bind_col/bind_idx api
diffs (67 lines):
diff --git a/sql/storage/bat/bat_storage.c b/sql/storage/bat/bat_storage.c
--- a/sql/storage/bat/bat_storage.c
+++ b/sql/storage/bat/bat_storage.c
@@ -884,43 +884,6 @@ bind_ubat(sql_trans *tr, sql_delta *d, i
}
static BAT *
-bind_ucol(sql_trans *tr, sql_column *c, int access, size_t cnt)
-{
- lock_column(tr->store, c->base.id);
- sql_delta *d = col_timestamp_delta(tr, c);
- int type = c->type.type->localtype;
-
- if (!d) {
- unlock_column(tr->store, c->base.id);
- return NULL;
- }
- if (d->cs.st == ST_DICT) {
- BAT *b = quick_descriptor(d->cs.bid);
-
- type = b->ttype;
- }
- BAT *bn = bind_ubat(tr, d, access, type, cnt);
- unlock_column(tr->store, c->base.id);
- return bn;
-}
-
-static BAT *
-bind_uidx(sql_trans *tr, sql_idx * i, int access, size_t cnt)
-{
- lock_column(tr->store, i->base.id);
- int type = oid_index(i->type)?TYPE_oid:TYPE_lng;
- sql_delta *d = idx_timestamp_delta(tr, i);
-
- if (!d) {
- unlock_column(tr->store, i->base.id);
- return NULL;
- }
- BAT *bn = bind_ubat(tr, d, access, type, cnt);
- unlock_column(tr->store, i->base.id);
- return bn;
-}
-
-static BAT *
cs_bind_bat( column_storage *cs, int access, size_t cnt)
{
BAT *b;
@@ -1009,8 +972,7 @@ bind_col(sql_trans *tr, sql_column *c, i
if (!d)
return NULL;
size_t cnt = count_col(tr, c, 0);
- if (access == RD_UPD_ID || access == RD_UPD_VAL)
- return bind_ucol(tr, c, access, cnt);
+ assert (access != RD_UPD_ID && access != RD_UPD_VAL);
BAT *b = cs_bind_bat( &d->cs, access, cnt);
assert(!b || ((c->storage_type && access != RD_EXT) || b->ttype ==
c->type.type->localtype) || (access == QUICK && b->ttype < 0));
return b;
@@ -1026,8 +988,7 @@ bind_idx(sql_trans *tr, sql_idx * i, int
if (!d)
return NULL;
size_t cnt = count_idx(tr, i, 0);
- if (access == RD_UPD_ID || access == RD_UPD_VAL)
- return bind_uidx(tr, i, access, cnt);
+ assert (access != RD_UPD_ID && access != RD_UPD_VAL);
return cs_bind_bat( &d->cs, access, cnt);
}
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
