aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Paquier <michael@paquier.xyz>2024-09-09 13:50:16 +0900
committerMichael Paquier <michael@paquier.xyz>2024-09-09 13:50:16 +0900
commit9021515488dd8f2dc43b7eaca127e113346f0449 (patch)
treeea820723dced2310bb50efb176da8d26b85a2300 /src
parent2534cd999e673b4e4a3c52233bbee5496a3c4b06 (diff)
downloadpostgresql-9021515488dd8f2dc43b7eaca127e113346f0449.tar.gz
postgresql-9021515488dd8f2dc43b7eaca127e113346f0449.zip
Fix waits of REINDEX CONCURRENTLY for indexes with predicates or expressions
As introduced by f9900df5f94, a REINDEX CONCURRENTLY job done for an index with predicates or expressions would set PROC_IN_SAFE_IC in its MyProc->statusFlags, causing it to be ignored by other concurrent operations. Such concurrent index rebuilds should never be ignored, as a predicate or an expression could call a user-defined function that accesses a different table than the table where the index is rebuilt. A test that uses injection points is added, backpatched down to 17. Michail has proposed a different test, but I have added something simpler with more coverage. Oversight in f9900df5f949. Author: Michail Nikolaev Discussion: https://postgr.es/m/CANtu0oj9A3kZVduFTG0vrmGnKB+DCHgEpzOp0qAyOgmks84j0w@mail.gmail.com Backpatch-through: 14
Diffstat (limited to 'src')
-rw-r--r--src/backend/commands/indexcmds.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c
index 1d66376927f..48b6c55e55d 100644
--- a/src/backend/commands/indexcmds.c
+++ b/src/backend/commands/indexcmds.c
@@ -3680,8 +3680,8 @@ ReindexRelationConcurrently(Oid relationOid, ReindexParams *params)
save_nestlevel = NewGUCNestLevel();
/* determine safety of this index for set_indexsafe_procflags */
- idx->safe = (indexRel->rd_indexprs == NIL &&
- indexRel->rd_indpred == NIL);
+ idx->safe = (RelationGetIndexExpressions(indexRel) == NIL &&
+ RelationGetIndexPredicate(indexRel) == NIL);
idx->tableId = RelationGetRelid(heapRel);
idx->amId = indexRel->rd_rel->relam;