Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit99ea999

Browse files
committed
Fix compiler errors
1 parent5fb4f7f commit99ea999

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

‎contrib/pg_xtm/libdtm.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ void DtmGlobalSetTransStatus(TransactionId xid, XidStatus status, bool wait);
2626
XidStatusDtmGlobalGetTransStatus(TransactionIdxid,boolwait);
2727

2828
// Reserve XIDs for local transaction
29-
TransactioinIdDtmGlobalReserve(intnXids);
29+
TransactionIdDtmGlobalReserve(TransactionIdxid,intnXids);
3030

3131

3232
#endif

‎contrib/pg_xtm/pg_dtm.c‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
sisva/*
1+
/*
22
* pg_dtm.c
33
*
44
* Pluggable distributed transaction manager
@@ -59,7 +59,7 @@ static void DtmSetTransactionStatus(TransactionId xid, int nsubxids, Transaction
5959
staticvoidDtmUpdateRecentXmin(void);
6060
staticvoidDtmInitialize(void);
6161
staticvoidDtmXactCallback(XactEventevent,void*arg);
62-
staticvoidDtmGetNextXid(void);
62+
staticTransactionIdDtmGetNextXid(void);
6363

6464
staticboolTransactionIdIsInDtmSnapshot(TransactionIdxid);
6565
staticboolTransactionIdIsInDoubt(TransactionIdxid);
@@ -115,9 +115,9 @@ static bool TransactionIdIsInDoubt(TransactionId xid)
115115
boolinDoubt;
116116

117117
if (!TransactionIdIsInDtmSnapshot(xid)) {
118-
LWLockAcquire(dtm->lock,LW_SHARED);
118+
LWLockAcquire(dtm->hashLock,LW_SHARED);
119119
inDoubt=hash_search(xid_in_doubt,&xid,HASH_FIND,NULL)!=NULL;
120-
LWLockRelease(dtm->lock);
120+
LWLockRelease(dtm->hashLock);
121121
if (!inDoubt) {
122122
XLogRecPtrlsn;
123123
inDoubt=CLOGTransactionIdGetStatus(xid,&lsn)!=TRANSACTION_STATUS_IN_PROGRESS;
@@ -285,10 +285,9 @@ static void DtmSetTransactionStatus(TransactionId xid, int nsubxids, Transaction
285285
{
286286
XTM_TRACE("XTM: DtmSetTransactionStatus %u = %u \n",xid,status);
287287
if (!RecoveryInProgress()) {
288-
if (DtmGlobalTransaction) {
288+
if (TransactionIdIsValid(DtmNextXid)) {
289289
/* Already should be IN_PROGRESS */
290290
/* CLOGTransactionIdSetTreeStatus(xid, nsubxids, subxids, TRANSACTION_STATUS_IN_PROGRESS, lsn); */
291-
DtmGlobalTransaction= false;
292291
CurrentTransactionSnapshot=NULL;
293292
if (status==TRANSACTION_STATUS_ABORTED) {
294293
CLOGTransactionIdSetTreeStatus(xid,nsubxids,subxids,status,lsn);
@@ -300,9 +299,7 @@ static void DtmSetTransactionStatus(TransactionId xid, int nsubxids, Transaction
300299
LWLockAcquire(dtm->hashLock,LW_EXCLUSIVE);
301300
hash_search(xid_in_doubt,&DtmNextXid,HASH_ENTER,NULL);
302301
LWLockRelease(dtm->hashLock);
303-
if (!DtmGlobalSetTransStatus(xid,status, true)) {
304-
elog(ERROR,"DTMD failed to set transaction status");
305-
}
302+
DtmGlobalSetTransStatus(xid,status, true);
306303
XTM_INFO("Commit transaction %d\n",xid);
307304
}
308305
}else {
@@ -370,6 +367,9 @@ DtmXactCallback(XactEvent event, void *arg)
370367
/* no break */
371368
caseXACT_EVENT_ABORT:
372369
DtmNextXid=InvalidTransactionId;
370+
break;
371+
default:
372+
break;
373373
}
374374
}
375375
}
@@ -466,7 +466,7 @@ dtm_get_current_snapshot_xmax(PG_FUNCTION_ARGS)
466466
Datum
467467
dtm_begin_transaction(PG_FUNCTION_ARGS)
468468
{
469-
intnPaticipants=PG_GETARG_INT32(0);
469+
intnParticipants=PG_GETARG_INT32(0);
470470
Assert(!TransactionIdIsValid(DtmNextXid));
471471

472472
DtmNextXid=DtmGlobalStartTransaction(nParticipants,&DtmSnapshot);

‎src/include/access/xtm.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ typedef struct
2020
void (*SetTransactionStatus)(TransactionIdxid,intnsubxids,TransactionId*subxids,XidStatusstatus,XLogRecPtrlsn);
2121
Snapshot (*GetSnapshot)();
2222
Snapshot (*CopySnapshot)(Snapshotsnapshot);
23-
TransactionIdGetNextXid();
23+
TransactionId(*GetNextXid)();
2424
}TransactionManager;
2525

2626
externTransactionManager*TM;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp