From ecc217e89ff585fc9f670df99fd71b8abe9cf0f2 Mon Sep 17 00:00:00 2001 From: Asim R P Date: Fri, 23 Mar 2018 18:33:02 -0700 Subject: [PATCH] Remove redundant distributed transaction state. The DTX_STATE_FORCED_COMMITTED was identical to DTX_STATE_INSERTED_COMMITTED. --- src/backend/access/transam/xact.c | 3 --- src/backend/cdb/cdbtm.c | 18 +----------------- src/include/cdb/cdbtm.h | 1 - 3 files changed, 1 insertion(+), 21 deletions(-) diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c index ebb99c1e90..64818f810c 100644 --- a/src/backend/access/transam/xact.c +++ b/src/backend/access/transam/xact.c @@ -1398,9 +1398,6 @@ RecordTransactionCommit(void) if (max_wal_senders > 0) WalSndWakeup(); - if (isDtxPrepared) - forcedDistributedCommitted(&recptr); - /* * Now we may update the CLOG, if we wrote a COMMIT record above */ diff --git a/src/backend/cdb/cdbtm.c b/src/backend/cdb/cdbtm.c index d70c4dce6e..e60580b3d6 100644 --- a/src/backend/cdb/cdbtm.c +++ b/src/backend/cdb/cdbtm.c @@ -777,7 +777,7 @@ doNotifyingCommitPrepared(void) copyDirectDispatchFromTransaction(&direct); - Assert(currentGxact->state == DTX_STATE_FORCED_COMMITTED); + Assert(currentGxact->state == DTX_STATE_INSERTED_COMMITTED); setCurrentGxactState(DTX_STATE_NOTIFYING_COMMIT_PREPARED); if (strlen(currentGxact->gid) >= TMGIDSIZE) @@ -1212,7 +1212,6 @@ rollbackDtxTransaction(void) currentGxact->gid); break; - case DTX_STATE_FORCED_COMMITTED: case DTX_STATE_NOTIFYING_COMMIT_PREPARED: case DTX_STATE_INSERTING_COMMITTED: case DTX_STATE_INSERTED_COMMITTED: @@ -2259,21 +2258,6 @@ insertedDistributedCommitted(void) setCurrentGxactState(DTX_STATE_INSERTED_COMMITTED); } - -/* - * Change state to DTX_STATE_FORCED_COMMITTED. - */ -void -forcedDistributedCommitted(XLogRecPtr *recptr) -{ - elog(DTM_DEBUG5, - "forcedDistributedCommitted entering in state = %s for gid = %s (xlog record %X/%X)", - DtxStateToString(currentGxact->state), currentGxact->gid, recptr->xlogid, recptr->xrecoff); - - Assert(currentGxact->state == DTX_STATE_INSERTED_COMMITTED); - setCurrentGxactState(DTX_STATE_FORCED_COMMITTED); -} - /* generate global transaction id */ static DistributedTransactionId generateGID(void) diff --git a/src/include/cdb/cdbtm.h b/src/include/cdb/cdbtm.h index e014640845..855cd33d46 100644 --- a/src/include/cdb/cdbtm.h +++ b/src/include/cdb/cdbtm.h @@ -306,7 +306,6 @@ extern DistributedTransactionId getMaxDistributedXid(void); extern bool includeInCheckpointIsNeeded(TMGXACT *gxact); extern void insertingDistributedCommitted(void); extern void insertedDistributedCommitted(void); -extern void forcedDistributedCommitted(XLogRecPtr *recptr); extern void redoDtxCheckPoint(TMGXACT_CHECKPOINT *gxact_checkpoint); extern void redoDistributedCommitRecord(TMGXACT_LOG *gxact_log); -- GitLab