Merge branch 'rel_1_2_beta' of github.com:postgrespro/pg_pathman into rel_1_2_beta

zilder · zilder · commit 9d3fcff64808 · 2016-12-01T12:53:20.000+03:00
diff --git a/init.sql b/init.sql
@@ -88,25 +88,8 @@ ALTER TABLE @extschema@.pathman_config_params ENABLE ROW LEVEL SECURITY;
  * Invalidate relcache every time someone changes parameters config.
  */
 CREATE OR REPLACE FUNCTION @extschema@.pathman_config_params_trigger_func()
-RETURNS TRIGGER AS
-$$
-BEGIN
-	IF TG_OP IN ('INSERT', 'UPDATE') THEN
-		PERFORM @extschema@.invalidate_relcache(NEW.partrel);
-	END IF;
-
-	IF TG_OP IN ('UPDATE', 'DELETE') THEN
-		PERFORM @extschema@.invalidate_relcache(OLD.partrel);
-	END IF;
-
-	IF TG_OP = 'DELETE' THEN
-		RETURN OLD;
-	ELSE
-		RETURN NEW;
-	END IF;
-END
-$$
-LANGUAGE plpgsql;
+RETURNS TRIGGER AS 'pg_pathman', 'pathman_config_params_trigger_func'
+LANGUAGE C;
 
 CREATE TRIGGER pathman_config_params_trigger
 BEFORE INSERT OR UPDATE OR DELETE ON @extschema@.pathman_config_params
