From e4158319f34ceb2c760761dc93d262513235c344 Mon Sep 17 00:00:00 2001
From: Tom Lane
Date: Thu, 9 Jun 2016 11:16:26 -0400
Subject: Mop-up for parallel degree-ectomy.

Fix a couple of overlooked uses of "degree" terminology.  Make the parallel
worker count selection logic in create_plain_partial_paths more robust (in
particular, it failed with max_parallel_workers_per_gather set to zero).
---
 src/include/utils/rel.h | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/include/utils')

diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h
index 3d628766e51..3b270b0fb6f 100644
--- a/src/include/utils/rel.h
+++ b/src/include/utils/rel.h
@@ -235,19 +235,20 @@ typedef struct StdRdOptions
 /*
  * RelationIsUsedAsCatalogTable
  *		Returns whether the relation should be treated as a catalog table
- *		from the pov of logical decoding.  Note multiple eval or argument!
+ *		from the pov of logical decoding.  Note multiple eval of argument!
  */
 #define RelationIsUsedAsCatalogTable(relation)	\
 	((relation)->rd_options ?				\
 	 ((StdRdOptions *) (relation)->rd_options)->user_catalog_table : false)
 
 /*
- * RelationGetParallelDegree
- *		Returns the relation's parallel_workers.  Note multiple eval of argument!
+ * RelationGetParallelWorkers
+ *		Returns the relation's parallel_workers reloption setting.
+ *		Note multiple eval of argument!
  */
-#define RelationGetParallelDegree(relation, defaultpd) \
+#define RelationGetParallelWorkers(relation, defaultpw) \
 	((relation)->rd_options ? \
-	 ((StdRdOptions *) (relation)->rd_options)->parallel_workers : (defaultpd))
+	 ((StdRdOptions *) (relation)->rd_options)->parallel_workers : (defaultpw))
 
 
 /*
-- 
cgit v1.2.3