refactoring & code cleansing, reformat pg_pathman.c

Author: funbringer

src/hooks.c

@@ -15,6 +15,7 @@
 #include "hooks.h"
 #include "init.h"
 #include "partition_filter.h"
+#include "pathman_workers.h"
 #include "planner_tree_modification.h"
 #include "runtimeappend.h"
 #include "runtime_merge_append.h"
@@ -591,7 +592,7 @@ pathman_shmem_startup_hook(void)
 
 	/* Allocate shared memory objects */
 	LWLockAcquire(AddinShmemInitLock, LW_EXCLUSIVE);
-	init_shmem_config();
+	init_concurrent_part_task_slots();
 	LWLockRelease(AddinShmemInitLock);
 }
 

src/include/init.h

@@ -94,11 +94,15 @@ extern PathmanInitState 	pg_pathman_init_state;
 #define DEFAULT_INIT_CALLBACK		InvalidOid
 #define DEFAULT_SPAWN_USING_BGW		false
 
+/* Other default values (for GUCs etc) */
+#define DEFAULT_PATHMAN_ENABLE		true
+#define DEFAULT_OVERRIDE_COPY		true
+
 
 /* Lowest version of Pl/PgSQL frontend compatible with internals (0xAA_BB_CC) */
 #define LOWEST_COMPATIBLE_FRONT		0x010300
 
-/* Current version on native C library (0xAA_BB_CC) */
+/* Current version of native C library (0xAA_BB_CC) */
 #define CURRENT_LIB_VERSION			0x010300
 
 
@@ -118,9 +122,10 @@ void restore_pathman_init_state(const PathmanInitState *temp_init_state);
  */
 void init_main_pathman_toggles(void);
 
+/*
+ * Shared & local config.
+ */
 Size estimate_pathman_shmem_size(void);
-void init_shmem_config(void);
-
 bool load_config(void);
 void unload_config(void);
 

src/include/pathman.h

@@ -88,49 +88,15 @@ extern Oid	pathman_config_params_relid;
 Oid get_pathman_config_relid(bool invalid_is_ok);
 Oid get_pathman_config_params_relid(bool invalid_is_ok);
 
-/*
- * pg_pathman's global state structure.
- */
-typedef struct PathmanState
-{
-	LWLock		   *dsm_init_lock;	/* unused */
-} PathmanState;
-
-
-/*
- * Result of search_range_partition_eq().
- */
-typedef enum
-{
-	SEARCH_RANGEREL_OUT_OF_RANGE = 0,
-	SEARCH_RANGEREL_GAP,
-	SEARCH_RANGEREL_FOUND
-} search_rangerel_result;
-
-
-/*
- * pg_pathman's global state.
- */
-extern PathmanState    *pmstate;
-
-
-int append_child_relation(PlannerInfo *root, Relation parent_relation,
-						  Index parent_rti, int ir_index, Oid child_oid,
-						  List *wrappers);
-
-search_rangerel_result search_range_partition_eq(const Datum value,
-												 FmgrInfo *cmp_func,
-												 const PartRelationInfo *prel,
-												 RangeEntry *out_re);
 
-uint32 hash_to_part_index(uint32 value, uint32 partitions);
-
-/* copied from allpaths.h */
-void set_append_rel_size(PlannerInfo *root, RelOptInfo *rel,
-						 Index rti, RangeTblEntry *rte);
 void set_append_rel_pathlist(PlannerInfo *root, RelOptInfo *rel, Index rti,
 							 PathKey *pathkeyAsc, PathKey *pathkeyDesc);
 
+Index append_child_relation(PlannerInfo *root, Relation parent_relation,
+							Index parent_rti, int ir_index, Oid child_oid,
+							List *wrappers);
+
+
 typedef struct
 {
 	const Node			   *orig;		/* examined expression */
@@ -148,9 +114,7 @@ typedef struct
 	bool					for_insert;	/* are we in PartitionFilter now? */
 } WalkerContext;
 
