diff options
| author | Amit Langote <amitlan@postgresql.org> | 2025-10-16 14:01:44 +0900 |
|---|---|---|
| committer | Amit Langote <amitlan@postgresql.org> | 2025-10-16 14:01:44 +0900 |
| commit | 905e932f0922a837bb3e4e482089c7c2e98bea67 (patch) | |
| tree | be6c3c8a56e9d85f856121f5272753edb9f11218 /src/test | |
| parent | 02c171f63fca870d55c4b184a4b7c0cebb06faa1 (diff) | |
Fix EPQ crash from missing partition directory in EState
EvalPlanQualStart() failed to propagate es_partition_directory into
the child EState used for EPQ rechecks. When execution time partition
pruning ran during the EPQ scan, executor code dereferenced a NULL
partition directory and crashed.
Previously, propagating es_partition_directory into the EPQ EState was
unnecessary because CreatePartitionPruneState(), which sets it on
demand, also initialized the exec-pruning context. After commit
d47cbf474, CreatePartitionPruneState() now initializes only the init-
time pruning context, leaving exec-pruning context initialization to
ExecInitNode(). Since EvalPlanQualStart() runs only ExecInitNode() and
not CreatePartitionPruneState(), it can encounter a NULL
es_partition_directory. Other executor fields initialized during
CreatePartitionPruneState() are already copied into the child EState
thanks to commit 8741e48e5d, but es_partition_directory was missed.
Fix by borrowing the parent estate's es_partition_directory in
EvalPlanQualStart(), and by clearing that field in EvalPlanQualEnd()
so the parent remains responsible for freeing the directory.
Add an isolation test permutation that triggers EPQ with execution-
time partition pruning, the case that reproduces this crash.
Bug: #19078
Reported-by: Yuri Zamyatin <yuri@yrz.am>
Diagnosed-by: David Rowley <dgrowleyml@gmail.com>
Author: David Rowley <dgrowleyml@gmail.com>
Co-authored-by: Amit Langote <amitlangote09@gmail.com>
Discussion: https://postgr.es/m/19078-dfd62f840a2c0766@postgresql.org
Backpatch-through: 18
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/isolation/expected/eval-plan-qual.out | 7 | ||||
| -rw-r--r-- | src/test/isolation/specs/eval-plan-qual.spec | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/test/isolation/expected/eval-plan-qual.out b/src/test/isolation/expected/eval-plan-qual.out index 60eca44b4e3..05fffe0d570 100644 --- a/src/test/isolation/expected/eval-plan-qual.out +++ b/src/test/isolation/expected/eval-plan-qual.out @@ -1466,3 +1466,10 @@ step s2pp3: EXECUTE epd(1); <waiting ...> step c1: COMMIT; step s2pp3: <... completed> step c2: COMMIT; + +starting permutation: s1pp1 s2pp4 c1 c2 +step s1pp1: UPDATE another_parttbl SET b = b + 1 WHERE a = 1; +step s2pp4: DELETE FROM another_parttbl WHERE a = (SELECT 1); <waiting ...> +step c1: COMMIT; +step s2pp4: <... completed> +step c2: COMMIT; diff --git a/src/test/isolation/specs/eval-plan-qual.spec b/src/test/isolation/specs/eval-plan-qual.spec index 64afffb1d83..80e1e6bb307 100644 --- a/src/test/isolation/specs/eval-plan-qual.spec +++ b/src/test/isolation/specs/eval-plan-qual.spec @@ -316,6 +316,7 @@ step r2 { ROLLBACK; } step s2pp1 { SET plan_cache_mode TO force_generic_plan; } step s2pp2 { PREPARE epd AS DELETE FROM another_parttbl WHERE a = $1; } step s2pp3 { EXECUTE epd(1); } +step s2pp4 { DELETE FROM another_parttbl WHERE a = (SELECT 1); } session s3 setup { BEGIN ISOLATION LEVEL READ COMMITTED; } @@ -423,3 +424,4 @@ permutation sys1 sysmerge2 c1 c2 # Exercise run-time partition pruning code in an EPQ recheck permutation s1pp1 s2pp1 s2pp2 s2pp3 c1 c2 +permutation s1pp1 s2pp4 c1 c2 |