Return private function for cached cooked key to fix tests coverage

Author: ildus

expected/pathman_column_type.out

@@ -28,21 +28,33 @@ SELECT context, entries FROM pathman_cache_stats ORDER BY context;
  partition status cache  |       3
 (4 rows)
 
-/* change column's type (should flush caches) */
+/*
+ * Get parsed and analyzed expression.
+ */
+CREATE FUNCTION get_cached_partition_cooked_key(REGCLASS)
+RETURNS TEXT AS 'pg_pathman', 'get_cached_partition_cooked_key_pl'
+LANGUAGE C STRICT;
 SELECT get_partition_cooked_key('test_column_type.test'::REGCLASS);
                                                get_partition_cooked_key                                                
 -----------------------------------------------------------------------------------------------------------------------
  {VAR :varno 1 :varattno 1 :vartype 23 :vartypmod -1 :varcollid 0 :varlevelsup 0 :varnoold 1 :varoattno 1 :location 8}
 (1 row)
 
+SELECT get_cached_partition_cooked_key('test_column_type.test'::REGCLASS);
+                                            get_cached_partition_cooked_key                                            
+-----------------------------------------------------------------------------------------------------------------------
+ {VAR :varno 1 :varattno 1 :vartype 23 :vartypmod -1 :varcollid 0 :varlevelsup 0 :varnoold 1 :varoattno 1 :location 8}
+(1 row)
+
 SELECT get_partition_key_type('test_column_type.test'::REGCLASS);
  get_partition_key_type 
 ------------------------
  integer
 (1 row)
 
+/* change column's type (should also flush caches) */
 ALTER TABLE test_column_type.test ALTER val TYPE NUMERIC;
-/* check that expression has been built */
+/* check that correct expression has been built */
 SELECT get_partition_key_type('test_column_type.test'::REGCLASS);
  get_partition_key_type 
 ------------------------
@@ -55,6 +67,13 @@ SELECT get_partition_cooked_key('test_column_type.test'::REGCLASS);
  {VAR :varno 1 :varattno 1 :vartype 1700 :vartypmod -1 :varcollid 0 :varlevelsup 0 :varnoold 1 :varoattno 1 :location 8}
 (1 row)
 
+SELECT get_cached_partition_cooked_key('test_column_type.test'::REGCLASS);
+                                             get_cached_partition_cooked_key                                             
+-------------------------------------------------------------------------------------------------------------------------
+ {VAR :varno 1 :varattno 1 :vartype 1700 :vartypmod -1 :varcollid 0 :varlevelsup 0 :varnoold 1 :varoattno 1 :location 8}
+(1 row)
+
+DROP FUNCTION get_cached_partition_cooked_key(REGCLASS);
 /* make sure that everything works properly */
 SELECT * FROM test_column_type.test;
  val 

sql/pathman_column_type.sql

@@ -17,14 +17,25 @@ SELECT create_range_partitions('test_column_type.test', 'val', 1, 10, 10);
 SELECT * FROM test_column_type.test;
 SELECT context, entries FROM pathman_cache_stats ORDER BY context;
 
-/* change column's type (should flush caches) */
+/*
+ * Get parsed and analyzed expression.
+ */
+CREATE FUNCTION get_cached_partition_cooked_key(REGCLASS)
+RETURNS TEXT AS 'pg_pathman', 'get_cached_partition_cooked_key_pl'
+LANGUAGE C STRICT;
+
 SELECT get_partition_cooked_key('test_column_type.test'::REGCLASS);
+SELECT get_cached_partition_cooked_key('test_column_type.test'::REGCLASS);
 SELECT get_partition_key_type('test_column_type.test'::REGCLASS);
+
+/* change column's type (should also flush caches) */
 ALTER TABLE test_column_type.test ALTER val TYPE NUMERIC;
 
-/* check that expression has been built */
+/* check that correct expression has been built */
 SELECT get_partition_key_type('test_column_type.test'::REGCLASS);
 SELECT get_partition_cooked_key('test_column_type.test'::REGCLASS);
+SELECT get_cached_partition_cooked_key('test_column_type.test'::REGCLASS);
+DROP FUNCTION get_cached_partition_cooked_key(REGCLASS);
 
 /* make sure that everything works properly */
 SELECT * FROM test_column_type.test;

src/pl_funcs.c

@@ -48,6 +48,7 @@
 PG_FUNCTION_INFO_V1( get_number_of_partitions_pl );
 PG_FUNCTION_INFO_V1( get_partition_key_type_pl );
 PG_FUNCTION_INFO_V1( get_partition_cooked_key_pl );
+PG_FUNCTION_INFO_V1( get_cached_partition_cooked_key_pl );
 PG_FUNCTION_INFO_V1( get_parent_of_partition_pl );
 PG_FUNCTION_INFO_V1( get_base_type_pl );
 PG_FUNCTION_INFO_V1( get_tablespace_pl );
@@ -171,6 +172,26 @@ get_partition_cooked_key_pl(PG_FUNCTION_ARGS)
 	PG_RETURN_TEXT_P(CStringGetTextDatum(cooked_cstr));
 }
 
+/*
+ * Return cached cooked partition key.
+ *
+ * Used in tests for invalidation.
+ */
+Datum
+get_cached_partition_cooked_key_pl(PG_FUNCTION_ARGS)
+{
+	Oid                 relid = PG_GETARG_OID(0);
+	PartRelationInfo   *prel;
+	Datum               res;
+
+	prel = get_pathman_relation_info(relid);
+	shout_if_prel_is_invalid(relid, prel, PT_ANY);
+	res = CStringGetTextDatum(nodeToString(prel->expr));
+	close_pathman_relation_info(prel);
+
+	PG_RETURN_TEXT_P(res);
+}
+
 /*
  * Extract basic type of a domain.
  */