Changeset: 84e951b5e0e1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=84e951b5e0e1
Added Files:
sql/test/2-phase-commit/Tests/All
sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-1.sql
sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-1.stable.err
sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-1.stable.err--
sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-1.stable.out
sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-1.stable.out--
sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-2.sql
sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-2.stable.err
sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-2.stable.err--
sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-2.stable.out
sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-2.stable.out--
sql/test/2-phase-commit/Tests/InsertWithCommitDeleteWith2PC-1.sql
sql/test/2-phase-commit/Tests/InsertWithCommitDeleteWith2PC-1.stable.err
sql/test/2-phase-commit/Tests/InsertWithCommitDeleteWith2PC-1.stable.err--
sql/test/2-phase-commit/Tests/InsertWithCommitDeleteWith2PC-1.stable.out
sql/test/2-phase-commit/Tests/InsertWithCommitDeleteWith2PC-1.stable.out--
sql/test/2-phase-commit/Tests/InsertWithCommitDeleteWith2PC-2.sql
sql/test/2-phase-commit/Tests/InsertWithCommitDeleteWith2PC-2.stable.err
sql/test/2-phase-commit/Tests/InsertWithCommitDeleteWith2PC-2.stable.err--
sql/test/2-phase-commit/Tests/InsertWithCommitDeleteWith2PC-2.stable.out
sql/test/2-phase-commit/Tests/InsertWithCommitDeleteWith2PC-2.stable.out--
sql/test/2-phase-commit/Tests/MixTransactionPrecommit-1.sql
sql/test/2-phase-commit/Tests/MixTransactionPrecommit-1.stable.err
sql/test/2-phase-commit/Tests/MixTransactionPrecommit-1.stable.err--
sql/test/2-phase-commit/Tests/MixTransactionPrecommit-1.stable.out
sql/test/2-phase-commit/Tests/MixTransactionPrecommit-1.stable.out--
sql/test/2-phase-commit/Tests/MixTransactionPrecommit-2.sql
sql/test/2-phase-commit/Tests/MixTransactionPrecommit-2.stable.err
sql/test/2-phase-commit/Tests/MixTransactionPrecommit-2.stable.err--
sql/test/2-phase-commit/Tests/MixTransactionPrecommit-2.stable.out
sql/test/2-phase-commit/Tests/MixTransactionPrecommit-2.stable.out--
sql/test/2-phase-commit/Tests/MixTransactionPrecommit-cleanup.sql
sql/test/2-phase-commit/Tests/MixTransactionPrecommit-cleanup.stable.err
sql/test/2-phase-commit/Tests/MixTransactionPrecommit-cleanup.stable.err--
sql/test/2-phase-commit/Tests/MixTransactionPrecommit-cleanup.stable.out
sql/test/2-phase-commit/Tests/MixTransactionPrecommit-cleanup.stable.out--
sql/test/2-phase-commit/Tests/MultipleConnections-cleanup.sql
sql/test/2-phase-commit/Tests/MultipleConnections-cleanup.stable.err
sql/test/2-phase-commit/Tests/MultipleConnections-cleanup.stable.err--
sql/test/2-phase-commit/Tests/MultipleConnections-cleanup.stable.out
sql/test/2-phase-commit/Tests/MultipleConnections-cleanup.stable.out--
sql/test/2-phase-commit/Tests/MultipleConnectionsAllWithAutocommit.SQL.py
sql/test/2-phase-commit/Tests/MultipleConnectionsAllWithAutocommit.stable.err
sql/test/2-phase-commit/Tests/MultipleConnectionsAllWithAutocommit.stable.err--
sql/test/2-phase-commit/Tests/MultipleConnectionsAllWithAutocommit.stable.out
sql/test/2-phase-commit/Tests/MultipleConnectionsAllWithAutocommit.stable.out--
sql/test/2-phase-commit/Tests/NonUpdatePrecommitReturns0.sql
sql/test/2-phase-commit/Tests/NonUpdatePrecommitReturns0.stable.err
sql/test/2-phase-commit/Tests/NonUpdatePrecommitReturns0.stable.err--
sql/test/2-phase-commit/Tests/NonUpdatePrecommitReturns0.stable.out
sql/test/2-phase-commit/Tests/NonUpdatePrecommitReturns0.stable.out--
sql/test/2-phase-commit/Tests/PersistBeforePrecommit-1.sql
sql/test/2-phase-commit/Tests/PersistBeforePrecommit-1.stable.err
sql/test/2-phase-commit/Tests/PersistBeforePrecommit-1.stable.err--
sql/test/2-phase-commit/Tests/PersistBeforePrecommit-1.stable.out
sql/test/2-phase-commit/Tests/PersistBeforePrecommit-1.stable.out--
sql/test/2-phase-commit/Tests/PersistBeforePrecommit-2.sql
sql/test/2-phase-commit/Tests/PersistBeforePrecommit-2.stable.err
sql/test/2-phase-commit/Tests/PersistBeforePrecommit-2.stable.err--
sql/test/2-phase-commit/Tests/PersistBeforePrecommit-2.stable.out
sql/test/2-phase-commit/Tests/PersistBeforePrecommit-2.stable.out--
sql/test/2-phase-commit/Tests/PersistBeforePrecommitWithRollback-1.sql
sql/test/2-phase-commit/Tests/PersistBeforePrecommitWithRollback-1.stable.err
sql/test/2-phase-commit/Tests/PersistBeforePrecommitWithRollback-1.stable.err--
sql/test/2-phase-commit/Tests/PersistBeforePrecommitWithRollback-1.stable.out
sql/test/2-phase-commit/Tests/PersistBeforePrecommitWithRollback-1.stable.out--
sql/test/2-phase-commit/Tests/PersistBeforePrecommitWithRollback-2.sql
sql/test/2-phase-commit/Tests/PersistBeforePrecommitWithRollback-2.stable.err
sql/test/2-phase-commit/Tests/PersistBeforePrecommitWithRollback-2.stable.err--
sql/test/2-phase-commit/Tests/PersistBeforePrecommitWithRollback-2.stable.out
sql/test/2-phase-commit/Tests/PersistBeforePrecommitWithRollback-2.stable.out--
sql/test/2-phase-commit/Tests/PrecommitWithoutPersists-1.sql
sql/test/2-phase-commit/Tests/PrecommitWithoutPersists-1.stable.err
sql/test/2-phase-commit/Tests/PrecommitWithoutPersists-1.stable.err--
sql/test/2-phase-commit/Tests/PrecommitWithoutPersists-1.stable.out
sql/test/2-phase-commit/Tests/PrecommitWithoutPersists-1.stable.out--
sql/test/2-phase-commit/Tests/PrecommitWithoutPersists-2.sql
sql/test/2-phase-commit/Tests/PrecommitWithoutPersists-2.stable.err
sql/test/2-phase-commit/Tests/PrecommitWithoutPersists-2.stable.err--
sql/test/2-phase-commit/Tests/PrecommitWithoutPersists-2.stable.out
sql/test/2-phase-commit/Tests/PrecommitWithoutPersists-2.stable.out--
sql/test/2-phase-commit/Tests/ReadsItsOwnWrites-cleanup.sql
sql/test/2-phase-commit/Tests/ReadsItsOwnWrites-cleanup.stable.err
sql/test/2-phase-commit/Tests/ReadsItsOwnWrites-cleanup.stable.err--
sql/test/2-phase-commit/Tests/ReadsItsOwnWrites-cleanup.stable.out
sql/test/2-phase-commit/Tests/ReadsItsOwnWrites-cleanup.stable.out--
sql/test/2-phase-commit/Tests/ReadsItsOwnWrites.SQL.py
sql/test/2-phase-commit/Tests/ReadsItsOwnWrites.stable.err
sql/test/2-phase-commit/Tests/ReadsItsOwnWrites.stable.err--
sql/test/2-phase-commit/Tests/ReadsItsOwnWrites.stable.out
sql/test/2-phase-commit/Tests/ReadsItsOwnWrites.stable.out--
sql/test/2-phase-commit/Tests/RollbackAfterPersistcommitHasNoEffect-1.sql
sql/test/2-phase-commit/Tests/RollbackAfterPersistcommitHasNoEffect-1.stable.err
sql/test/2-phase-commit/Tests/RollbackAfterPersistcommitHasNoEffect-1.stable.err--
sql/test/2-phase-commit/Tests/RollbackAfterPersistcommitHasNoEffect-1.stable.out
sql/test/2-phase-commit/Tests/RollbackAfterPersistcommitHasNoEffect-1.stable.out--
sql/test/2-phase-commit/Tests/RollbackAfterPersistcommitHasNoEffect-2.sql
sql/test/2-phase-commit/Tests/RollbackAfterPersistcommitHasNoEffect-2.stable.err
sql/test/2-phase-commit/Tests/RollbackAfterPersistcommitHasNoEffect-2.stable.err--
sql/test/2-phase-commit/Tests/RollbackAfterPersistcommitHasNoEffect-2.stable.out
sql/test/2-phase-commit/Tests/RollbackAfterPersistcommitHasNoEffect-2.stable.out--
sql/test/2-phase-commit/Tests/RollbackAfterPrecommit-1.sql
sql/test/2-phase-commit/Tests/RollbackAfterPrecommit-1.stable.err
sql/test/2-phase-commit/Tests/RollbackAfterPrecommit-1.stable.err--
sql/test/2-phase-commit/Tests/RollbackAfterPrecommit-1.stable.out
sql/test/2-phase-commit/Tests/RollbackAfterPrecommit-1.stable.out--
sql/test/2-phase-commit/Tests/RollbackAfterPrecommit-2.sql
sql/test/2-phase-commit/Tests/RollbackAfterPrecommit-2.stable.err
sql/test/2-phase-commit/Tests/RollbackAfterPrecommit-2.stable.err--
sql/test/2-phase-commit/Tests/RollbackAfterPrecommit-2.stable.out
sql/test/2-phase-commit/Tests/RollbackAfterPrecommit-2.stable.out--
sql/test/2-phase-commit/Tests/RollbackBeforePrecommit-1.sql
sql/test/2-phase-commit/Tests/RollbackBeforePrecommit-1.stable.err
sql/test/2-phase-commit/Tests/RollbackBeforePrecommit-1.stable.err--
sql/test/2-phase-commit/Tests/RollbackBeforePrecommit-1.stable.out
sql/test/2-phase-commit/Tests/RollbackBeforePrecommit-1.stable.out--
sql/test/2-phase-commit/Tests/RollbackBeforePrecommit-2.sql
sql/test/2-phase-commit/Tests/RollbackBeforePrecommit-2.stable.err
sql/test/2-phase-commit/Tests/RollbackBeforePrecommit-2.stable.err--
sql/test/2-phase-commit/Tests/RollbackBeforePrecommit-2.stable.out
sql/test/2-phase-commit/Tests/RollbackBeforePrecommit-2.stable.out--
sql/test/2-phase-commit/Tests/TestAutocommitUpdates-1.sql
sql/test/2-phase-commit/Tests/TestAutocommitUpdates-1.stable.err
sql/test/2-phase-commit/Tests/TestAutocommitUpdates-1.stable.err--
sql/test/2-phase-commit/Tests/TestAutocommitUpdates-1.stable.out
sql/test/2-phase-commit/Tests/TestAutocommitUpdates-1.stable.out--
sql/test/2-phase-commit/Tests/TestAutocommitUpdates-2.sql
sql/test/2-phase-commit/Tests/TestAutocommitUpdates-2.stable.err
sql/test/2-phase-commit/Tests/TestAutocommitUpdates-2.stable.err--
sql/test/2-phase-commit/Tests/TestAutocommitUpdates-2.stable.out
sql/test/2-phase-commit/Tests/TestAutocommitUpdates-2.stable.out--
sql/test/2-phase-commit/Tests/TestAutocommitUpdates-3.sql
sql/test/2-phase-commit/Tests/TestAutocommitUpdates-3.stable.err
sql/test/2-phase-commit/Tests/TestAutocommitUpdates-3.stable.err--
sql/test/2-phase-commit/Tests/TestAutocommitUpdates-3.stable.out
sql/test/2-phase-commit/Tests/TestAutocommitUpdates-3.stable.out--
sql/test/2-phase-commit/Tests/TestAutocommitUpdates-4.sql
sql/test/2-phase-commit/Tests/TestAutocommitUpdates-4.stable.err
sql/test/2-phase-commit/Tests/TestAutocommitUpdates-4.stable.err--
sql/test/2-phase-commit/Tests/TestAutocommitUpdates-4.stable.out
sql/test/2-phase-commit/Tests/TestAutocommitUpdates-4.stable.out--
sql/test/2-phase-commit/Tests/TwoInsetsIn1Transaction.sql
sql/test/2-phase-commit/Tests/TwoInsetsIn1Transaction.stable.err
sql/test/2-phase-commit/Tests/TwoInsetsIn1Transaction.stable.err--
sql/test/2-phase-commit/Tests/TwoInsetsIn1Transaction.stable.out
sql/test/2-phase-commit/Tests/TwoInsetsIn1Transaction.stable.out--
sql/test/2-phase-commit/Tests/setup.sql
sql/test/2-phase-commit/Tests/setup.stable.err
sql/test/2-phase-commit/Tests/setup.stable.err--
sql/test/2-phase-commit/Tests/setup.stable.out
sql/test/2-phase-commit/Tests/setup.stable.out--
Removed Files:
sql/test/HTM/Tests/All
sql/test/HTM/Tests/InsertWith2PCDeleteWithCommit-1.sql
sql/test/HTM/Tests/InsertWith2PCDeleteWithCommit-1.stable.err
sql/test/HTM/Tests/InsertWith2PCDeleteWithCommit-1.stable.out
sql/test/HTM/Tests/InsertWith2PCDeleteWithCommit-2.sql
sql/test/HTM/Tests/InsertWith2PCDeleteWithCommit-2.stable.err
sql/test/HTM/Tests/InsertWith2PCDeleteWithCommit-2.stable.out
sql/test/HTM/Tests/InsertWithCommitDeleteWith2PC-1.sql
sql/test/HTM/Tests/InsertWithCommitDeleteWith2PC-1.stable.err
sql/test/HTM/Tests/InsertWithCommitDeleteWith2PC-1.stable.out
sql/test/HTM/Tests/InsertWithCommitDeleteWith2PC-2.sql
sql/test/HTM/Tests/InsertWithCommitDeleteWith2PC-2.stable.err
sql/test/HTM/Tests/InsertWithCommitDeleteWith2PC-2.stable.out
sql/test/HTM/Tests/MixTransactionPrecommit-1.sql
sql/test/HTM/Tests/MixTransactionPrecommit-1.stable.err
sql/test/HTM/Tests/MixTransactionPrecommit-1.stable.out
sql/test/HTM/Tests/MixTransactionPrecommit-2.sql
sql/test/HTM/Tests/MixTransactionPrecommit-2.stable.err
sql/test/HTM/Tests/MixTransactionPrecommit-2.stable.out
sql/test/HTM/Tests/MixTransactionPrecommit-cleanup.sql
sql/test/HTM/Tests/MixTransactionPrecommit-cleanup.stable.err
sql/test/HTM/Tests/MixTransactionPrecommit-cleanup.stable.out
sql/test/HTM/Tests/MultipleConnections-cleanup.sql
sql/test/HTM/Tests/MultipleConnections-cleanup.stable.err
sql/test/HTM/Tests/MultipleConnections-cleanup.stable.out
sql/test/HTM/Tests/MultipleConnectionsAllWithAutocommit.SQL.py
sql/test/HTM/Tests/MultipleConnectionsAllWithAutocommit.stable.err
sql/test/HTM/Tests/MultipleConnectionsAllWithAutocommit.stable.out
sql/test/HTM/Tests/NonUpdatePrecommitReturns0.sql
sql/test/HTM/Tests/NonUpdatePrecommitReturns0.stable.err
sql/test/HTM/Tests/NonUpdatePrecommitReturns0.stable.out
sql/test/HTM/Tests/PersistBeforePrecommit-1.sql
sql/test/HTM/Tests/PersistBeforePrecommit-1.stable.err
sql/test/HTM/Tests/PersistBeforePrecommit-1.stable.out
sql/test/HTM/Tests/PersistBeforePrecommit-2.sql
sql/test/HTM/Tests/PersistBeforePrecommit-2.stable.err
sql/test/HTM/Tests/PersistBeforePrecommit-2.stable.out
sql/test/HTM/Tests/PersistBeforePrecommitWithRollback-1.sql
sql/test/HTM/Tests/PersistBeforePrecommitWithRollback-1.stable.err
sql/test/HTM/Tests/PersistBeforePrecommitWithRollback-1.stable.out
sql/test/HTM/Tests/PersistBeforePrecommitWithRollback-2.sql
sql/test/HTM/Tests/PersistBeforePrecommitWithRollback-2.stable.err
sql/test/HTM/Tests/PersistBeforePrecommitWithRollback-2.stable.out
sql/test/HTM/Tests/PrecommitWithoutPersists-1.sql
sql/test/HTM/Tests/PrecommitWithoutPersists-1.stable.err
sql/test/HTM/Tests/PrecommitWithoutPersists-1.stable.out
sql/test/HTM/Tests/PrecommitWithoutPersists-2.sql
sql/test/HTM/Tests/PrecommitWithoutPersists-2.stable.err
sql/test/HTM/Tests/PrecommitWithoutPersists-2.stable.out
sql/test/HTM/Tests/ReadsItsOwnWrites-cleanup.sql
sql/test/HTM/Tests/ReadsItsOwnWrites-cleanup.stable.err
sql/test/HTM/Tests/ReadsItsOwnWrites-cleanup.stable.out
sql/test/HTM/Tests/ReadsItsOwnWrites.SQL.py
sql/test/HTM/Tests/ReadsItsOwnWrites.stable.err
sql/test/HTM/Tests/ReadsItsOwnWrites.stable.out
sql/test/HTM/Tests/RollbackAfterPersistcommitHasNoEffect-1.sql
sql/test/HTM/Tests/RollbackAfterPersistcommitHasNoEffect-1.stable.err
sql/test/HTM/Tests/RollbackAfterPersistcommitHasNoEffect-1.stable.out
sql/test/HTM/Tests/RollbackAfterPersistcommitHasNoEffect-2.sql
sql/test/HTM/Tests/RollbackAfterPersistcommitHasNoEffect-2.stable.err
sql/test/HTM/Tests/RollbackAfterPersistcommitHasNoEffect-2.stable.out
sql/test/HTM/Tests/RollbackAfterPrecommit-1.sql
sql/test/HTM/Tests/RollbackAfterPrecommit-1.stable.err
sql/test/HTM/Tests/RollbackAfterPrecommit-1.stable.out
sql/test/HTM/Tests/RollbackAfterPrecommit-2.sql
sql/test/HTM/Tests/RollbackAfterPrecommit-2.stable.err
sql/test/HTM/Tests/RollbackAfterPrecommit-2.stable.out
sql/test/HTM/Tests/RollbackBeforePrecommit-1.sql
sql/test/HTM/Tests/RollbackBeforePrecommit-1.stable.err
sql/test/HTM/Tests/RollbackBeforePrecommit-1.stable.out
sql/test/HTM/Tests/RollbackBeforePrecommit-2.sql
sql/test/HTM/Tests/RollbackBeforePrecommit-2.stable.err
sql/test/HTM/Tests/RollbackBeforePrecommit-2.stable.out
sql/test/HTM/Tests/TestAutocommitUpdates-1.sql
sql/test/HTM/Tests/TestAutocommitUpdates-1.stable.err
sql/test/HTM/Tests/TestAutocommitUpdates-1.stable.out
sql/test/HTM/Tests/TestAutocommitUpdates-2.sql
sql/test/HTM/Tests/TestAutocommitUpdates-2.stable.err
sql/test/HTM/Tests/TestAutocommitUpdates-2.stable.out
sql/test/HTM/Tests/TestAutocommitUpdates-3.sql
sql/test/HTM/Tests/TestAutocommitUpdates-3.stable.err
sql/test/HTM/Tests/TestAutocommitUpdates-3.stable.out
sql/test/HTM/Tests/TestAutocommitUpdates-4.sql
sql/test/HTM/Tests/TestAutocommitUpdates-4.stable.err
sql/test/HTM/Tests/TestAutocommitUpdates-4.stable.out
sql/test/HTM/Tests/TwoInsetsIn1Transaction.sql
sql/test/HTM/Tests/TwoInsetsIn1Transaction.stable.err
sql/test/HTM/Tests/TwoInsetsIn1Transaction.stable.out
sql/test/HTM/Tests/setup.sql
sql/test/HTM/Tests/setup.stable.err
sql/test/HTM/Tests/setup.stable.out
Modified Files:
gdk/gdk_logger.c
gdk/gdk_logger.h
sql/include/sql_catalog.h
sql/server/sql_mvc.c
sql/storage/bat/bat_logger.c
sql/storage/sql_storage.h
sql/storage/store.c
Branch: HTM
Log Message:
Replace reference to HTM with more generic 2-phase-commit such
diffs (truncated from 4838 to 300 lines):
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -94,8 +94,8 @@ typedef struct logformat_t {
char flag;
int tid;
lng nr;
- lng htm_id;
- lng global_commit;
+ lng precommit_id;
+ int persistcommit;
} logformat;
static int bm_commit(logger *lg);
@@ -190,8 +190,8 @@ log_read_format(logger *l, logformat *da
return mnstr_read(l->log, &data->flag, 1, 1) == 1 &&
mnstr_readLng(l->log, &data->nr) == 1 &&
mnstr_readInt(l->log, &data->tid) == 1 &&
- mnstr_readLng(l->log, &data->htm_id) == 1 &&
- mnstr_readLng(l->log, &data->global_commit) == 1;
+ mnstr_readLng(l->log, &data->precommit_id) == 1 &&
+ mnstr_readInt(l->log, &data->persistcommit) == 1;
}
static int
@@ -200,8 +200,8 @@ log_write_format(logger *l, logformat *d
if (mnstr_write(l->log, &data->flag, 1, 1) == 1 &&
mnstr_writeLng(l->log, data->nr) &&
mnstr_writeInt(l->log, data->tid) &&
- mnstr_writeLng(l->log, data->htm_id) &&
- mnstr_writeLng(l->log, data->global_commit))
+ mnstr_writeLng(l->log, data->precommit_id) &&
+ mnstr_writeInt(l->log, data->persistcommit))
return LOG_OK;
fprintf(stderr, "!ERROR: log_write_format: write failed\n");
return LOG_ERR;
@@ -1015,8 +1015,8 @@ logger_readlog(logger *lg, char *filenam
err = 1;
else if (l.tid != l.nr) /* abort record */
tr = tr_abort(lg, tr);
- else if (l.htm_id == 0 || (l.htm_id > 0 &&
l.global_commit == 1))
- /* htm == 0: not a 2-pahse transaction
+ else if (l.precommit_id == 0 || (l.precommit_id > 0 &&
l.persistcommit == 1))
+ /* precommit_id == 0: not a 2-phase transaction
otherwise the transaction might must be globally committed to
re-commit */
tr = tr_commit(lg, tr);
break;
@@ -1808,7 +1808,7 @@ logger_new(int debug, const char *fn, co
lg->id = 1;
lg->tid = 0;
- lg->htm_id = -1;
+ lg->precommit_id = -1;
#if SIZEOF_OID == 8
lg->read32bitoid = 0;
#endif
@@ -2245,8 +2245,8 @@ log_bat_persists(logger *lg, BAT *b, con
}
l.flag = flag;
l.tid = lg->tid;
- l.htm_id = lg->htm_id;
- l.global_commit = 0;
+ l.precommit_id = lg->precommit_id;
+ l.persistcommit = 0;
lg->changes++;
if (log_write_format(lg, &l) == LOG_ERR ||
log_write_string(lg, name) == LOG_ERR)
@@ -2312,8 +2312,8 @@ log_bat_transient(logger *lg, const char
l.flag = LOG_DESTROY;
l.tid = lg->tid;
l.nr = 0;
- l.htm_id = lg->htm_id;
- l.global_commit = 0;
+ l.precommit_id = lg->precommit_id;
+ l.persistcommit = 0;
lg->changes++;
/* if this is a snapshot bat, we need to skip all changes */
@@ -2374,8 +2374,8 @@ log_delta(logger *lg, BAT *uid, BAT *uva
l.tid = lg->tid;
l.nr = (BUNlast(uval) - BUNfirst(uval));
- l.htm_id = lg->htm_id;
- l.global_commit = 0;
+ l.precommit_id = lg->precommit_id;
+ l.persistcommit = 0;
lg->changes += l.nr;
if (l.nr) {
@@ -2419,8 +2419,8 @@ log_bat(logger *lg, BAT *b, const char *
l.tid = lg->tid;
l.nr = (BUNlast(b) - b->batInserted);
- l.htm_id = lg->htm_id;
- l.global_commit = 0;
+ l.precommit_id = lg->precommit_id;
+ l.persistcommit = 0;
lg->changes += l.nr;
if (l.nr) {
@@ -2494,8 +2494,8 @@ log_bat_clear(logger *lg, const char *na
l.nr = 1;
l.tid = lg->tid;
- l.htm_id = lg->htm_id;
- l.global_commit = 0;
+ l.precommit_id = lg->precommit_id;
+ l.persistcommit = 0;
lg->changes += l.nr;
l.flag = LOG_CLEAR;
@@ -2510,36 +2510,36 @@ log_bat_clear(logger *lg, const char *na
}
int
-log_tstart(logger *lg, lng htm_id)
+log_tstart(logger *lg, lng precommit_id)
{
logformat l;
l.flag = LOG_START;
l.tid = ++lg->tid;
l.nr = lg->tid;
- lg->htm_id = htm_id;
- l.htm_id = lg->htm_id;
- l.global_commit = 0;
+ lg->precommit_id = precommit_id;
+ l.precommit_id = lg->precommit_id;
+ l.persistcommit = 0;
if (lg->debug & 1)
- fprintf(stderr, "#log_tstart %d:" LLFMT "\n", lg->tid, htm_id);
+ fprintf(stderr, "#log_tstart %d:" LLFMT "\n", lg->tid,
precommit_id);
return log_write_format(lg, &l);
}
int
-log_globalpersist(logger *lg, lng htm_id)
+log_persist_precommit(logger *lg, lng precommit_id)
{
logformat l;
l.flag = LOG_END;
l.tid = lg->tid;
l.nr = lg->tid;
- l.htm_id = htm_id;
- l.global_commit = 1;
+ l.precommit_id = precommit_id;
+ l.persistcommit = 1;
if (lg->debug & 1)
- fprintf(stderr, "#log_globalpersist %d:" LLFMT "\n", lg->tid,
htm_id);
+ fprintf(stderr, "#log_globalpersist %d:" LLFMT "\n", lg->tid,
precommit_id);
if (log_write_format(lg, &l) == LOG_ERR ||
mnstr_flush(lg->log) ||
@@ -2620,8 +2620,8 @@ log_tend(logger *lg)
l.flag = LOG_END;
l.tid = lg->tid;
l.nr = lg->tid;
- l.htm_id = lg->htm_id;
- l.global_commit = 0;
+ l.precommit_id = lg->precommit_id;
+ l.persistcommit = 0;
if (res != GDK_SUCCEED ||
log_write_format(lg, &l) == LOG_ERR ||
mnstr_flush(lg->log) ||
@@ -2644,8 +2644,8 @@ log_abort(logger *lg)
l.flag = LOG_END;
l.tid = lg->tid;
l.nr = -1;
- l.htm_id = lg->htm_id;
- l.global_commit = 0;
+ l.precommit_id = lg->precommit_id;
+ l.persistcommit = 0;
if (log_write_format(lg, &l) == LOG_ERR ||
mnstr_flush(lg->log) ||
@@ -2663,8 +2663,8 @@ log_sequence_(logger *lg, int seq, lng v
l.flag = LOG_SEQ;
l.tid = lg->tid;
l.nr = seq;
- l.htm_id = lg->htm_id;
- l.global_commit = 0;
+ l.precommit_id = lg->precommit_id;
+ l.persistcommit = 0;
if (lg->debug & 1)
fprintf(stderr, "#log_sequence_ (%d," LLFMT ")\n", seq, val);
diff --git a/gdk/gdk_logger.h b/gdk/gdk_logger.h
--- a/gdk/gdk_logger.h
+++ b/gdk/gdk_logger.h
@@ -46,7 +46,7 @@ typedef struct logger {
int version;
lng id;
int tid;
- lng htm_id;
+ lng precommit_id;
#if SIZEOF_OID == 8
/* on 64-bit architecture, read OIDs as 32 bits (for upgrading
* oid size) */
@@ -130,10 +130,10 @@ gdk_export int log_bat_persists(logger *
gdk_export int log_bat_transient(logger *lg, const char *n);
gdk_export int log_delta(logger *lg, BAT *uid, BAT *uval, const char *n);
-gdk_export int log_tstart(logger *lg, lng htm_id); /* TODO return
transaction id */
+gdk_export int log_tstart(logger *lg, lng precommit_id);
gdk_export int log_tend(logger *lg);
gdk_export int log_abort(logger *lg);
-gdk_export int log_globalpersist(logger *lg, lng htm_id);
+gdk_export int log_persist_precommit(logger *lg, lng precommit_id);
gdk_export int log_sequence(logger *lg, int seq, lng id);
diff --git a/sql/include/sql_catalog.h b/sql/include/sql_catalog.h
--- a/sql/include/sql_catalog.h
+++ b/sql/include/sql_catalog.h
@@ -211,7 +211,7 @@ typedef struct sql_trans {
struct sql_trans *parent; /* multilevel transaction support */
backend_stack stk;
- lng htm_id; /* global transation id provided by the CoherentPaaS
HTM */
+ lng precommit_id; /* global transaction id use for 2-phase
commits */
} sql_trans;
typedef struct sql_schema {
diff --git a/sql/server/sql_mvc.c b/sql/server/sql_mvc.c
--- a/sql/server/sql_mvc.c
+++ b/sql/server/sql_mvc.c
@@ -306,7 +306,7 @@ mvc_commit(mvc *m, int chain, const char
if (sql_trans_validate(tr)) {
/* execute commit */
- tr->htm_id = 0;
+ tr->precommit_id = 0;
if ((result = sql_trans_commit(tr)) != SQL_OK) {
char *msg;
store_unlock();
@@ -330,8 +330,8 @@ int
mvc_precommit(mvc *m, int chain, const char *name, lng id) {
int result = SQL_OK;//, wait = 0;
sql_trans *tr = m->session->tr;
- // set CPaaS HTM id
- tr->htm_id = id;
+ // set precommit_id
+ tr->precommit_id = id;
if ((result = mvc_commit_prepare(m, chain, name, tr)) != SQL_OK) {
store_unlock();
@@ -362,7 +362,7 @@ int
mvc_persistcommit(mvc *m, int chain, const char *name, lng id) {
int result = SQL_OK;//, wait = 0;
sql_trans *tr = m->session->tr;
- if (tr->htm_id != id) {
+ if (tr->precommit_id != id) {
(void)sql_error(m, 010, "40000!PERSISTCOMMIT: transaction is
aborted because pre-commit transaction id missmatch. Transaction was either not
pre-commited or aborted.");
return -1;
}
@@ -393,7 +393,7 @@ mvc_rollback(mvc *m, int chain, const ch
store_lock();
// Reset pre-commit id
- tr->htm_id = 0;
+ tr->precommit_id = 0;
if (m->qc)
qc_clean(m->qc);
if (name && name[0] != '\0') {
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
@@ -272,9 +272,9 @@ bl_log_isnew_shared(void)
}
static int
-bl_tstart(lng htm_id)
+bl_tstart(lng precommit_id)
{
- return log_tstart(bat_logger, htm_id);
+ return log_tstart(bat_logger, precommit_id);
}
static int
@@ -296,9 +296,9 @@ bl_reload_shared(void)
}
static int
-bl_globalpersist(lng htm_id)
+bl_persist_precommit(lng precommit_id)
{
- return log_globalpersist(bat_logger, htm_id);
+ return log_persist_precommit(bat_logger, precommit_id);
}
int
@@ -314,7 +314,7 @@ bat_logger_init( logger_functions *lf )
lf->log_tstart = bl_tstart;
lf->log_tend = bl_tend;
lf->log_sequence = bl_sequence;
- lf->log_globalpersist = bl_globalpersist;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
