diff options
Diffstat (limited to 'src/backend/access/transam/xact.c')
| -rw-r--r-- | src/backend/access/transam/xact.c | 42 |
1 files changed, 10 insertions, 32 deletions
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c index 39e4afeb749..10de2f8a6d5 100644 --- a/src/backend/access/transam/xact.c +++ b/src/backend/access/transam/xact.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.122 2002/05/17 20:53:33 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.123 2002/05/21 22:05:53 tgl Exp $ * * NOTES * Transaction aborts can now occur two ways: @@ -350,14 +350,6 @@ GetCurrentCommandId(void) return s->commandId; } -CommandId -GetScanCommandId(void) -{ - TransactionState s = CurrentTransactionState; - - return s->scanCommandId; -} - /* -------------------------------- * GetCurrentTransactionStartTime @@ -418,17 +410,6 @@ CommandIdIsCurrentCommandId(CommandId cid) return (cid == s->commandId) ? true : false; } -bool -CommandIdGEScanCommandId(CommandId cid) -{ - TransactionState s = CurrentTransactionState; - - if (AMI_OVERRIDE) - return false; - - return (cid >= s->scanCommandId) ? true : false; -} - /* -------------------------------- * CommandCounterIncrement @@ -437,11 +418,17 @@ CommandIdGEScanCommandId(CommandId cid) void CommandCounterIncrement(void) { - CurrentTransactionStateData.commandId += 1; - if (CurrentTransactionStateData.commandId == FirstCommandId) + TransactionState s = CurrentTransactionState; + + s->commandId += 1; + if (s->commandId == FirstCommandId) /* check for overflow */ elog(ERROR, "You may only have 2^32-1 commands per transaction"); - CurrentTransactionStateData.scanCommandId = CurrentTransactionStateData.commandId; + /* Propagate new command ID into query snapshots, if set */ + if (QuerySnapshot) + QuerySnapshot->curcid = s->commandId; + if (SerializableSnapshot) + SerializableSnapshot->curcid = s->commandId; /* * make cache changes visible to me. AtCommit_LocalCache() instead of @@ -451,11 +438,6 @@ CommandCounterIncrement(void) AtStart_Cache(); } -void -SetScanCommandId(CommandId savedId) -{ - CurrentTransactionStateData.scanCommandId = savedId; -} /* ---------------------------------------------------------------- * StartTransaction stuff @@ -889,10 +871,6 @@ StartTransaction(void) * initialize current transaction state fields */ s->commandId = FirstCommandId; - s->scanCommandId = FirstCommandId; -#if NOT_USED - s->startTime = GetCurrentAbsoluteTime(); -#endif s->startTime = GetCurrentAbsoluteTimeUsec(&(s->startTimeUsec)); /* |