Re: [HACKERS] Fix a typo in execReplication.c

2017-10-13 Thread Simon Riggs 
On 13 October 2017 at 09:13, Masahiko Sawada  wrote:
> On Thu, Oct 12, 2017 at 11:30 PM, Robert Haas  wrote:
>> On Thu, Oct 12, 2017 at 6:55 AM, Petr Jelinek
>>  wrote:
>>> Thanks for the patch, looks correct to me.
>>
>> Committed and back-patched to v10.

Well spotted both of you!

Shows that reading code and correcting comments is useful activity.

-- 
Simon Riggshttp://www.2ndQuadrant.com/
PostgreSQL Development, 24x7 Support, Remote DBA, Training & Services


-- 
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers

Re: [HACKERS] Fix a typo in execReplication.c

2017-10-13 Thread Masahiko Sawada 
On Thu, Oct 12, 2017 at 11:30 PM, Robert Haas  wrote:
> On Thu, Oct 12, 2017 at 6:55 AM, Petr Jelinek
>  wrote:
>> Thanks for the patch, looks correct to me.
>
> Committed and back-patched to v10.
>

Thank you!

Regards,

--
Masahiko Sawada
NIPPON TELEGRAPH AND TELEPHONE CORPORATION
NTT Open Source Software Center


-- 
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers

Re: [HACKERS] Fix a typo in execReplication.c

2017-10-12 Thread Robert Haas 
On Thu, Oct 12, 2017 at 6:55 AM, Petr Jelinek
 wrote:
> Thanks for the patch, looks correct to me.

Committed and back-patched to v10.

-- 
Robert Haas
EnterpriseDB: http://www.enterprisedb.com
The Enterprise PostgreSQL Company


-- 
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers

Re: [HACKERS] Fix a typo in execReplication.c

2017-10-12 Thread Petr Jelinek 
On 12/10/17 00:52, Masahiko Sawada wrote:
> On Thu, Oct 12, 2017 at 5:02 AM, Robert Haas  wrote:
>> On Mon, Oct 9, 2017 at 10:59 PM, Masahiko Sawada  
>> wrote:
>>> Attached a patch for $subject. ISTM these are mistakes of copy-and-paste.
>>
>> Committed, but isn't the code itself wrong as well in the DELETE case?
>>
>> /* BEFORE ROW DELETE Triggers */
>> if (resultRelInfo->ri_TrigDesc &&
>> resultRelInfo->ri_TrigDesc->trig_update_before_row)
>> {
>> skip_tuple = !ExecBRDeleteTriggers(estate, epqstate, resultRelInfo,
>>>tts_tuple->t_self,
>>NULL);
>> }
>>
>> Why not trig_delete_before_row?
>>

Indeed, that's another copy-pasto.

> 
> Thank you!
> I think you're right. It should be trig_delete_before_row and be
> back-patched to 10. Attached patch fixes it.
> 

Thanks for the patch, looks correct to me.

-- 
  Petr Jelinek  http://www.2ndQuadrant.com/
  PostgreSQL Development, 24x7 Support, Training & Services


-- 
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers

Re: [HACKERS] Fix a typo in execReplication.c

2017-10-11 Thread Masahiko Sawada 
On Thu, Oct 12, 2017 at 5:02 AM, Robert Haas  wrote:
> On Mon, Oct 9, 2017 at 10:59 PM, Masahiko Sawada  
> wrote:
>> Attached a patch for $subject. ISTM these are mistakes of copy-and-paste.
>
> Committed, but isn't the code itself wrong as well in the DELETE case?
>
> /* BEFORE ROW DELETE Triggers */
> if (resultRelInfo->ri_TrigDesc &&
> resultRelInfo->ri_TrigDesc->trig_update_before_row)
> {
> skip_tuple = !ExecBRDeleteTriggers(estate, epqstate, resultRelInfo,
>>tts_tuple->t_self,
>NULL);
> }
>
> Why not trig_delete_before_row?
>

Thank you!
I think you're right. It should be trig_delete_before_row and be
back-patched to 10. Attached patch fixes it.

Regards,

--
Masahiko Sawada
NIPPON TELEGRAPH AND TELEPHONE CORPORATION
NTT Open Source Software Center
diff --git a/src/backend/executor/execReplication.c b/src/backend/executor/execReplication.c
index c26420a..fb538c0 100644
--- a/src/backend/executor/execReplication.c
+++ b/src/backend/executor/execReplication.c
@@ -511,7 +511,7 @@ ExecSimpleRelationDelete(EState *estate, EPQState *epqstate,
 
 	/* BEFORE ROW DELETE Triggers */
 	if (resultRelInfo->ri_TrigDesc &&
-		resultRelInfo->ri_TrigDesc->trig_update_before_row)
+		resultRelInfo->ri_TrigDesc->trig_delete_before_row)
 	{
 		skip_tuple = !ExecBRDeleteTriggers(estate, epqstate, resultRelInfo,
 		   >tts_tuple->t_self,

-- 
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers

Re: [HACKERS] Fix a typo in execReplication.c

2017-10-11 Thread Robert Haas 
On Mon, Oct 9, 2017 at 10:59 PM, Masahiko Sawada  wrote:
> Attached a patch for $subject. ISTM these are mistakes of copy-and-paste.

Committed, but isn't the code itself wrong as well in the DELETE case?

/* BEFORE ROW DELETE Triggers */
if (resultRelInfo->ri_TrigDesc &&
resultRelInfo->ri_TrigDesc->trig_update_before_row)
{
skip_tuple = !ExecBRDeleteTriggers(estate, epqstate, resultRelInfo,
   >tts_tuple->t_self,
   NULL);
}

Why not trig_delete_before_row?

-- 
Robert Haas
EnterpriseDB: http://www.enterprisedb.com
The Enterprise PostgreSQL Company


-- 
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers