Remove FDW tables support from update node functions

Author: ildus

hash.sql

@@ -138,10 +138,6 @@ BEGIN
 				   @extschema@.build_check_constraint_name(new_partition::REGCLASS),
 				   old_constr_def);
 
-	IF @extschema@.is_relation_foreign(new_partition) THEN
-		PERFORM @extschema@.create_single_nop_trigger(parent_relid, new_partition);
-	END IF;
-
 	/* Fetch init_callback from 'params' table */
 	WITH stub_callback(stub) as (values (0))
 	SELECT init_callback

init.sql

@@ -737,23 +737,6 @@ CREATE OR REPLACE FUNCTION @extschema@.has_update_trigger(
 RETURNS BOOL AS 'pg_pathman', 'has_update_trigger'
 LANGUAGE C STRICT;
 
-/*
- * Function for NOP triggers.
- * NOP trigger is a trigger that we use to turn off direct modify of FDW tables
- */
-CREATE OR REPLACE FUNCTION @extschema@.pathman_nop_trigger_func()
-RETURNS TRIGGER AS 'pg_pathman', 'pathman_nop_trigger_func'
-LANGUAGE C STRICT;
-
-/*
- * Creates single NOP trigger.
- */
-CREATE OR REPLACE FUNCTION @extschema@.create_single_nop_trigger(
-	parent_relid	REGCLASS,
-	partition_relid	REGCLASS)
-RETURNS VOID AS 'pg_pathman', 'create_single_nop_trigger'
-LANGUAGE C STRICT;
-
 /*
  * Partitioning key
  */
@@ -946,11 +929,3 @@ LANGUAGE C STRICT;
 CREATE OR REPLACE FUNCTION @extschema@.get_pathman_lib_version()
 RETURNS CSTRING AS 'pg_pathman', 'get_pathman_lib_version'
 LANGUAGE C STRICT;
-
-/*
- * Check if relation is foreign table
- */
-CREATE OR REPLACE FUNCTION @extschema@.is_relation_foreign(
-	relid	REGCLASS)
-RETURNS BOOL AS 'pg_pathman', 'is_relation_foreign'
-LANGUAGE C STRICT;

range.sql

@@ -952,11 +952,6 @@ BEGIN
 		PERFORM @extschema@.create_single_update_trigger(parent_relid, partition_relid);
 	END IF;
 
-	/*
-	IF @extschema@.is_relation_foreign(partition_relid) THEN
-		PERFORM @extschema@.create_single_nop_trigger(parent_relid, partition_relid);
-	END IF; */
-
 	/* Invoke an initialization callback */
 	PERFORM @extschema@.invoke_on_partition_created_callback(parent_relid,
 															 partition_relid,

src/include/partition_update.h

@@ -29,7 +29,6 @@ typedef struct PartitionUpdateState
 	CustomScanState		 css;
 
 	Oid					 partitioned_table;
-	List				*returning_list;
 	ResultRelInfo		*resultRelInfo;
 	JunkFilter			*saved_junkFilter;
 	Plan				*subplan;				/* proxy variable to store subplan */

src/init.c

@@ -583,17 +583,6 @@ build_update_trigger_name_internal(Oid relid)
 	return psprintf("%s_upd_trig", get_rel_name(relid));
 }
 
-/*
- * Generate name for NOP trigger.
- * NOTE: this function does not perform sanity checks at all.
- */
-char *
-build_nop_trigger_name_internal(Oid relid)
-{
-	AssertArg(OidIsValid(relid));
-	return psprintf("%s_nop_trig", get_rel_name(relid));
-}
-
 /*
  * Generate name for update trigger's function.
  * NOTE: this function does not perform sanity checks at all.

src/partition_creation.c

@@ -1830,38 +1830,3 @@ has_update_trigger_internal(Oid parent_relid)
 	trigname = build_update_trigger_name_internal(parent_relid);
 	return has_trigger_internal(parent_relid, trigname);
 }
-
-/* Create trigger for partition that does nothing */
-void
-create_single_nop_trigger_internal(Oid relid,
-								   const char *trigname,
-								   List *columns)
-{
-	CreateTrigStmt	   *stmt;
-	List			   *func;
-
-	/* do nothing if relation has trigger already */
-	if (has_trigger_internal(relid, trigname))
-		return;
-
-	func = list_make2(makeString(get_namespace_name(get_pathman_schema())),
-					  makeString(CppAsString(pathman_nop_trigger_func)));
-
-	stmt = makeNode(CreateTrigStmt);
-	stmt->trigname		= (char *) trigname;
-	stmt->relation		= makeRangeVarFromRelid(relid);
-	stmt->funcname		= func;
-	stmt->args			= NIL;
-	stmt->row			= true;
-	stmt->timing		= TRIGGER_TYPE_BEFORE;
-	stmt->events		= TRIGGER_TYPE_UPDATE;
-	stmt->columns		= columns;
-	stmt->whenClause	= NULL;
-	stmt->isconstraint	= false;
-	stmt->deferrable	= false;
-	stmt->initdeferred	= false;
-	stmt->constrrel		= NULL;
-
-	(void) CreateTrigger(stmt, NULL, InvalidOid, InvalidOid,
-						 InvalidOid, InvalidOid, false);
-}

src/partition_update.c

@@ -28,7 +28,6 @@ CustomScanMethods	partition_update_plan_methods;
 CustomExecMethods	partition_update_exec_methods;
 
 static TupleTableSlot *ExecDeleteInternal(ItemPointer tupleid,
-										  HeapTuple oldtuple,
 										  TupleTableSlot *planSlot,
 										  EPQState *epqstate,
 										  EState *estate);
@@ -138,15 +137,12 @@ partition_update_exec(CustomScanState *node)
 	if (!TupIsNull(slot))
 	{
 		Datum					 datum;
-		bool					 isNull;
 		char					 relkind;
 		ResultRelInfo			*resultRelInfo,
 								*sourceRelInfo;
 		ItemPointer				 tupleid = NULL;
 		ItemPointerData			 tuple_ctid;
 		EPQState				 epqstate;
-		HeapTupleData			 oldtupdata;
-		HeapTuple				 oldtuple = NULL;
 		PartitionFilterState	*child_state;
 		JunkFilter				*junkfilter;
 
@@ -178,28 +174,9 @@ partition_update_exec(CustomScanState *node)
 				tupleid = &tuple_ctid;
 			}
 			else if (relkind == RELKIND_FOREIGN_TABLE)
-			{
-				if (AttributeNumberIsValid(junkfilter->jf_junkAttNo))
-				{
-					datum = ExecGetJunkAttribute(child_state->subplan_slot,
-												 junkfilter->jf_junkAttNo,
-												 &isNull);
-					/* shouldn't ever get a null result... */
-					if (isNull)
-						elog(ERROR, "wholerow is NULL");
-
-					oldtupdata.t_data = DatumGetHeapTupleHeader(datum);
-					oldtupdata.t_len =
-						HeapTupleHeaderGetDatumLength(oldtupdata.t_data);
-					ItemPointerSetInvalid(&(oldtupdata.t_self));
-
-					/* Historically, view triggers see invalid t_tableOid. */
-					oldtupdata.t_tableOid = RelationGetRelid(resultRelInfo->ri_RelationDesc);
-					oldtuple = &oldtupdata;
-				}
-			}
+				elog(ERROR, "update node is not supported for foreign tables");
 			else
-				elog(ERROR, "got unexpected type of relation");
+				elog(ERROR, "got unexpected type of relation for update");
 
 			/*
 			 * Clean from junk attributes before INSERT,
@@ -209,14 +186,9 @@ partition_update_exec(CustomScanState *node)
 				slot = ExecFilterJunk(junkfilter, slot);
 		}
 
-		/*
-		 * Delete old tuple. We have two cases here:
-		 * 1) local tables - tupleid points to actual tuple
-		 * 2) foreign tables - tupleid is invalid, slot is required
-		 */
+		/* Delete old tuple */
 		estate->es_result_relation_info = sourceRelInfo;
-		ExecDeleteInternal(tupleid, oldtuple, child_state->subplan_slot,
-				&epqstate, estate);
+		ExecDeleteInternal(tupleid, child_state->subplan_slot, &epqstate, estate);
 
 		/* we've got the slot that can be inserted to child partition */
 		estate->es_result_relation_info = resultRelInfo;
@@ -254,15 +226,14 @@ partition_update_explain(CustomScanState *node, List *ancestors, ExplainState *e
  */
 static TupleTableSlot *
 ExecDeleteInternal(ItemPointer tupleid,
-				   HeapTuple oldtuple,
 				   TupleTableSlot *planSlot,
 				   EPQState *epqstate,
 				   EState *estate)
 {
-	ResultRelInfo *resultRelInfo;
-	Relation	resultRelationDesc;
-	HTSU_Result result;
-	HeapUpdateFailureData hufd;
+	ResultRelInfo			*resultRelInfo;
+	Relation				 resultRelationDesc;
+	HTSU_Result				 result;
+	HeapUpdateFailureData	 hufd;
 
 	/*
 	 * get information on the (current) result relation
@@ -277,29 +248,13 @@ ExecDeleteInternal(ItemPointer tupleid,
 		bool		dodelete;
 
 		dodelete = ExecBRDeleteTriggers(estate, epqstate, resultRelInfo,
-										tupleid, oldtuple);
+										tupleid, NULL);
 
 		if (!dodelete)
 			elog(ERROR, "the old row always should be deleted from child table");
 	}
 
-	if (resultRelInfo->ri_FdwRoutine)
-	{
-		TupleTableSlot	*slot = MakeSingleTupleTableSlot(RelationGetDescr(resultRelationDesc));
-
-		/*
-		 * delete from foreign table: let the FDW do it
-		 */
-		ExecSetSlotDescriptor(slot, RelationGetDescr(resultRelationDesc));
-		resultRelInfo->ri_FdwRoutine->ExecForeignDelete(estate,
-														resultRelInfo,
-														slot,
-														planSlot);
-
-		/* we don't need slot anymore */
-		ExecDropSingleTupleTableSlot(slot);
-	}
-	else if (tupleid != NULL)
+	if (tupleid != NULL)
 	{
 		/* delete the tuple */
 ldelete:;
@@ -358,7 +313,7 @@ ldelete:;
 		elog(ERROR, "tupleid should be specified for deletion");
 
 	/* AFTER ROW DELETE Triggers */
-	ExecARDeleteTriggers(estate, resultRelInfo, tupleid, oldtuple);
+	ExecARDeleteTriggers(estate, resultRelInfo, tupleid, NULL);
 
 	return NULL;
 }

src/pl_funcs.c

@@ -71,12 +71,8 @@ PG_FUNCTION_INFO_V1( check_security_policy );
 
 PG_FUNCTION_INFO_V1( create_update_triggers );
 PG_FUNCTION_INFO_V1( pathman_update_trigger_func );
-PG_FUNCTION_INFO_V1( pathman_nop_trigger_func );
 PG_FUNCTION_INFO_V1( create_single_update_trigger );
 PG_FUNCTION_INFO_V1( has_update_trigger );
-PG_FUNCTION_INFO_V1( is_relation_foreign );
-
-PG_FUNCTION_INFO_V1( create_single_nop_trigger );
 
 PG_FUNCTION_INFO_V1( debug_capture );
 PG_FUNCTION_INFO_V1( get_pathman_lib_version );
@@ -1217,24 +1213,6 @@ pathman_update_trigger_func(PG_FUNCTION_ARGS)
 	PG_RETURN_POINTER(new_tuple);
 }
 
-Datum
-pathman_nop_trigger_func(PG_FUNCTION_ARGS)
-{
-	TriggerData			   *trigdata = (TriggerData *) fcinfo->context;
-
-	/* 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);
-
-	/* Just return NEW tuple */
-	PG_RETURN_POINTER(trigdata->tg_newtuple);
-}
-
 struct replace_vars_cxt
 {
 	HeapTuple		new_tuple;
@@ -1478,50 +1456,6 @@ has_update_trigger(PG_FUNCTION_ARGS)
 	PG_RETURN_BOOL(has_update_trigger_internal(parent_relid));
 }
 
-/* Check if relation is foreign table */
-Datum
-is_relation_foreign(PG_FUNCTION_ARGS)
-{
-	Oid			relid = PG_GETARG_OID(0);
-	Relation	rel;
-	bool		res;
-
-	/* Check that relation exists */
-	if (!SearchSysCacheExists1(RELOID, ObjectIdGetDatum(relid)))
-		ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-						errmsg("relation \"%u\" does not exist", relid)));
-
-	rel = heap_open(relid, NoLock);
-	res = (rel->rd_rel->relkind == RELKIND_FOREIGN_TABLE);
-	heap_close(rel, NoLock);
-	PG_RETURN_BOOL(res);
-}
-
-/* Create a trigger for partition that does nothing */
-Datum
-create_single_nop_trigger(PG_FUNCTION_ARGS)
-{
-	Oid						parent = PG_GETARG_OID(0);
-	Oid						child = PG_GETARG_OID(1);
-	const char			   *trigname;
-	const PartRelationInfo *prel;
-	List				   *columns;
-
-	/* Check that table is partitioned */
-	prel = get_pathman_relation_info(parent);
-	shout_if_prel_is_invalid(parent, prel, PT_ANY);
-
-	/* Acquire trigger and attribute names */
-	trigname = build_nop_trigger_name_internal(parent);
-
-	/* Generate list of columns used in expression */
-	columns = PrelExpressionColumnNames(prel);
-	create_single_nop_trigger_internal(child, trigname, columns);
-
-	PG_RETURN_VOID();
-}
-
-
 /*
  * -------
  *  DEBUG