Changeset: 3911bab6c4f3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/3911bab6c4f3
Modified Files:
gdk/gdk_logger.c
gdk/gdk_logger_internals.h
sql/storage/bat/bat_logger.c
Branch: default
Log Message:
Remove unused struct members.
diffs (94 lines):
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -1494,7 +1494,7 @@ log_switch_bat(BAT *old, BAT *new, const
static gdk_return
bm_get_counts(logger *lg)
{
- BUN p, q, deleted = 0;
+ BUN p, q;
const log_bid *bids = (const log_bid *) Tloc(lg->catalog_bid, 0);
BATloop(lg->catalog_bid, p, q) {
@@ -1507,7 +1507,6 @@ bm_get_counts(logger *lg)
assert(b);
cnt = BATcount(b);
} else {
- deleted++;
lid = BBP_desc(bids[p]) ? 1 : -1;
}
if (BUNappend(lg->catalog_cnt, &cnt, false) != GDK_SUCCEED)
@@ -1515,8 +1514,6 @@ bm_get_counts(logger *lg)
if (BUNappend(lg->catalog_lid, &lid, false) != GDK_SUCCEED)
return GDK_FAIL;
}
- lg->deleted = deleted;
- lg->cnt = BATcount(lg->catalog_bid);
return GDK_SUCCEED;
}
@@ -1634,7 +1631,7 @@ cleanup_and_swap(logger *lg, int *r, con
r[rcnt++] = lg->catalog_id->batCacheid;
r[rcnt++] = lg->dcatalog->batCacheid;
- assert(lg->deleted - cleanup == BATcount(ndels));
+ assert(BATcount(lg->dcatalog) - cleanup == BATcount(ndels));
logbat_destroy(lg->catalog_bid);
logbat_destroy(lg->catalog_id);
@@ -1661,8 +1658,6 @@ cleanup_and_swap(logger *lg, int *r, con
strconcat_len(bak, sizeof(bak), lg->fn, "_catalog_lid", NULL);
if (BBPrename(lg->catalog_lid, bak) < 0)
GDKclrerr();
- lg->cnt = BATcount(lg->catalog_bid);
- lg->deleted -= cleanup;
for (logged_range *p = lg->pending; p; p = p->next) {
p->cnt -= cleanup;
p->deleted -= cleanup;
@@ -3279,7 +3274,6 @@ log_add_bat(logger *lg, BAT *b, log_id i
|| BUNappend(lg->catalog_cnt, &cnt, false) != GDK_SUCCEED ||
BUNappend(lg->catalog_lid, &lid, false) != GDK_SUCCEED)
return GDK_FAIL;
- lg->cnt++;
if (lg->current)
lg->current->cnt++;
BBPretain(bid);
@@ -3304,7 +3298,6 @@ log_del_bat(logger *lg, log_bid bid)
if (BUNreplace(lg->catalog_lid, p, &lid, false) != GDK_SUCCEED)
return GDK_FAIL;
if (BUNappend(lg->dcatalog, &pos, true) == GDK_SUCCEED) {
- lg->deleted++;
if (lg->current)
lg->current->deleted++;
return GDK_SUCCEED;
diff --git a/gdk/gdk_logger_internals.h b/gdk/gdk_logger_internals.h
--- a/gdk/gdk_logger_internals.h
+++ b/gdk/gdk_logger_internals.h
@@ -76,8 +76,6 @@ struct logger {
BAT *catalog_cnt; /* count of ondisk buns (transient) */
BAT *catalog_lid; /* last tid, after which it gets
released/destroyed */
BAT *dcatalog; /* deleted from catalog table */
- BUN cnt; /* number of persistent bats, incremented on
log flushing */
- BUN deleted; /* number of destroyed persistent bats, needed
for catalog vacuum */
BAT *seqs_id; /* int id column */
BAT *seqs_val; /* lng value column */
BAT *dseqs; /* deleted from seqs table */
diff --git a/sql/storage/bat/bat_logger.c b/sql/storage/bat/bat_logger.c
--- a/sql/storage/bat/bat_logger.c
+++ b/sql/storage/bat/bat_logger.c
@@ -112,7 +112,6 @@ replace_bat(old_logger *old_lg, logger *
MT_rwlock_rdunlock(&cii.b->thashlock);
return GDK_FAIL;
}
- lg->deleted++;
break;
}
}
@@ -123,7 +122,6 @@ replace_bat(old_logger *old_lg, logger *
(rc = BUNappend(lg->catalog_cnt,
&(lng){BATcount(newcol)}, false)) == GDK_SUCCEED) {
BBPretain(newcol->batCacheid);
}
- lg->cnt++;
}
}
return rc;
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
