Changeset: 104c6909535b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=104c6909535b
Modified Files:
gdk/gdk_logger.c
Branch: default
Log Message:
Merge with Jan2014 branch.
diffs (45 lines):
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -1156,9 +1156,41 @@ logger_new(int debug, char *fn, char *lo
}
fp = fopen(filename, "r");
+ snprintf(bak, BUFSIZ, "%s_catalog_bid", fn);
+ catalog_bid = BBPindex(bak);
+
snprintf(bak, BUFSIZ, "%s_catalog", fn);
bid = BBPindex(bak);
+ if (catalog_bid && bid) {
+ /* new and old both exist, destroy old to avoid
+ * confusion */
+ BAT *b;
+
+ if ((b = BATdescriptor(bid)) != NULL) {
+ BATmode(b, TRANSIENT);
+ BBPunfix(b->batCacheid);
+ }
+
+ snprintf(bak, BUFSIZ, "%s_snapshots", fn);
+ bid = BBPindex(bak);
+ if ((b = BATdescriptor(bid)) != NULL) {
+ BATmode(b, TRANSIENT);
+ BBPunfix(b->batCacheid);
+ }
+
+ snprintf(bak, BUFSIZ, "%s_seqs", fn);
+ bid = BBPindex(bak);
+ if ((b = BATdescriptor(bid)) != NULL) {
+ BATmode(b, TRANSIENT);
+ BBPunfix(b->batCacheid);
+ }
+
+ TMcommit();
+
+ bid = 0;
+ }
+
/* upgrade from old logger format; all errors are fatal since
* this should only happen on startup */
if (bid) {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
