Commitd545692

committed

Fix initdb failure with non-zero global_snapshot_defer_time.

And set its default value to 5.Also fix one warning (damned 'void' instead of true void).

1 parente73c9b6 commitd545692Copy full SHA for d545692

File tree

-5

lines changed

-5

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1767,7 +1767,7 @@ GetSnapshotData(Snapshot snapshot)`
`1767`	`1767`	`* Take GlobalCSN under ProcArrayLock so the local/global snapshot stays`
`1768`	`1768`	`* synchronized.`
`1769`	`1769`	`*/`
`1770`		`-if (track_global_snapshots\|\|global_snapshot_defer_time>0)`
	`1770`	`+if (track_global_snapshots)`
`1771`	`1771`	`global_csn=GlobalSnapshotGenerate(false);`
`1772`	`1772`
`1773`	`1773`	`LWLockRelease(ProcArrayLock);`
`@@ -1846,7 +1846,8 @@ GetSnapshotData(Snapshot snapshot)`
`1846`	`1846`
`1847`	`1847`	`snapshot->imported_global_csn= false;`
`1848`	`1848`	`snapshot->global_csn=global_csn;`
`1849`		`-if (global_snapshot_defer_time>0)`
	`1849`	`+/* if (global_snapshot_defer_time > 0 && IsNormalProcessingMode()) */`
	`1850`	`+if (global_snapshot_defer_time>0&&IsUnderPostmaster)`
`1850`	`1851`	`GlobalSnapshotMapXmin(snapshot->global_csn);`
`1851`	`1852`
`1852`	`1853`	`returnsnapshot;`
`@@ -3091,7 +3092,7 @@ ProcArraySetGlobalSnapshotXmin(TransactionId xmin)`
`3091`	`3092`	`* ProcArrayGetGlobalSnapshotXmin`
`3092`	`3093`	`*/`
`3093`	`3094`	`TransactionId`
`3094`		`-ProcArrayGetGlobalSnapshotXmin()`
	`3095`	`+ProcArrayGetGlobalSnapshotXmin(void)`
`3095`	`3096`	`{`
`3096`	`3097`	`returnprocArray->global_snapshot_xmin;`
`3097`	`3098`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2349,7 +2349,7 @@ static struct config_int ConfigureNamesInt[] =`
`2349`	`2349`	`NULL`
`2350`	`2350`	`},`
`2351`	`2351`	`&global_snapshot_defer_time,`
`2352`		`-30,0,INT_MAX,`
	`2352`	`+5,0,INT_MAX,`
`2353`	`2353`	`NULL,NULL,NULL`
`2354`	`2354`	`},`
`2355`	`2355`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -130,6 +130,6 @@ extern void ProcArrayGetReplicationSlotXmin(TransactionId *xmin,`
`130`	`130`
`131`	`131`	`externvoidProcArraySetGlobalSnapshotXmin(TransactionIdxmin);`
`132`	`132`
`133`		`-externTransactionIdProcArrayGetGlobalSnapshotXmin();`
	`133`	`+externTransactionIdProcArrayGetGlobalSnapshotXmin(void);`
`134`	`134`
`135`	`135`	`#endif/* PROCARRAY_H */`

Comments

(0)