Disable COPY FROM to foreign parts, because no generic impl exists.

arssher · arssher · commit 1950fabd8b59 · 2017-12-04T14:39:55.000+03:00
diff --git a/contrib/file_fdw/output/file_fdw.source b/contrib/file_fdw/output/file_fdw.source
@@ -315,7 +315,7 @@ SELECT tableoid::regclass, * FROM p2;
 (0 rows)
 
 COPY pt FROM '@abs_srcdir@/data/list2.bad' with (format 'csv', delimiter ','); -- ERROR
-ERROR:  FDW adapter for relation "p1" doesn't support COPY FROM
+ERROR:  cannot route inserted tuples to a foreign table
 CONTEXT:  COPY pt, line 2: "1,qux"
 COPY pt FROM '@abs_srcdir@/data/list2.csv' with (format 'csv', delimiter ',');
 SELECT tableoid::regclass, * FROM pt;
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
@@ -180,9 +180,6 @@ static void CopySendInt32(CopyState cstate, int32 val);
 static bool CopyGetInt32(CopyState cstate, int32 *val);
 static void CopySendInt16(CopyState cstate, int16 val);
 static bool CopyGetInt16(CopyState cstate, int16 *val);
-static void InitForeignCopyFrom(EState *estate, ResultRelInfo *resultRelInfo,
-								CopyState cstate, char *dest_relname);
-static void EndForeignCopyFrom(EState *estate, ResultRelInfo *resultRelInfo);
 
 
 /*
@@ -2314,7 +2311,6 @@ CopyFrom(CopyState cstate)
 		TupleTableSlot *partition_tuple_slot;
 		int			num_parted,
 					num_partitions;
-		int 		i;
 
 		ExecSetupPartitionTupleRouting(cstate->rel,
 									   1,
@@ -2351,16 +2347,15 @@ CopyFrom(CopyState cstate)
 										   gettext_noop("could not convert row type"));
 			}
 		}
-
-		/* If some partitions are foreign tables, init copy on remote end */
-		for (i = 0; i < num_partitions; i++)
-		{
-			InitForeignCopyFrom(estate, partitions + i, cstate, NULL);
-		}
 	}
 
 	/* If we are copying to foreign table, init it */
-	InitForeignCopyFrom(estate, resultRelInfo, cstate, NULL);
+	if (resultRelInfo->ri_FdwRoutine &&
+		FdwCopyFromIsSupported(resultRelInfo->ri_FdwRoutine))
+	{
+		resultRelInfo->ri_FdwRoutine->
+			BeginForeignCopyFrom(estate, resultRelInfo, cstate, NULL);
+	}
 
 	/*
 	 * It's more efficient to prepare a bunch of tuples for insertion, and
@@ -2490,6 +2485,12 @@ CopyFrom(CopyState cstate)
 			saved_resultRelInfo = resultRelInfo;
 			resultRelInfo = cstate->partitions + leaf_part_index;
 
+			/* We do not yet have a way to insert into a foreign partition */
+			if (resultRelInfo->ri_FdwRoutine)
+				ereport(ERROR,
+						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+						 errmsg("cannot route inserted tuples to a foreign table")));
+
 			/*
 			 * For ExecInsertIndexTuples() to work on the partition's indexes
 			 */
@@ -2710,7 +2711,12 @@ CopyFrom(CopyState cstate)
 	/*
 	 * Shut down FDW.
 	 */
-	EndForeignCopyFrom(estate, resultRelInfo);
+	if (resultRelInfo->ri_FdwRoutine &&
+		FdwCopyFromIsSupported(resultRelInfo->ri_FdwRoutine))
+	{
+		resultRelInfo->ri_FdwRoutine->EndForeignCopyFrom(
+			estate, resultRelInfo);
+	}
 
 	/* Close all the partitioned tables, leaf partitions, and their indices */
 	if (cstate->partition_dispatch_info)
@@ -2734,8 +2740,6 @@ CopyFrom(CopyState cstate)
 		{
 			ResultRelInfo *resultRelInfo = cstate->partitions + i;
 
-			EndForeignCopyFrom(estate, resultRelInfo);
-
 			ExecCloseIndices(resultRelInfo);
 			heap_close(resultRelInfo->ri_RelationDesc, NoLock);
 		}
@@ -4726,30 +4730,3 @@ CreateCopyDestReceiver(void)
 
 	return (DestReceiver *) self;
 }
-
-/*
- * Start COPY FROM on foreign relation, if possible. If not, just do nothing.
- */
-static void InitForeignCopyFrom(EState *estate, ResultRelInfo *resultRelInfo,
-								CopyState cstate, char *dest_relname)
-{
-	if (resultRelInfo->ri_FdwRoutine &&
-		FdwCopyFromIsSupported(resultRelInfo->ri_FdwRoutine))
-	{
-		resultRelInfo->ri_FdwRoutine->
-			BeginForeignCopyFrom(estate, resultRelInfo, cstate, dest_relname);
-	}
-}
-
-/*
- * Finish COPY FROM on foreign relation, if needed.
- */
-static void EndForeignCopyFrom(EState *estate, ResultRelInfo *resultRelInfo)
-{
-	if (resultRelInfo->ri_FdwRoutine &&
-		FdwCopyFromIsSupported(resultRelInfo->ri_FdwRoutine))
-	{
-		resultRelInfo->ri_FdwRoutine->EndForeignCopyFrom(
-			estate, resultRelInfo);
-	}
-}
diff --git a/src/include/foreign/fdwapi.h b/src/include/foreign/fdwapi.h
@@ -160,6 +160,14 @@ typedef bool (*IsForeignScanParallelSafe_function) (PlannerInfo *root,
 													RelOptInfo *rel,
 													RangeTblEntry *rte);
 
+/*
+ * These functions are not documented in fdwhandler.sgml because the interface
+ * is pretty unstable and weird, it hardly would be useful for anyone but
+ * shardman. In particular,
+ * - There is no way to COPY binary data.
+ * - Private CopyState is exported.
+ * - I am not sure about passing parent_rinfo.
+ */
 typedef void (*BeginForeignCopyFrom_function) (EState *estate,
 											   ResultRelInfo *rinfo,
 											   CopyState cstate,
