Merge branch 'master_lock_group' into rel_1_2_beta

funbringer · funbringer · commit cc320fc52f8c · 2016-10-30T01:00:16.000+03:00
diff --git a/src/pathman_workers.c b/src/pathman_workers.c
@@ -29,6 +29,7 @@
 #include "storage/dsm.h"
 #include "storage/ipc.h"
 #include "storage/latch.h"
+#include "storage/proc.h"
 #include "utils/builtins.h"
 #include "utils/datum.h"
 #include "utils/memutils.h"
@@ -256,6 +257,12 @@ create_partitions_bg_worker_segment(Oid relid, Datum value, Oid value_type)
 	args->dbid = MyDatabaseId;
 	args->partitioned_table = relid;
 
+#if PG_VERSION_NUM >= 90600
+	/* Initialize args for BecomeLockGroupMember() */
+	args->parallel_master_pgproc = MyProc;
+	args->parallel_master_pid = MyProcPid;
+#endif
+
 	/* Write value-related stuff */
 	args->value_type = value_type;
 	args->value_size = datum_size;
@@ -286,6 +293,11 @@ create_partitions_bg_worker(Oid relid, Datum value, Oid value_type)
 	segment_handle = dsm_segment_handle(segment);
 	bgw_args = (SpawnPartitionArgs *) dsm_segment_address(segment);
 
+#if PG_VERSION_NUM >= 90600
+	/* Become locking group leader */
+	BecomeLockGroupLeader();
+#endif
+
 	/* Start worker and wait for it to finish */
 	start_bg_worker(spawn_partitions_bgw,
 					bgw_main_spawn_partitions,
@@ -337,6 +349,13 @@ bgw_main_spawn_partitions(Datum main_arg)
 			 spawn_partitions_bgw, MyProcPid);
 	args = dsm_segment_address(segment);
 
+#if PG_VERSION_NUM >= 90600
+	/* Join locking group. If we can't join the group, quit */
+	if (!BecomeLockGroupMember(args->parallel_master_pgproc,
+							   args->parallel_master_pid))
+		return;
+#endif
+
 	/* Establish connection and start transaction */
 	BackgroundWorkerInitializeConnectionByOid(args->dbid, args->userid);
 
diff --git a/src/pathman_workers.h b/src/pathman_workers.h
@@ -20,6 +20,10 @@
 #include "postgres.h"
 #include "storage/spin.h"
 
+#if PG_VERSION_NUM >= 90600
+#include "storage/lock.h"
+#endif
+
 
 /*
  * Store args, result and execution status of CreatePartitionsWorker.
@@ -32,6 +36,12 @@ typedef struct
 	Oid		dbid;			/* database which stores 'partitioned_table' */
 	Oid		partitioned_table;
 
+#if PG_VERSION_NUM >= 90600
+	/* Args for BecomeLockGroupMember() function */
+	PGPROC *parallel_master_pgproc;
+	pid_t	parallel_master_pid;
+#endif
+
 	/* Needed to decode Datum from 'values' */
 	Oid		value_type;
 	Size	value_size;
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`