Changeset: e887a6f73795 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e887a6f73795
Modified Files:
MonetDB/src/gdk/gdk_logger.mx
Branch: Oct2010
Log Message:
Some variable cleanup.
b was always equal to list, so no point in having both.
bi was used as iterator for both list (b) and extra.
diffs (54 lines):
diff -r fedc7397b0a4 -r e887a6f73795 MonetDB/src/gdk/gdk_logger.mx
--- a/MonetDB/src/gdk/gdk_logger.mx Mon Oct 18 15:04:32 2010 +0200
+++ b/MonetDB/src/gdk/gdk_logger.mx Mon Oct 18 17:12:52 2010 +0200
@@ -1008,40 +1008,39 @@
BUN p, q;
bat *n = (bat*)GDKmalloc(sizeof(bat) * (2 + BATcount(list) * 2 + (extra
? BATcount(extra) : 0)));
int i = 0;
- BAT *b = list;
- BATiter bi = bat_iterator(b);
+ BATiter iter = bat_iterator(list);
int res;
n[i++] = 0; /* n[0] is not used */
/* first loop over deleted then over current and new */
- for (p = b->batDeleted; p < b->batFirst; p++) {
- bat col = *(log_bid *) BUNhead(bi, p);
+ for (p = list->batDeleted; p < list->batFirst; p++) {
+ bat col = *(log_bid *) BUNhead(iter, p);
if (debug & 1)
fprintf(stderr, "commit deleted %s (%d) %s\n",
BBPname(col), col,
- (b == catalog) ? BUNtail(bi, p) : "snapshot");
+ (list == catalog) ? BUNtail(iter, p) :
"snapshot");
n[i++] = ABS(col);
}
- BATloop(b, p, q) {
- bat col = *(log_bid *) BUNhead(bi, p);
+ BATloop(list, p, q) {
+ bat col = *(log_bid *) BUNhead(iter, p);
if (debug & 1)
fprintf(stderr, "commit new %s (%d) %s\n",
BBPname(col), col,
- (b == catalog) ? BUNtail(bi, p) : "snapshot");
+ (list == catalog) ? BUNtail(iter, p) :
"snapshot");
n[i++] = ABS(col);
}
if (extra) {
- bi = bat_iterator(extra);
+ iter = bat_iterator(extra);
BATloop(extra, p, q) {
- str name = (str) BUNtail(bi, p);
+ str name = (str) BUNtail(iter, p);
if (debug & 1)
fprintf(stderr, "commit extra %s %s\n",
name,
- (b == catalog) ? BUNtail(bi, p) :
"snapshot");
+ (list == catalog) ? BUNtail(iter, p) :
"snapshot");
n[i++] = ABS(BBPindex(name));
}
}
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
