external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rename REMOTE_TRANS_INVALID to REMOTE_TRANS_IDLE (#3285) 

rename REMOTE_TRANS_INVALID to REMOTE_TRANS_IDLE
pull/3283/head^2
Marco Slot 2019-12-11 15:06:45 +01:00 committed by GitHub
parent fecf61ef1f d10f97998c
commit 7a1817370b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/distributed/connection/placement_connection.c
View File

@ -781,7 +781,7 @@ ConnectionModifiedPlacement(MultiConnection *connection)
{ {
dlist_iter placementIter; dlist_iter placementIter;
if (connection->remoteTransaction.transactionState == REMOTE_TRANS_INVALID) if (connection->remoteTransaction.transactionState == REMOTE_TRANS_NOT_STARTED)
{ {
/* /*
* When StartPlacementListConnection() is called, we set the * When StartPlacementListConnection() is called, we set the

12
src/backend/distributed/executor/adaptive_executor.c
View File

@ -1365,7 +1365,7 @@ CleanUpSessions(DistributedExecution *execution)
ClearResults(connection, false); ClearResults(connection, false);
} }
else if (!(transactionState == REMOTE_TRANS_INVALID || else if (!(transactionState == REMOTE_TRANS_NOT_STARTED ||
transactionState == REMOTE_TRANS_STARTED)) transactionState == REMOTE_TRANS_STARTED))
{ {
/* /*
@ -2467,7 +2467,7 @@ ConnectionStateMachine(WorkerSession *session)
if (!connection->remoteTransaction.beginSent) if (!connection->remoteTransaction.beginSent)
{ {
connection->remoteTransaction.transactionState = connection->remoteTransaction.transactionState =
REMOTE_TRANS_INVALID; REMOTE_TRANS_NOT_STARTED;
} }
break; break;
@ -2581,7 +2581,7 @@ TransactionStateMachine(WorkerSession *session)
switch (currentState) switch (currentState)
{ {
case REMOTE_TRANS_INVALID: case REMOTE_TRANS_NOT_STARTED:
{ {
if (execution->isTransaction) if (execution->isTransaction)
{ {
@ -2677,7 +2677,7 @@ TransactionStateMachine(WorkerSession *session)
} }
else else
{ {
transaction->transactionState = REMOTE_TRANS_INVALID; transaction->transactionState = REMOTE_TRANS_NOT_STARTED;
} }
break; break;
} }
@ -3433,7 +3433,7 @@ PlacementExecutionReady(TaskPlacementExecution *placementExecution)
&placementExecution->sessionReadyQueueNode); &placementExecution->sessionReadyQueueNode);
} }
if (transactionState == REMOTE_TRANS_INVALID || if (transactionState == REMOTE_TRANS_NOT_STARTED ||
transactionState == REMOTE_TRANS_STARTED) transactionState == REMOTE_TRANS_STARTED)
{ {
/* /*
@ -3467,7 +3467,7 @@ PlacementExecutionReady(TaskPlacementExecution *placementExecution)
RemoteTransaction *transaction = &(connection->remoteTransaction); RemoteTransaction *transaction = &(connection->remoteTransaction);
RemoteTransactionState transactionState = transaction->transactionState; RemoteTransactionState transactionState = transaction->transactionState;
if (transactionState == REMOTE_TRANS_INVALID || if (transactionState == REMOTE_TRANS_NOT_STARTED ||
transactionState == REMOTE_TRANS_STARTED) transactionState == REMOTE_TRANS_STARTED)
{ {
UpdateConnectionWaitFlags(session, UpdateConnectionWaitFlags(session,

18
src/backend/distributed/transaction/remote_transaction.c
View File

@ -61,7 +61,7 @@ StartRemoteTransactionBegin(struct MultiConnection *connection)
StringInfo beginAndSetDistributedTransactionId = makeStringInfo(); StringInfo beginAndSetDistributedTransactionId = makeStringInfo();
ListCell *subIdCell = NULL; ListCell *subIdCell = NULL;
Assert(transaction->transactionState == REMOTE_TRANS_INVALID); Assert(transaction->transactionState == REMOTE_TRANS_NOT_STARTED);
/* remember transaction as being in-progress */ /* remember transaction as being in-progress */
dlist_push_tail(&InProgressTransactions, &connection->transactionNode); dlist_push_tail(&InProgressTransactions, &connection->transactionNode);
@ -206,7 +206,7 @@ StartRemoteTransactionCommit(MultiConnection *connection)
const bool isCommit = true; const bool isCommit = true;
/* can only commit if transaction is in progress */ /* can only commit if transaction is in progress */
Assert(transaction->transactionState != REMOTE_TRANS_INVALID); Assert(transaction->transactionState != REMOTE_TRANS_NOT_STARTED);
/* can't commit if we already started to commit or abort */ /* can't commit if we already started to commit or abort */
Assert(transaction->transactionState < REMOTE_TRANS_1PC_ABORTING); Assert(transaction->transactionState < REMOTE_TRANS_1PC_ABORTING);
@ -348,7 +348,7 @@ StartRemoteTransactionAbort(MultiConnection *connection)
const bool raiseErrors = false; const bool raiseErrors = false;
const bool isNotCommit = false; const bool isNotCommit = false;
Assert(transaction->transactionState != REMOTE_TRANS_INVALID); Assert(transaction->transactionState != REMOTE_TRANS_NOT_STARTED);
/* /*
* Clear previous results, so we have a better chance to send ROLLBACK * Clear previous results, so we have a better chance to send ROLLBACK
@ -474,7 +474,7 @@ StartRemoteTransactionPrepare(struct MultiConnection *connection)
const bool raiseErrors = true; const bool raiseErrors = true;
/* can't prepare a nonexistant transaction */ /* can't prepare a nonexistant transaction */
Assert(transaction->transactionState != REMOTE_TRANS_INVALID); Assert(transaction->transactionState != REMOTE_TRANS_NOT_STARTED);
/* can't prepare in a failed transaction */ /* can't prepare in a failed transaction */
Assert(!transaction->transactionFailed); Assert(!transaction->transactionFailed);
@ -615,7 +615,7 @@ RemoteTransactionsBeginIfNecessary(List *connectionList)
* don't start it again. That's quite normal if a piece of code allows * don't start it again. That's quite normal if a piece of code allows
* cached connections. * cached connections.
*/ */
if (transaction->transactionState != REMOTE_TRANS_INVALID) if (transaction->transactionState != REMOTE_TRANS_NOT_STARTED)
{ {
continue; continue;
} }
@ -760,7 +760,7 @@ CloseRemoteTransaction(struct MultiConnection *connection)
RemoteTransaction *transaction = &connection->remoteTransaction; RemoteTransaction *transaction = &connection->remoteTransaction;
/* unlink from list of open transactions, if necessary */ /* unlink from list of open transactions, if necessary */
if (transaction->transactionState != REMOTE_TRANS_INVALID) if (transaction->transactionState != REMOTE_TRANS_NOT_STARTED)
{ {
/* XXX: Should we error out for a critical transaction? */ /* XXX: Should we error out for a critical transaction? */
@ -802,7 +802,7 @@ CoordinatedRemoteTransactionsPrepare(void)
iter.cur); iter.cur);
RemoteTransaction *transaction = &connection->remoteTransaction; RemoteTransaction *transaction = &connection->remoteTransaction;
Assert(transaction->transactionState != REMOTE_TRANS_INVALID); Assert(transaction->transactionState != REMOTE_TRANS_NOT_STARTED);
/* can't PREPARE a transaction that failed */ /* can't PREPARE a transaction that failed */
if (transaction->transactionFailed) if (transaction->transactionFailed)
@ -863,7 +863,7 @@ CoordinatedRemoteTransactionsCommit(void)
iter.cur); iter.cur);
RemoteTransaction *transaction = &connection->remoteTransaction; RemoteTransaction *transaction = &connection->remoteTransaction;
if (transaction->transactionState == REMOTE_TRANS_INVALID || if (transaction->transactionState == REMOTE_TRANS_NOT_STARTED ||
transaction->transactionState == REMOTE_TRANS_1PC_COMMITTING || transaction->transactionState == REMOTE_TRANS_1PC_COMMITTING ||
transaction->transactionState == REMOTE_TRANS_2PC_COMMITTING || transaction->transactionState == REMOTE_TRANS_2PC_COMMITTING ||
transaction->transactionState == REMOTE_TRANS_COMMITTED || transaction->transactionState == REMOTE_TRANS_COMMITTED ||
@ -920,7 +920,7 @@ CoordinatedRemoteTransactionsAbort(void)
iter.cur); iter.cur);
RemoteTransaction *transaction = &connection->remoteTransaction; RemoteTransaction *transaction = &connection->remoteTransaction;
if (transaction->transactionState == REMOTE_TRANS_INVALID || if (transaction->transactionState == REMOTE_TRANS_NOT_STARTED ||
transaction->transactionState == REMOTE_TRANS_1PC_ABORTING || transaction->transactionState == REMOTE_TRANS_1PC_ABORTING ||
transaction->transactionState == REMOTE_TRANS_2PC_ABORTING || transaction->transactionState == REMOTE_TRANS_2PC_ABORTING ||
transaction->transactionState == REMOTE_TRANS_ABORTED) transaction->transactionState == REMOTE_TRANS_ABORTED)

2
src/include/distributed/remote_transaction.h
View File

@ -26,7 +26,7 @@ struct MultiConnection;
typedef enum typedef enum
{ {
/* no transaction active */ /* no transaction active */
REMOTE_TRANS_INVALID = 0, REMOTE_TRANS_NOT_STARTED = 0,
/* transaction start */ /* transaction start */
REMOTE_TRANS_STARTING, REMOTE_TRANS_STARTING,