Changeset: 6e2d6a881698 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6e2d6a881698
Modified Files:
gdk/gdk_logger.c
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out
Branch: Oct2012
Log Message:
Fix upgrade from Jul2012 to Oct2012.
BATappend wants matching head columns, even though the head column of
the second arg aren't actually used.
diffs (59 lines):
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -1120,14 +1120,18 @@ logger_new(int debug, char *fn, char *lo
b = BATdescriptor(bid);
lg->snapshots_bid = logbat_new(TYPE_void, TYPE_int, 1);
- BATappend(lg->snapshots_bid, BATmirror(b), FALSE);
+ v = BATmark(b, 0);
+ BATappend(lg->snapshots_bid, BATmirror(v), FALSE);
+ BBPunfix(v->batCacheid);
BATmode(lg->snapshots_bid, PERSISTENT);
snprintf(bak, BUFSIZ, "%s_snapshots_bid", fn);
BBPrename(lg->snapshots_bid->batCacheid, bak);
logger_add_bat(lg, lg->snapshots_bid, "snapshots_bid");
lg->snapshots_tid = logbat_new(TYPE_void, TYPE_int, 1);
- BATappend(lg->snapshots_tid, b, FALSE);
+ v = BATmark(BATmirror(b), 0);
+ BATappend(lg->snapshots_tid, BATmirror(v), FALSE);
+ BBPunfix(v->batCacheid);
BATmode(lg->snapshots_tid, PERSISTENT);
snprintf(bak, BUFSIZ, "%s_snapshots_tid", fn);
BBPrename(lg->snapshots_tid->batCacheid, bak);
@@ -1140,7 +1144,9 @@ logger_new(int debug, char *fn, char *lo
b = BATdescriptor(bid);
lg->seqs_id = logbat_new(TYPE_void, TYPE_int, 1);
- BATappend(lg->seqs_id, BATmirror(b), FALSE);
+ v = BATmark(b, 0);
+ BATappend(lg->seqs_id, BATmirror(v), FALSE);
+ BBPunfix(v->batCacheid);
BATmode(lg->seqs_id, PERSISTENT);
snprintf(bak, BUFSIZ, "%s_seqs_id", fn);
BBPrename(lg->seqs_id->batCacheid, bak);
diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
@@ -19,6 +19,8 @@ stdout of test 'upgrade` in directory 't
# MonetDB/SQL module loaded
Ready.
+Running database upgrade commands:
+drop function sys.zorder_slice;
# 15:17:06 >
# 15:17:06 > "/usr/bin/python" "upgrade.SQL.py" "upgrade"
diff --git a/sql/test/testdb-upgrade/Tests/upgrade.stable.out
b/sql/test/testdb-upgrade/Tests/upgrade.stable.out
--- a/sql/test/testdb-upgrade/Tests/upgrade.stable.out
+++ b/sql/test/testdb-upgrade/Tests/upgrade.stable.out
@@ -19,6 +19,8 @@ stdout of test 'upgrade` in directory 't
# MonetDB/SQL module loaded
Ready.
+Running database upgrade commands:
+drop function sys.zorder_slice;
# 14:40:54 >
# 14:40:54 > "/usr/bin/python" "upgrade.SQL.py" "upgrade"
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
