Commit6beea7c

committed

Revert "Detect too late snapshot"

This reverts commitaf5213a.

1 parentcd9d3a2 commit6beea7cCopy full SHA for 6beea7c

File tree

-9

lines changed

-9

lines changed

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -748,7 +748,6 @@ static void DtmInitialize()`
`748`	`748`	`dtm->initialized= false;`
`749`	`749`	`BgwPoolInit(&dtm->pool,MMExecutor,MMDatabaseName,MMQueueSize);`
`750`	`750`	`RegisterXactCallback(DtmXactCallback,NULL);`
`751`		`-RegisterSubXactCallback(DtmSubXactCallback,NULL);`
`752`	`751`	`}`
`753`	`752`	`LWLockRelease(AddinShmemInitLock);`
`754`	`753`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -107,6 +107,7 @@ static SnapshotData DtmSnapshot = { HeapTupleSatisfiesMVCC };`
`107`	`107`	`staticboolDtmHasGlobalSnapshot;`
`108`	`108`	`staticboolDtmGlobalXidAssigned;`
`109`	`109`	`staticintDtmLocalXidReserve;`
	`110`	`+staticintDtmCurcid;`
`110`	`111`	`staticSnapshotDtmLastSnapshot;`
`111`	`112`	`staticTransactionManagerDtmTM= {`
`112`	`113`	`DtmGetTransactionStatus,`
`@@ -613,9 +614,9 @@ static Snapshot DtmGetSnapshot(Snapshot snapshot)`
`613`	`614`	`}`
`614`	`615`	`if (TransactionIdIsValid(DtmNextXid)&&snapshot!=&CatalogSnapshotData)`
`615`	`616`	`{`
`616`		`-if (!DtmHasGlobalSnapshot) {`
	`617`	`+if (!DtmHasGlobalSnapshot&& (snapshot!=DtmLastSnapshot\|\|DtmCurcid!=snapshot->curcid))`
`617`	`618`	`DtmGlobalGetSnapshot(DtmNextXid,&DtmSnapshot,&dtm->minXid);`
`618`		`-}`
	`619`	`+DtmCurcid=snapshot->curcid;`
`619`	`620`	`DtmLastSnapshot=snapshot;`
`620`	`621`	`DtmMergeWithGlobalSnapshot(snapshot);`
`621`	`622`	`if (!IsolationUsesXactSnapshot())`
`@@ -725,7 +726,6 @@ static void DtmInitialize()`
`725`	`726`	`dtm->nReservedXids=0;`
`726`	`727`	`dtm->minXid=InvalidTransactionId;`
`727`	`728`	`RegisterXactCallback(DtmXactCallback,NULL);`
`728`		`-RegisterSubXactCallback(DtmSubXactCallback,NULL);`
`729`	`729`	`}`
`730`	`730`	`LWLockRelease(AddinShmemInitLock);`
`731`	`731`

Lines changed: 2 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ static cid_t dtm_sync(cid_t global_cid)`
`177`	`177`	`SpinLockAcquire(&local->lock);`
`178`	`178`	`}`
`179`	`179`	`#endif`
`180`		`-returnlocal_cid;`
	`180`	`+returnglobal_cid;`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`void`
`@@ -647,10 +647,7 @@ cid_t DtmLocalAccess(DtmCurrentTrans* x, GlobalTransactionId gtid, cid_t global_`
`647`	`647`	`x->is_global= true;`
`648`	`648`	`}`
`649`	`649`	`SpinLockRelease(&local->lock);`
`650`		`-if (global_cid<local_cid-DtmVacuumDelay*USEC) {`
`651`		`-elog(ERROR,"Too old snapshot: requested %ld, current %ld",global_cid,local_cid);`
`652`		`-}`
`653`		`-returnglobal_cid;`
	`650`	`+returnlocal_cid;`
`654`	`651`	`}`
`655`	`652`
`656`	`653`	`voidDtmLocalBeginPrepare(GlobalTransactionIdgtid)`

Comments

(0)