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

funbringer · funbringer · commit 505fa080d20a · 2018-08-29T18:58:00.000+03:00
diff --git a/src/utility_stmt_hooking.c b/src/utility_stmt_hooking.c
@@ -630,9 +630,9 @@ PathmanCopyFrom(CopyState cstate, Relation parent_rel,
 			/* Handle foreign tables */
 			else
 			{
-				child_result_rel->ri_FdwRoutine->ForeignNextCopyFrom(estate,
-																	 child_rri,
-																	 cstate);
+				child_rri->ri_FdwRoutine->ForeignNextCopyFrom(estate,
+															  child_rri,
+															  cstate);
 			}
 #endif
 
@@ -706,7 +706,7 @@ prepare_rri_for_copy(ResultRelInfoHolder *rri_holder,
 			FdwCopyFromIsSupported(fdw_routine))
 		{
 			CopyState		cstate = (CopyState) rps_storage->init_rri_holder_cb_arg;
-			ResultRelInfo	*parent_rri = rps_storage->saved_rel_info;
+			ResultRelInfo	*parent_rri = rps_storage->base_rri;
 			EState			*estate = rps_storage->estate;
 
 			fdw_routine->BeginForeignCopyFrom(estate, rri, cstate, parent_rri);

Original file line number	Diff line number	Diff line change
`@@ -630,9 +630,9 @@ PathmanCopyFrom(CopyState cstate, Relation parent_rel,`
`630`	`630`	`/* Handle foreign tables */`
`631`	`631`	`else`
`632`	`632`	`{`
`633`		`- child_result_rel->ri_FdwRoutine->ForeignNextCopyFrom(estate,`
`634`		`- child_rri,`
`635`		`- cstate);`
	`633`	`+ child_rri->ri_FdwRoutine->ForeignNextCopyFrom(estate,`
	`634`	`+ child_rri,`
	`635`	`+ cstate);`
`636`	`636`	`}`
`637`	`637`	`#endif`
`638`	`638`
`@@ -706,7 +706,7 @@ prepare_rri_for_copy(ResultRelInfoHolder *rri_holder,`
`706`	`706`	`FdwCopyFromIsSupported(fdw_routine))`
`707`	`707`	`{`
`708`	`708`	`CopyState cstate = (CopyState) rps_storage->init_rri_holder_cb_arg;`
`709`		`- ResultRelInfo *parent_rri = rps_storage->saved_rel_info;`
	`709`	`+ ResultRelInfo *parent_rri = rps_storage->base_rri;`
`710`	`710`	`EState *estate = rps_storage->estate;`
`711`	`711`
`712`	`712`	`fdw_routine->BeginForeignCopyFrom(estate, rri, cstate, parent_rri);`