Changeset: 76ee6746699c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/76ee6746699c
Modified Files:
gdk/gdk_logger.c
Branch: ustr
Log Message:
Backed out changeset 900f0628e974
diffs (52 lines):
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -998,14 +998,6 @@ la_bat_create(logger *lg, logaction *la,
if (la->tt < 0)
BATtseqbase(b, 0);
- if (la->tt == TYPE_str && la->cid < 0) {
- if (BATconvert2ustr(b) != GDK_SUCCEED) {
- logbat_destroy(b);
- return GDK_FAIL;
- }
- la->cid = -la->cid;
- }
-
if ((b = BATsetaccess(b, BAT_READ)) == NULL ||
log_add_bat(lg, b, la->cid, tid) != GDK_SUCCEED) {
logbat_destroy(b);
@@ -1450,12 +1442,12 @@ log_read_transaction(logger *lg, BAT *id
else
TRC_DEBUG_ENDIF(WAL, "%d %d", l.flag, l.id);
}
+ skip_entry = (ids_to_omit && BUNfnd(ids_to_omit, &l.id) !=
BUN_NONE);
switch (l.flag) {
case LOG_UPDATE_CB:
case LOG_UPDATE_CONST:
case LOG_UPDATE_BULK:
case LOG_UPDATE:
- skip_entry = (ids_to_omit && BUNfnd(ids_to_omit, &l.id)
!= BUN_NONE);
if (skip_entry)
break;
/* fall through */
@@ -1466,9 +1458,8 @@ log_read_transaction(logger *lg, BAT *id
BUN p;
BUN posnew = BUN_NONE;
BUN posold = BUN_NONE;
- int cid = l.flag == LOG_CREATE && l.id < 0 ?
-l.id : l.id;
MT_rwlock_rdlock(&cni.b->thashlock);
- HASHloop_int(&cni, cni.b->thash, p, &cid) {
+ HASHloop_int(&cni, cni.b->thash, p, &l.id) {
lng lid = *(lng *)
Tloc(lg->catalog_lid, p);
if (lid == lng_nil || lid > tr->tid)
posnew = p;
@@ -3340,7 +3331,7 @@ log_bat_persists(logger *lg, BAT *b, log
}
l.flag = LOG_CREATE;
- l.id = b->ustr ? -id : id;
+ l.id = id;
if (!LOG_DISABLED(lg)) {
assert(mnstr_errnr(lg->current->output_log) == MNSTR_NO__ERROR);
if (mnstr_errnr(lg->current->output_log) != MNSTR_NO__ERROR ||
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
