WIP refactoring, introduce has_pathman_relation_info()

Author: funbringer

init.sql

@@ -513,38 +513,6 @@ BEGIN
 END
 $$ LANGUAGE plpgsql;
 
-
-CREATE OR REPLACE FUNCTION @extschema@.create_naming_sequence(
-	parent_relid	REGCLASS)
-RETURNS TEXT AS $$
-DECLARE
-	seq_name		TEXT;
-
-BEGIN
-	seq_name := @extschema@.build_sequence_name(parent_relid);
-
-	EXECUTE format('DROP SEQUENCE IF EXISTS %s', seq_name);
-	EXECUTE format('CREATE SEQUENCE %s START 1', seq_name);
-
-	RETURN seq_name;
-END
-$$ LANGUAGE plpgsql
-SET client_min_messages = WARNING; /* mute NOTICE message */
-
-CREATE OR REPLACE FUNCTION @extschema@.drop_naming_sequence(
-	parent_relid	REGCLASS)
-RETURNS VOID AS $$
-DECLARE
-	seq_name		TEXT;
-
-BEGIN
-	seq_name := @extschema@.build_sequence_name(parent_relid);
-
-	EXECUTE format('DROP SEQUENCE IF EXISTS %s', seq_name);
-END
-$$ LANGUAGE plpgsql
-SET client_min_messages = WARNING; /* mute NOTICE message */
-
 /*
  * Drop partitions. If delete_data set to TRUE, partitions
  * will be dropped with all the data.
@@ -686,43 +654,51 @@ EXECUTE PROCEDURE @extschema@.pathman_ddl_trigger_func();
 
 
 /*
- * Partitioning key.
+ * Get partitioning key.
  */
 CREATE OR REPLACE FUNCTION @extschema@.get_partition_key(
-	relid	REGCLASS)
+	parent_relid	REGCLASS)
 RETURNS TEXT AS
 $$
-	SELECT expr FROM @extschema@.pathman_config WHERE partrel = relid;
+	SELECT expr
+	FROM @extschema@.pathman_config
+	WHERE partrel = parent_relid;
 $$
 LANGUAGE sql STRICT;
 
 /*
- * Partitioning key type.
+ * Get partitioning key type.
  */
 CREATE OR REPLACE FUNCTION @extschema@.get_partition_key_type(
-	relid	REGCLASS)
-RETURNS REGTYPE AS 'pg_pathman', 'get_partition_key_type'
+	parent_relid	REGCLASS)
+RETURNS REGTYPE AS 'pg_pathman', 'get_partition_key_type_pl'
 LANGUAGE C STRICT;
 
 /*
- * Partitioning type.
+ * Get partitioning type.
  */
 CREATE OR REPLACE FUNCTION @extschema@.get_partition_type(
-	relid	REGCLASS)
+	parent_relid	REGCLASS)
 RETURNS INT4 AS
 $$
-	SELECT parttype FROM @extschema@.pathman_config WHERE partrel = relid;
+	SELECT parttype
+	FROM @extschema@.pathman_config
+	WHERE partrel = parent_relid;
 $$
 LANGUAGE sql STRICT;
 
-
 /*
  * Get number of partitions managed by pg_pathman.
  */
 CREATE OR REPLACE FUNCTION @extschema@.get_number_of_partitions(
-	parent_relid		REGCLASS)
-RETURNS INT4 AS 'pg_pathman', 'get_number_of_partitions_pl'
-LANGUAGE C STRICT;
+	parent_relid	REGCLASS)
+RETURNS INT4 AS
+$$
+	SELECT count(*)::INT4
+	FROM pg_catalog.pg_inherits
+	WHERE inhparent = parent_relid;
+$$
+LANGUAGE sql STRICT;
 
 /*
  * Get parent of pg_pathman's partition.
@@ -806,18 +782,18 @@ LANGUAGE C STRICT;
  * Add record to pathman_config (RANGE) and validate partitions.
  */
 CREATE OR REPLACE FUNCTION @extschema@.add_to_pathman_config(
-	parent_relid		REGCLASS,
-	expression			TEXT,
-	range_interval		TEXT)
+	parent_relid	REGCLASS,
+	expression		TEXT,
+	range_interval	TEXT)
 RETURNS BOOLEAN AS 'pg_pathman', 'add_to_pathman_config'
 LANGUAGE C;
 
 /*
  * Add record to pathman_config (HASH) and validate partitions.
  */
 CREATE OR REPLACE FUNCTION @extschema@.add_to_pathman_config(
-	parent_relid		REGCLASS,
-	expression			TEXT)
+	parent_relid	REGCLASS,
+	expression		TEXT)
 RETURNS BOOLEAN AS 'pg_pathman', 'add_to_pathman_config'
 LANGUAGE C;
 
@@ -866,9 +842,9 @@ LANGUAGE C;
  * Get parent of pg_pathman's partition.
  */
 CREATE OR REPLACE FUNCTION @extschema@.is_equal_to_partitioning_expression(
-	parent_relid		REGCLASS,
-	expression			TEXT,
-	value_type			OID)
+	parent_relid	REGCLASS,
+	expression		TEXT,
+	value_type		OID)
 RETURNS BOOL AS 'pg_pathman', 'is_equal_to_partitioning_expression_pl'
 LANGUAGE C STRICT;
 
