(2018/04/05 15:37), Amit Langote wrote:
> On 2018/04/05 15:02, Etsuro Fujita wrote:
>> (2018/04/04 19:31), Etsuro Fujita wrote:
>>> Attached is an updated version of the patch set:
>>> * As before, patch foreign-routing-fdwapi-4.patch is created on top of
>>> patch postgres-fdw-refactoring-4.patch and the bug-fix patch [1].
>>
>> I did a bit of cleanup and comment-rewording to patch
>> foreign-routing-fdwapi-4.patch. Attached is a new version of the patch
>> set. I renamed the postgres_fdw refactoring patch but no changes to that
>> patch.
>
> I noticed that the 2nd patch (foreign-routing-fdwapi-5.patch) fails to
> apply to copy.c:
>
> Hunk #9 FAILED at 2719.
> Hunk #10 succeeded at 2752 (offset -1 lines).
> Hunk #11 succeeded at 2795 (offset -1 lines).
> Hunk #12 succeeded at 2843 (offset -1 lines).
> 1 out of 12 hunks FAILED -- saving rejects to file
> src/backend/commands/copy.c.rej
>
> cat src/backend/commands/copy.c.rej
> *** src/backend/commands/copy.c
> --- src/backend/commands/copy.c
> ***************
> *** 2719,2727 ****
> resultRelInfo->ri_TrigDesc->trig_insert_before_row))
> check_partition_constr = false;
>
> ! /* Check the constraints of the tuple */
> ! if (resultRelInfo->ri_RelationDesc->rd_att->constr ||
> ! check_partition_constr)
> ExecConstraints(resultRelInfo, slot, estate, true);
>
> if (useHeapMultiInsert)
> --- 2730,2742 ----
> resultRelInfo->ri_TrigDesc->trig_insert_before_row))
> check_partition_constr = false;
>
> ! /*
> ! * If the target is a plain table, check the constraints of
> ! * the tuple.
> ! */
> ! if (resultRelInfo->ri_FdwRoutine == NULL&&
> ! (resultRelInfo->ri_RelationDesc->rd_att->constr ||
> ! check_partition_constr))
> ExecConstraints(resultRelInfo, slot, estate, true);
>
> if (useHeapMultiInsert)
>
> Can you check?
I forgot to mention this: the second patch is created on top of the
first patch (postgres-fdw-refactoring-5.patch) and the patch in [1] as
before.
Thanks for reviewing, Amit!
Best regards,
Etsuro Fujita
[1] https://www.postgresql.org/message-id/5ABA4074.1090500@lab.ntt.co.jp