-/*
- * Usual initialization procedure for WalkerContext.
- */
+/* Usual initialization procedure for WalkerContext */
 #define InitWalkerContext(context, prel_vno, prel_info, ecxt, for_ins) \
 	do { \
 		(context)->prel_varno = (prel_vno); \
@@ -162,15 +126,37 @@ typedef struct
 /* Check that WalkerContext contains ExprContext (plan execution stage) */
 #define WcxtHasExprContext(wcxt) ( (wcxt)->econtext )
 
+/* Examine expression in order to select partitions */
+WrapperNode *walk_expr_tree(Expr *expr, WalkerContext *context);
+
+
 void select_range_partitions(const Datum value,
 							 FmgrInfo *cmp_func,
 							 const RangeEntry *ranges,
 							 const int nranges,
 							 const int strategy,
 							 WrapperNode *result);
 
-/* Examine expression in order to select partitions. */
-WrapperNode *walk_expr_tree(Expr *expr, WalkerContext *context);
+/* Result of search_range_partition_eq() */
+typedef enum
+{
+	SEARCH_RANGEREL_OUT_OF_RANGE = 0,
+	SEARCH_RANGEREL_GAP,
+	SEARCH_RANGEREL_FOUND
+} search_rangerel_result;
+
+search_rangerel_result search_range_partition_eq(const Datum value,
+												 FmgrInfo *cmp_func,
+												 const PartRelationInfo *prel,
+												 RangeEntry *out_re);
+
+
+/* Convert hash value to the partition index */
+static inline uint32
+hash_to_part_index(uint32 value, uint32 partitions)
+{
+	return value % partitions;
+}
 
 
 /*

src/include/utils.h

@@ -51,7 +51,6 @@ void extract_op_func_and_ret_type(char *opname,
 								  Oid *op_func,
 								  Oid *op_ret_type);
 
-
 /*
  * Print values and cast types.
  */

src/init.c

@@ -163,7 +163,7 @@ init_main_pathman_toggles(void)
 							 "Enables pg_pathman's optimizations during the planner stage",
 							 NULL,
 							 &pg_pathman_init_state.pg_pathman_enable,
-							 true,
+							 DEFAULT_PATHMAN_ENABLE,
 							 PGC_SUSET,
 							 0,
 							 NULL,
@@ -187,7 +187,7 @@ init_main_pathman_toggles(void)
 							 "Override COPY statement handling",
 							 NULL,
 							 &pg_pathman_init_state.override_copy,
-							 true,
+							 DEFAULT_OVERRIDE_COPY,
 							 PGC_SUSET,
 							 0,
 							 NULL,
@@ -259,8 +259,7 @@ unload_config(void)
 Size
 estimate_pathman_shmem_size(void)
 {
-	return estimate_concurrent_part_task_slots_size() +
-		   MAXALIGN(sizeof(PathmanState));
+	return estimate_concurrent_part_task_slots_size();
 }
 
 /*
@@ -358,33 +357,6 @@ fini_local_cache(void)
 	parent_cache = NULL;
 }
 
-/*
- * Initializes pg_pathman's global state (PathmanState) & locks.
- */
-void
-init_shmem_config(void)
-{
-	bool found;
-
-	/* Check if module was initialized in postmaster */
-	pmstate = ShmemInitStruct("pg_pathman's global state",
-							  sizeof(PathmanState), &found);
-	if (!found)
-	{
-		/*
-		 * Initialize locks in postmaster
-		 */
-		if (!IsUnderPostmaster)
-		{
-			/* NOTE: dsm_array is redundant, hence the commented code */
-			/* pmstate->dsm_init_lock = LWLockAssign(); */
-		}
-	}
-
-	/* Allocate some space for concurrent part slots */
-	init_concurrent_part_task_slots();
-}
-
 /*
  * Fill PartRelationInfo with partition-related info.
  */