improve pathman_cache_search_relid(), tests

funbringer · funbringer · commit 04ca43602e1d · 2017-02-14T17:39:01.000+03:00
diff --git a/expected/pathman_calamity.out b/expected/pathman_calamity.out
@@ -670,3 +670,78 @@ NOTICE:  drop cascades to table calamity.test_range_oid_1
 DROP SCHEMA calamity CASCADE;
 NOTICE:  drop cascades to 18 other objects
 DROP EXTENSION pg_pathman;
+/*
+ * ------------------------------------------
+ *  Special tests (uninitialized pg_pathman)
+ * ------------------------------------------
+ */
+CREATE SCHEMA calamity;
+CREATE EXTENSION pg_pathman;
+/* check function pathman_cache_search_relid() */
+CREATE TABLE calamity.survivor(val INT NOT NULL);
+SELECT create_range_partitions('calamity.survivor', 'val', 1, 10, 2);
+NOTICE:  sequence "survivor_seq" does not exist, skipping
+ create_range_partitions 
+-------------------------
+                       2
+(1 row)
+
+DROP EXTENSION pg_pathman CASCADE;
+SET pg_pathman.enable = f; /* DON'T LOAD CONFIG */
+NOTICE:  RuntimeAppend, RuntimeMergeAppend and PartitionFilter nodes and some other options have been disabled
+CREATE EXTENSION pg_pathman;
+SHOW pg_pathman.enable;
+ pg_pathman.enable 
+-------------------
+ off
+(1 row)
+
+SELECT add_to_pathman_config('calamity.survivor', 'val', '10');	/* not ok */
+ERROR:  pg_pathman is not initialized yet
+SELECT * FROM pathman_partition_list;							/* not ok */
+ERROR:  pg_pathman is not initialized yet
+SELECT get_part_range('calamity.survivor', 0, NULL::INT);		/* not ok */
+ERROR:  pg_pathman is not initialized yet
+EXPLAIN (COSTS OFF) SELECT * FROM calamity.survivor;			/* OK */
+          QUERY PLAN          
+------------------------------
+ Append
+   ->  Seq Scan on survivor
+   ->  Seq Scan on survivor_1
+   ->  Seq Scan on survivor_2
+(4 rows)
+
+SET pg_pathman.enable = t; /* LOAD CONFIG */
+NOTICE:  RuntimeAppend, RuntimeMergeAppend and PartitionFilter nodes and some other options have been enabled
+SELECT add_to_pathman_config('calamity.survivor', 'val', '10');	/* OK */
+ add_to_pathman_config 
+-----------------------
+ t
+(1 row)
+
+SELECT * FROM pathman_partition_list;							/* OK */
+      parent       |      partition      | parttype | partattr | range_min | range_max 
+-------------------+---------------------+----------+----------+-----------+-----------
+ calamity.survivor | calamity.survivor_1 |        2 | val      | 1         | 11
+ calamity.survivor | calamity.survivor_2 |        2 | val      | 11        | 21
+(2 rows)
+
+SELECT get_part_range('calamity.survivor', 0, NULL::INT);		/* OK */
+ get_part_range 
+----------------
+ {1,11}
+(1 row)
+
+EXPLAIN (COSTS OFF) SELECT * FROM calamity.survivor;			/* OK */
+          QUERY PLAN          
+------------------------------
+ Append
+   ->  Seq Scan on survivor_1
+   ->  Seq Scan on survivor_2
+(3 rows)
+
+DROP TABLE calamity.survivor CASCADE;
+NOTICE:  drop cascades to 2 other objects
+DROP SCHEMA calamity CASCADE;
+NOTICE:  drop cascades to sequence calamity.survivor_seq
+DROP EXTENSION pg_pathman;
diff --git a/sql/pathman_calamity.sql b/sql/pathman_calamity.sql
@@ -261,6 +261,44 @@ SELECT get_part_range('calamity.test_range_oid_1', NULL::INT4);		/* OK */
 DROP TABLE calamity.test_range_oid CASCADE;
 
 
+DROP SCHEMA calamity CASCADE;
+DROP EXTENSION pg_pathman;
+
+
+
+/*
+ * ------------------------------------------
+ *  Special tests (uninitialized pg_pathman)
+ * ------------------------------------------
+ */
+
+CREATE SCHEMA calamity;
+CREATE EXTENSION pg_pathman;
+
+
+/* check function pathman_cache_search_relid() */
+CREATE TABLE calamity.survivor(val INT NOT NULL);
+SELECT create_range_partitions('calamity.survivor', 'val', 1, 10, 2);
+
+DROP EXTENSION pg_pathman CASCADE;
+SET pg_pathman.enable = f; /* DON'T LOAD CONFIG */
+CREATE EXTENSION pg_pathman;
+SHOW pg_pathman.enable;
+
+SELECT add_to_pathman_config('calamity.survivor', 'val', '10');	/* not ok */
+SELECT * FROM pathman_partition_list;							/* not ok */
+SELECT get_part_range('calamity.survivor', 0, NULL::INT);		/* not ok */
+EXPLAIN (COSTS OFF) SELECT * FROM calamity.survivor;			/* OK */
+
+SET pg_pathman.enable = t; /* LOAD CONFIG */
+
+SELECT add_to_pathman_config('calamity.survivor', 'val', '10');	/* OK */
+SELECT * FROM pathman_partition_list;							/* OK */
+SELECT get_part_range('calamity.survivor', 0, NULL::INT);		/* OK */
+EXPLAIN (COSTS OFF) SELECT * FROM calamity.survivor;			/* OK */
+
+DROP TABLE calamity.survivor CASCADE;
+
 
 DROP SCHEMA calamity CASCADE;
 DROP EXTENSION pg_pathman;
diff --git a/src/init.c b/src/init.c
@@ -117,14 +117,8 @@ pathman_cache_search_relid(HTAB *cache_table,
 {
 	switch (action)
 	{
-		/* May return NULL */
 		case HASH_FIND:
 		case HASH_REMOVE:
-			if (!cache_table)
-				return NULL;
-			break;
-
-		/* Must return valid pointer */
 		case HASH_ENTER:
 			if (!cache_table)
 				elog(ERROR, "pg_pathman is not initialized yet");
@@ -137,7 +131,7 @@ pathman_cache_search_relid(HTAB *cache_table,
 			break;
 	}
 
-	Assert(cache_table);
+	AssertArg(cache_table);
 
 	/* Everything is fine */
 	return hash_search(cache_table, (const void *) &relid, action, found);
