| From: | Amit Langote <amitlan(at)postgresql(dot)org> |
|---|---|
| To: | pgsql-committers(at)lists(dot)postgresql(dot)org |
| Subject: | pgsql: Fix deferred FK check batching introduced by commit b7b27eb41a5 |
| Date: | 2026-04-07 01:48:40 |
| Message-ID: | E1w9vYV-003JwP-1z@gemulon.postgresql.org |
| Views: | Whole Thread | Raw Message | Download mbox | Resend email |
| Thread: | |
| Lists: | pgsql-committers |
Fix deferred FK check batching introduced by commit b7b27eb41a5
That commit introduced AfterTriggerIsActive() to detect whether
we are inside the after-trigger firing machinery, so that RI trigger
functions can take the batched fast path. It was implemented using
query_depth >= 0, which correctly identified immediate trigger firing
but missed the deferred case where query_depth is -1 at COMMIT via
AfterTriggerFireDeferred(). This caused deferred FK checks to fall
back to the per-row fast path instead of the batched path.
The correct check is whether we are inside an after-trigger firing
loop specifically. Introduce afterTriggerFiringDepth, a counter
incremented around the trigger-firing loops in AfterTriggerEndQuery,
AfterTriggerFireDeferred, and AfterTriggerSetState, and decremented
after FireAfterTriggerBatchCallbacks() returns. AfterTriggerIsActive()
now returns afterTriggerFiringDepth > 0.
Reported-by: Chao Li <li(dot)evan(dot)chao(at)gmail(dot)com>
Author: Chao Li <li(dot)evan(dot)chao(at)gmail(dot)com>
Co-authored-by: Amit Langote <amitlangote09(at)gmail(dot)com>
Discussion: https://postgr.es/m/C2133B47-79CD-40FF-B088-02D20D654806@gmail.com
Branch
------
master
Details
-------
https://git.postgresql.org/pg/commitdiff/5c54c3ed1b934a35a8e9eacff679699ccb3a5070
Modified Files
--------------
src/backend/commands/trigger.c | 26 ++++++++++++++++++++++----
1 file changed, 22 insertions(+), 4 deletions(-)
| From | Date | Subject | |
|---|---|---|---|
| Next Message | Michael Paquier | 2026-04-07 03:01:21 | pgsql: Fix shmem allocation of fixed-sized custom stats kind |
| Previous Message | Michael Paquier | 2026-04-06 23:24:55 | pgsql: Fix shared memory size of template code for custom fixed-sized p |