@@ -877,8 +853,8 @@ LANGUAGE C STRICT;
  * bound_value is used to determine the type of bound
  */
 CREATE OR REPLACE FUNCTION @extschema@.get_lower_bound(
-	relid				REGCLASS,
-	bound_value			ANYELEMENT
+	relid			REGCLASS,
+	bound_value		ANYELEMENT
 )
 RETURNS ANYELEMENT AS 'pg_pathman', 'get_lower_bound_pl'
 LANGUAGE C STRICT;
@@ -887,8 +863,8 @@ LANGUAGE C STRICT;
  * Get upper bound of a partition
  */
 CREATE OR REPLACE FUNCTION @extschema@.get_upper_bound(
-	relid				REGCLASS,
-	bound_value			ANYELEMENT
+	relid			REGCLASS,
+	bound_value		ANYELEMENT
 )
 RETURNS ANYELEMENT AS 'pg_pathman', 'get_upper_bound_pl'
 LANGUAGE C STRICT;

range.sql

@@ -1020,6 +1020,44 @@ END
 $$ LANGUAGE plpgsql;
 
 
+/*
+ * Create a naming sequence for partitioned table.
+ */
+CREATE OR REPLACE FUNCTION @extschema@.create_naming_sequence(
+	parent_relid	REGCLASS)
+RETURNS TEXT AS $$
+DECLARE
+	seq_name TEXT;
+
+BEGIN
+	seq_name := @extschema@.build_sequence_name(parent_relid);
+
+	EXECUTE format('DROP SEQUENCE IF EXISTS %s', seq_name);
+	EXECUTE format('CREATE SEQUENCE %s START 1', seq_name);
+
+	RETURN seq_name;
+END
+$$ LANGUAGE plpgsql
+SET client_min_messages = WARNING; /* mute NOTICE message */
+
+/*
+ * Drop a naming sequence for partitioned table.
+ */
+CREATE OR REPLACE FUNCTION @extschema@.drop_naming_sequence(
+	parent_relid	REGCLASS)
+RETURNS VOID AS $$
+DECLARE
+	seq_name TEXT;
+
+BEGIN
+	seq_name := @extschema@.build_sequence_name(parent_relid);
+
+	EXECUTE format('DROP SEQUENCE IF EXISTS %s', seq_name);
+END
+$$ LANGUAGE plpgsql
+SET client_min_messages = WARNING; /* mute NOTICE message */
+
+
 /*
  * Merge multiple partitions. All data will be copied to the first one.
  * The rest of partitions will be dropped.
@@ -1041,7 +1079,6 @@ CREATE OR REPLACE FUNCTION @extschema@.drop_range_partition_expand_next(
 RETURNS VOID AS 'pg_pathman', 'drop_range_partition_expand_next'
 LANGUAGE C STRICT;
 
-
 CREATE OR REPLACE FUNCTION @extschema@.create_range_partitions_internal(
 	parent_relid	REGCLASS,
 	bounds			ANYARRAY,
@@ -1075,12 +1112,14 @@ CREATE OR REPLACE FUNCTION @extschema@.build_range_condition(
 RETURNS TEXT AS 'pg_pathman', 'build_range_condition'
 LANGUAGE C;
 
+/*
+ * Generate a name for naming sequence.
+ */
 CREATE OR REPLACE FUNCTION @extschema@.build_sequence_name(
 	parent_relid	REGCLASS)
 RETURNS TEXT AS 'pg_pathman', 'build_sequence_name'
 LANGUAGE C STRICT;
 
-
 /*
  * Returns N-th range (as an array of two elements).
  */

src/hooks.c

@@ -63,13 +63,13 @@ allow_star_schema_join(PlannerInfo *root,
 }
 
 
-set_join_pathlist_hook_type		set_join_pathlist_next = NULL;
-set_rel_pathlist_hook_type		set_rel_pathlist_hook_next = NULL;
-planner_hook_type				planner_hook_next = NULL;
-post_parse_analyze_hook_type	post_parse_analyze_hook_next = NULL;
-shmem_startup_hook_type			shmem_startup_hook_next = NULL;
-ProcessUtility_hook_type		process_utility_hook_next = NULL;
-ExecutorRun_hook_type			executor_run_hook_next = NULL;
+set_join_pathlist_hook_type		set_join_pathlist_next			= NULL;
+set_rel_pathlist_hook_type		set_rel_pathlist_hook_next		= NULL;
+planner_hook_type				planner_hook_next				= NULL;
+post_parse_analyze_hook_type	post_parse_analyze_hook_next	= NULL;
+shmem_startup_hook_type			shmem_startup_hook_next			= NULL;
+ProcessUtility_hook_type		process_utility_hook_next		= NULL;
+ExecutorRun_hook_type			executor_run_hook_next			= NULL;
 
 
 /* Take care of joins */
