[PGPRO-10286] Added error processing for some cases

Tags: pg_pathman

Author: kovdb75

src/declarative.c

@@ -237,6 +237,8 @@ handle_attach_partition(Oid parent_relid, AlterTableCmd *cmd)
 
 	/* Fetch pg_pathman's schema */
 	pathman_schema = get_namespace_name(get_pathman_schema());
+	if (pathman_schema == NULL)
+		elog(ERROR, "pg_pathman schema not initialized");
 
 	/* Build function's name */
 	proc_name = list_make2(makeString(pathman_schema),
@@ -296,6 +298,8 @@ handle_detach_partition(AlterTableCmd *cmd)
 
 	/* Fetch pg_pathman's schema */
 	pathman_schema = get_namespace_name(get_pathman_schema());
+	if (pathman_schema == NULL)
+		elog(ERROR, "pg_pathman schema not initialized");
 
 	/* Build function's name */
 	proc_name = list_make2(makeString(pathman_schema),

src/init.c

@@ -273,7 +273,8 @@ static bool
 init_pathman_relation_oids(void)
 {
 	Oid schema = get_pathman_schema();
-	Assert(schema != InvalidOid);
+	if (schema == InvalidOid)
+		return false;		/* extension can be dropped by another backend */
 
 	/* Cache PATHMAN_CONFIG relation's Oid */
 	pathman_config_relid = get_relname_relid(PATHMAN_CONFIG, schema);

src/partition_creation.c

@@ -585,6 +585,7 @@ spawn_partitions_val(Oid parent_relid,				/* parent's Oid */
 		Oid			parent_nsp = get_rel_namespace(parent_relid);
 		char	   *parent_nsp_name = get_namespace_name(parent_nsp);
 		char	   *partition_name = choose_range_partition_name(parent_relid, parent_nsp);
+		char	   *pathman_schema;
 
 		/* Assign the 'following' boundary to current 'leading' value */
 		cur_following_bound = cur_leading_bound;
@@ -611,10 +612,14 @@ spawn_partitions_val(Oid parent_relid,				/* parent's Oid */
 		typname = pstrdup(NameStr(((Form_pg_type) GETSTRUCT(typeTuple))->typname));
 		ReleaseSysCache(typeTuple);
 
+		pathman_schema = get_namespace_name(get_pathman_schema());
+		if (pathman_schema == NULL)
+			elog(ERROR, "pg_pathman schema not initialized");
+
 		/* Construct call to create_single_range_partition() */
 		create_sql = psprintf(
 			"select %s.create_single_range_partition('%s.%s'::regclass, '%s'::%s, '%s'::%s, '%s.%s', NULL::text)",
-			quote_identifier(get_namespace_name(get_pathman_schema())),
+			quote_identifier(pathman_schema),
 			quote_identifier(parent_nsp_name),
 			quote_identifier(get_rel_name(parent_relid)),
 			IsInfinite(&bounds[0]) ? "NULL" : datum_to_cstring(bounds[0].value, range_bound_type),
@@ -1195,6 +1200,8 @@ copy_foreign_keys(Oid parent_relid, Oid partition_oid)
 
 	/* Fetch pg_pathman's schema */
 	pathman_schema = get_namespace_name(get_pathman_schema());
+	if (pathman_schema == NULL)
+		elog(ERROR, "pg_pathman schema not initialized");
 
 	/* Build function's name */
 	copy_fkeys_proc_name = list_make2(makeString(pathman_schema),
@@ -1564,6 +1571,7 @@ build_raw_hash_check_tree(Node *raw_expression,
 
 	Oid				hash_proc;
 	TypeCacheEntry *tce;
+	char		   *pathman_schema;
 
 	tce = lookup_type_cache(value_type, TYPECACHE_HASH_PROC);
 	hash_proc = tce->hash_proc;
@@ -1596,9 +1604,13 @@ build_raw_hash_check_tree(Node *raw_expression,
 	hash_call->over				= NULL;
 	hash_call->location			= -1;
 
+	pathman_schema = get_namespace_name(get_pathman_schema());
+	if (pathman_schema == NULL)
+		elog(ERROR, "pg_pathman schema not initialized");
+
 	/* Build schema-qualified name of function get_hash_part_idx() */
 	get_hash_part_idx_proc =
-			list_make2(makeString(get_namespace_name(get_pathman_schema())),
+			list_make2(makeString(pathman_schema),
 					   makeString("get_hash_part_idx"));
 
 	/* Call get_hash_part_idx() */

src/pathman_workers.c

@@ -520,14 +520,19 @@ bgw_main_concurrent_part(Datum main_arg)
 		if (sql == NULL)
 		{
 			MemoryContext	current_mcxt;
+			char		   *pathman_schema;
+
+			pathman_schema = get_namespace_name(get_pathman_schema());
+			if (pathman_schema == NULL)
+				elog(ERROR, "pg_pathman schema not initialized");
 
 			/*
 			 * Allocate SQL query in TopPathmanContext because current
 			 * context will be destroyed after transaction finishes
 			 */
 			current_mcxt = MemoryContextSwitchTo(TopPathmanContext);
 			sql = psprintf("SELECT %s._partition_data_concurrent($1::regclass, NULL::text, NULL::text, p_limit:=$2)",
-						   get_namespace_name(get_pathman_schema()));
+						   pathman_schema);
 			MemoryContextSwitchTo(current_mcxt);
 		}
 
@@ -700,6 +705,7 @@ partition_table_concurrently(PG_FUNCTION_ARGS)
 					i;
 	TransactionId	rel_xmin;
 	LOCKMODE		lockmode = ShareUpdateExclusiveLock;
+	char		   *pathman_schema;
 
 	/* Check batch_size */
 	if (batch_size < 1 || batch_size > 10000)
@@ -800,11 +806,15 @@ partition_table_concurrently(PG_FUNCTION_ARGS)
 		start_bgworker_errmsg(concurrent_part_bgw);
 	}
 
+	pathman_schema = get_namespace_name(get_pathman_schema());
+	if (pathman_schema == NULL)
+		elog(ERROR, "pg_pathman schema not initialized");
+
 	/* Tell user everything's fine */
 	elog(NOTICE,
 		 "worker started, you can stop it "
 		 "with the following command: select %s.%s('%s');",
-		 get_namespace_name(get_pathman_schema()),
+		 pathman_schema,
 		 CppAsString(stop_concurrent_part_task),
 		 get_rel_name(relid));
 

src/pl_hash_funcs.c

@@ -122,6 +122,7 @@ build_hash_condition(PG_FUNCTION_ARGS)
 	char		   *expr_cstr	= TextDatumGetCString(PG_GETARG_DATUM(1));
 	uint32			part_count	= PG_GETARG_UINT32(2),
 					part_idx	= PG_GETARG_UINT32(3);
+	char		   *pathman_schema;
 
 	TypeCacheEntry *tce;
 
@@ -141,9 +142,13 @@ build_hash_condition(PG_FUNCTION_ARGS)
 				 errmsg("no hash function for type %s",
 						format_type_be(expr_type))));
 
+	pathman_schema = get_namespace_name(get_pathman_schema());
+	if (pathman_schema == NULL)
+		elog(ERROR, "pg_pathman schema not initialized");
+
 	/* Create hash condition CSTRING */
 	result = psprintf("%s.get_hash_part_idx(%s(%s), %u) = %u",
-					  get_namespace_name(get_pathman_schema()),
+					  pathman_schema,
 					  get_func_name(tce->hash_proc),
 					  expr_cstr,
 					  part_count,