improve xact_bgw_conflicting_lock_exists() for locking groups

funbringer · funbringer · commit d4cf177b03b0 · 2016-10-21T19:36:28.000+03:00
diff --git a/src/xact_handling.c b/src/xact_handling.c
@@ -82,6 +82,10 @@ xact_unlock_rel_exclusive(Oid relid)
 bool
 xact_bgw_conflicting_lock_exists(Oid relid)
 {
+#if PG_VERSION_NUM >= 90600
+	/* We use locking groups for 9.6+ */
+	return false;
+#else
 	LOCKMODE	lockmode;
 
 	/* Try each lock >= ShareUpdateExclusiveLock */
@@ -94,6 +98,7 @@ xact_bgw_conflicting_lock_exists(Oid relid)
 	}
 
 	return false;
+#endif
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,10 @@ xact_unlock_rel_exclusive(Oid relid)`
`82`	`82`	`bool`
`83`	`83`	`xact_bgw_conflicting_lock_exists(Oid relid)`
`84`	`84`	`{`
	`85`	`+#if PG_VERSION_NUM >= 90600`
	`86`	`+ /* We use locking groups for 9.6+ */`
	`87`	`+ return false;`
	`88`	`+#else`
`85`	`89`	`LOCKMODE lockmode;`
`86`	`90`
`87`	`91`	`/* Try each lock >= ShareUpdateExclusiveLock */`
`@@ -94,6 +98,7 @@ xact_bgw_conflicting_lock_exists(Oid relid)`
`94`	`98`	`}`
`95`	`99`
`96`	`100`	`return false;`
	`101`	`+#endif`
`97`	`102`	`}`
`98`	`103`
`99`	`104`