@@ -101,7 +101,7 @@ pathman_join_pathlist_hook(PlannerInfo *root,
 	if (!IsPathmanReady() || !pg_pathman_enable_runtimeappend)
 		return;
 
-	/* We should only consider base relations */
+	/* We should only consider base inner relations */
 	if (innerrel->reloptkind != RELOPT_BASEREL)
 		return;
 
@@ -113,9 +113,13 @@ pathman_join_pathlist_hook(PlannerInfo *root,
 	if (jointype == JOIN_FULL || jointype == JOIN_RIGHT)
 		return;
 
-	/* Check that innerrel is a BASEREL with PartRelationInfo */
-	if (innerrel->reloptkind != RELOPT_BASEREL ||
-		!(inner_prel = get_pathman_relation_info(inner_rte->relid)))
+	/* Skip if inner table is not allowed to act as parent (e.g. FROM ONLY) */
+	if (PARENTHOOD_DISALLOWED == get_rel_parenthood_status(root->parse->queryId,
+														   inner_rte))
+		return;
+
+	/* Proceed iff relation 'innerrel' is partitioned */
+	if ((inner_prel = get_pathman_relation_info(inner_rte->relid)) == NULL)
 		return;
 
 	/*
@@ -142,7 +146,7 @@ pathman_join_pathlist_hook(PlannerInfo *root,
 			Oid outer_baserel = root->simple_rte_array[rti]->relid;
 
 			/* Is it partitioned? */
-			if (get_pathman_relation_info(outer_baserel))
+			if (has_pathman_relation_info(outer_baserel))
 				count++;
 		}
 
@@ -153,11 +157,6 @@ pathman_join_pathlist_hook(PlannerInfo *root,
 							"of partitioned tables are not supported")));
 	}
 
-	/* Skip if inner table is not allowed to act as parent (e.g. FROM ONLY) */
-	if (PARENTHOOD_DISALLOWED == get_rel_parenthood_status(root->parse->queryId,
-														   inner_rte))
-		return;
-
 	/*
 	 * These codes are used internally in the planner, but are not supported
 	 * by the executor (nor, indeed, by most of the planner).
@@ -223,7 +222,7 @@ pathman_join_pathlist_hook(PlannerInfo *root,
 			Assert(outer);
 		}
 
-		 /* No way to do this in a parameterized inner path */
+		/* No way to do this in a parameterized inner path */
 		if (saved_jointype == JOIN_UNIQUE_INNER)
 			return;
 
@@ -607,7 +606,7 @@ pathman_enable_assign_hook(bool newval, void *extra)
 /*
  * Planner hook. It disables inheritance for tables that have been partitioned
  * by pathman to prevent standart PostgreSQL partitioning mechanism from
- * handling that tables.
+ * handling those tables.
  */
 PlannedStmt *
 pathman_planner_hook(Query *parse, int cursorOptions, ParamListInfo boundParams)
@@ -679,7 +678,7 @@ pathman_planner_hook(Query *parse, int cursorOptions, ParamListInfo boundParams)
 
 /*
  * Post parse analysis hook. It makes sure the config is loaded before executing
- * any statement, including utility commands
+ * any statement, including utility commands.
  */
 void
 pathman_post_parse_analysis_hook(ParseState *pstate, Query *query)

src/include/relation_info.h

@@ -311,10 +311,11 @@ void refresh_pathman_relation_info(Oid relid);
 void invalidate_pathman_relation_info(Oid relid);
 void invalidate_pathman_relation_info_cache(void);
 void close_pathman_relation_info(PartRelationInfo *prel);
-const PartRelationInfo *get_pathman_relation_info(Oid relid);
-const PartRelationInfo *get_pathman_relation_info_after_lock(Oid relid,
-															 bool unlock_if_not_found,
-															 LockAcquireResult *lock_result);
+bool has_pathman_relation_info(Oid relid);
+PartRelationInfo *get_pathman_relation_info(Oid relid);
+PartRelationInfo *get_pathman_relation_info_after_lock(Oid relid,
+													   bool unlock_if_not_found,
+													   LockAcquireResult *lock_result);
 
 void shout_if_prel_is_invalid(const Oid parent_oid,
 							  const PartRelationInfo *prel,

src/include/xact_handling.h

@@ -32,7 +32,5 @@ bool xact_is_set_stmt(Node *stmt, const char *name);
 bool xact_is_alter_pathman_stmt(Node *stmt);
 bool xact_object_is_visible(TransactionId obj_xmin);
 
-void prevent_data_modification_internal(Oid relid);
-
 
 #endif /* XACT_HANDLING_H */

src/pathman_workers.c

@@ -547,7 +547,7 @@ bgw_main_concurrent_part(Datum main_arg)
 			}
 
 			/* Make sure that relation has partitions */
-			if (get_pathman_relation_info(part_slot->relid) == NULL)
+			if (!has_pathman_relation_info(part_slot->relid))
 			{
 				/* Exit after we raise ERROR */
 				failures_count = PART_WORKER_MAX_ATTEMPTS;