mirror of
https://github.com/postgres/postgres.git
synced 2025-06-22 02:52:08 +03:00
Fix waits of REINDEX CONCURRENTLY for indexes with predicates or expressions
As introduced byf9900df5f9
, 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 inf9900df5f9
. Author: Michail Nikolaev Discussion: https://postgr.es/m/CANtu0oj9A3kZVduFTG0vrmGnKB+DCHgEpzOp0qAyOgmks84j0w@mail.gmail.com Backpatch-through: 14
This commit is contained in:
@ -61,6 +61,7 @@
|
||||
#include "utils/builtins.h"
|
||||
#include "utils/fmgroids.h"
|
||||
#include "utils/guc.h"
|
||||
#include "utils/injection_point.h"
|
||||
#include "utils/inval.h"
|
||||
#include "utils/lsyscache.h"
|
||||
#include "utils/memutils.h"
|
||||
@ -3782,8 +3783,16 @@ ReindexRelationConcurrently(const ReindexStmt *stmt, Oid relationOid, const Rein
|
||||
RestrictSearchPath();
|
||||
|
||||
/* 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);
|
||||
|
||||
#ifdef USE_INJECTION_POINTS
|
||||
if (idx->safe)
|
||||
INJECTION_POINT("reindex-conc-index-safe");
|
||||
else
|
||||
INJECTION_POINT("reindex-conc-index-not-safe");
|
||||
#endif
|
||||
|
||||
idx->tableId = RelationGetRelid(heapRel);
|
||||
idx->amId = indexRel->rd_rel->relam;
|
||||
|
||||
|
Reference in New Issue
Block a user