Check that pathman is initialized in get_pathman_config_relid.

arssher · arssher · commit 2ec39238ce76 · 2019-04-18T13:36:14.000+03:00
Also, check hash partitioned table consistency always, not under assert
checking.
diff --git a/src/pg_pathman.c b/src/pg_pathman.c
@@ -333,13 +333,17 @@ _PG_init(void)
 Oid
 get_pathman_config_relid(bool invalid_is_ok)
 {
+	if (!IsPathmanInitialized())
+	{
+		if (invalid_is_ok)
+			return InvalidOid;
+		elog(ERROR, "pg_pathman is not initialized yet");
+	}
+
 	/* Raise ERROR if Oid is invalid */
 	if (!OidIsValid(pathman_config_relid) && !invalid_is_ok)
-		elog(ERROR,
-			 (!IsPathmanInitialized() ?
-				"pg_pathman is not initialized yet" :
-				"unexpected error in function "
-						  CppAsString(get_pathman_config_relid)));
+		elog(ERROR, "unexpected error in function "
+			 CppAsString(get_pathman_config_relid));
 
 	return pathman_config_relid;
 }
@@ -348,13 +352,17 @@ get_pathman_config_relid(bool invalid_is_ok)
 Oid
 get_pathman_config_params_relid(bool invalid_is_ok)
 {
+	if (!IsPathmanInitialized())
+	{
+		if (invalid_is_ok)
+			return InvalidOid;
+		elog(ERROR, "pg_pathman is not initialized yet");
+	}
+
 	/* Raise ERROR if Oid is invalid */
 	if (!OidIsValid(pathman_config_relid) && !invalid_is_ok)
-		elog(ERROR,
-			 (!IsPathmanInitialized() ?
-				"pg_pathman is not initialized yet" :
-				"unexpected error in function "
-						  CppAsString(get_pathman_config_params_relid)));
+		elog(ERROR, "unexpected error in function "
+			 CppAsString(get_pathman_config_params_relid));
 
 	return pathman_config_params_relid;
 }
diff --git a/src/relation_info.c b/src/relation_info.c
@@ -802,7 +802,6 @@ fill_prel_with_partitions(PartRelationInfo *prel,
 			prel->children[i] = prel->ranges[i].child_oid;
 	}
 
-#ifdef USE_ASSERT_CHECKING
 	/* Check that each partition Oid has been assigned properly */
 	if (prel->parttype == PT_HASH)
 		for (i = 0; i < PrelChildrenCount(prel); i++)
@@ -815,7 +814,6 @@ fill_prel_with_partitions(PartRelationInfo *prel,
 					 get_rel_name_or_relid(PrelParentRelid(prel)));
 			}
 		}
-#endif
 }
 
 /* qsort() comparison function for RangeEntries */

Original file line number	Diff line number	Diff line change
`@@ -802,7 +802,6 @@ fill_prel_with_partitions(PartRelationInfo *prel,`
`802`	`802`	`prel->children[i] = prel->ranges[i].child_oid;`
`803`	`803`	`}`
`804`	`804`
`805`		`-#ifdef USE_ASSERT_CHECKING`
`806`	`805`	`/* Check that each partition Oid has been assigned properly */`
`807`	`806`	`if (prel->parttype == PT_HASH)`
`808`	`807`	`for (i = 0; i < PrelChildrenCount(prel); i++)`
`@@ -815,7 +814,6 @@ fill_prel_with_partitions(PartRelationInfo *prel,`
`815`	`814`	`get_rel_name_or_relid(PrelParentRelid(prel)));`
`816`	`815`	`}`
`817`	`816`	`}`
`818`		`-#endif`
`819`	`817`	`}`
`820`	`818`
`821`	`819`	`/* qsort() comparison function for RangeEntries */`