@@ -750,11 +733,6 @@ CREATE OR REPLACE FUNCTION @extschema@.add_to_pathman_config(
 RETURNS BOOLEAN AS 'pg_pathman', 'add_to_pathman_config'
 LANGUAGE C;
 
-CREATE OR REPLACE FUNCTION @extschema@.invalidate_relcache(
-	relid			OID)
-RETURNS VOID AS 'pg_pathman'
-LANGUAGE C STRICT;
-
 
 /*
  * Lock partitioned relation to restrict concurrent
diff --git a/pg_pathman--1.1--1.2.sql b/pg_pathman--1.1--1.2.sql
@@ -23,6 +23,12 @@ DROP FUNCTION @extschema@.get_sequence_name(TEXT, TEXT);
 DROP FUNCTION @extschema@.create_single_range_partition(REGCLASS, ANYELEMENT, ANYELEMENT, TEXT, TEXT);
 DROP FUNCTION @extschema@.check_overlap(REGCLASS, ANYELEMENT, ANYELEMENT);
 DROP FUNCTION @extschema@.split_range_partition(REGCLASS, ANYELEMENT, TEXT, OUT ANYARRAY);
+DROP FUNCTION @extschema@.invalidate_relcache(OID);
+
+/* drop trigger and its function (PATHMAN_CONFIG_PARAMS) */
+DROP TRIGGER pathman_config_params_trigger;
+DROP FUNCTION @extschema@.pathman_config_params_trigger_func();
+
 
 /* ------------------------------------------------------------------------
  * Alter functions' modifiers
@@ -1265,6 +1271,16 @@ RETURNS VOID AS 'pg_pathman', 'check_range_available_pl'
 LANGUAGE C;
 
 
+/* Finally create function and trigger (PATHMAN_CONFIG_PARAMS) */
+CREATE OR REPLACE FUNCTION @extschema@.pathman_config_params_trigger_func()
+RETURNS TRIGGER AS 'pg_pathman', 'pathman_config_params_trigger_func'
+LANGUAGE C;
+
+CREATE TRIGGER pathman_config_params_trigger
+BEFORE INSERT OR UPDATE OR DELETE ON @extschema@.pathman_config_params
+FOR EACH ROW EXECUTE PROCEDURE @extschema@.pathman_config_params_trigger_func();
+
+
 /* ------------------------------------------------------------------------
  * Alter tables
  * ----------------------------------------------------------------------*/
diff --git a/src/hooks.c b/src/hooks.c
@@ -614,8 +614,11 @@ pathman_relcache_hook(Datum arg, Oid relid)
 		/* Both syscache and pathman's cache say it isn't a partition */
 		case PPS_ENTRY_NOT_FOUND:
 			{
-				if (partitioned_table != InvalidOid)
-					delay_invalidation_parent_rel(partitioned_table);
+				Assert(partitioned_table == InvalidOid);
+
+				/* Which means that 'relid' might be parent */
+				if (relid != InvalidOid)
+					delay_invalidation_parent_rel(relid);
 #ifdef NOT_USED
 				elog(DEBUG2, "Invalidation message for relation %u [%u]",
 					 relid, MyProcPid);
diff --git a/src/pl_funcs.c b/src/pl_funcs.c
@@ -17,9 +17,11 @@
 
 #include "access/htup_details.h"
 #include "access/nbtree.h"
+#include "access/xact.h"
 #include "catalog/indexing.h"
 #include "catalog/pg_type.h"
 #include "commands/tablespace.h"
+#include "commands/trigger.h"
 #include "funcapi.h"
 #include "miscadmin.h"
 #include "utils/builtins.h"
@@ -54,7 +56,7 @@ PG_FUNCTION_INFO_V1( is_date_type );
 PG_FUNCTION_INFO_V1( is_attribute_nullable );
 
 PG_FUNCTION_INFO_V1( add_to_pathman_config );
-PG_FUNCTION_INFO_V1( invalidate_relcache );
+PG_FUNCTION_INFO_V1( pathman_config_params_trigger_func );
 
 PG_FUNCTION_INFO_V1( lock_partitioned_relation );
 PG_FUNCTION_INFO_V1( prevent_relation_modification );
@@ -676,17 +678,51 @@ add_to_pathman_config(PG_FUNCTION_ARGS)
 
 
 /*
- * Invalidate relcache for a specified relation.
+ * Invalidate relcache to refresh PartRelationInfo.
  */
 Datum
-invalidate_relcache(PG_FUNCTION_ARGS)
+pathman_config_params_trigger_func(PG_FUNCTION_ARGS)
 {
-	Oid		relid = PG_GETARG_OID(0);
-
-	if (check_relation_exists(relid))
-		CacheInvalidateRelcacheByRelid(relid);
+	TriggerData	   *trigdata = (TriggerData *) fcinfo->context;
+	Oid				pathman_config_params = get_pathman_config_params_relid();
+	Oid				partrel;
+	Datum			partrel_datum;
+	bool			partrel_isnull;
+
+	/* Handle user calls */
+	if (!CALLED_AS_TRIGGER(fcinfo))
+		elog(ERROR, "this function should not be called directly");
+
+	/* Handle wrong fire mode */
+	if (!TRIGGER_FIRED_FOR_ROW(trigdata->tg_event))
+		elog(ERROR, "%s: must be fired for row",
+			 trigdata->tg_trigger->tgname);
+
+	/* Handle wrong relation */
+	if (RelationGetRelid(trigdata->tg_relation) != pathman_config_params)
+		elog(ERROR, "%s: must be fired for relation \"%s\"",
+			 trigdata->tg_trigger->tgname,
+			 get_rel_name(pathman_config_params));
+
+	/* Extract partitioned relation's Oid */
+	partrel_datum = heap_getattr(trigdata->tg_trigtuple,
+								 Anum_pathman_config_params_partrel,
+								 RelationGetDescr(trigdata->tg_relation),
+								 &partrel_isnull);
+	Assert(partrel_isnull == false); /* partrel should not be NULL! */
+
+	partrel = DatumGetObjectId(partrel_datum);
+
+	/* Finally trigger pg_pathman's cache invalidation event */
+	if (check_relation_exists(partrel))
+		CacheInvalidateRelcacheByRelid(partrel);
+
+	/* Return the tuple we've been given */
+	if (trigdata->tg_event & TRIGGER_EVENT_UPDATE)
+		PG_RETURN_POINTER(trigdata->tg_newtuple);
+	else
+		PG_RETURN_POINTER(trigdata->tg_trigtuple);
 
-	PG_RETURN_VOID();
 }
 
 
