From dc8119abe180cc14b0720c4de79495de4c62bf12 Mon Sep 17 00:00:00 2001 From: Ashwin Agrawal Date: Fri, 24 May 2019 16:34:48 -0700 Subject: [PATCH v1] Avoid confusing error message for REINDEX CONCURRENTLY. REINDEX CONCURRENTLY skips reindexing exclusion or invalid indexes. But in such cases it incorrectly reported table has no indexes. Make the behavior consistent with not concurrently REINDEX command to emit the notice only if the table has no indexes. --- src/backend/commands/indexcmds.c | 13 ++++++++----- src/test/regress/expected/create_index.out | 1 - 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c index 40ea629ffe7..402440ebad0 100644 --- a/src/backend/commands/indexcmds.c +++ b/src/backend/commands/indexcmds.c @@ -2630,7 +2630,6 @@ ReindexMultipleTables(const char *objectName, ReindexObjectType objectKind, foreach(l, relids) { Oid relid = lfirst_oid(l); - bool result; StartTransactionCommand(); /* functions in indexes may want a snapshot set */ @@ -2638,11 +2637,12 @@ ReindexMultipleTables(const char *objectName, ReindexObjectType objectKind, if (concurrent) { - result = ReindexRelationConcurrently(relid, options); + ReindexRelationConcurrently(relid, options); /* ReindexRelationConcurrently() does the verbose output */ } else { + bool result; result = reindex_relation(relid, REINDEX_REL_PROCESS_TOAST | REINDEX_REL_CHECK_CONSTRAINTS, @@ -2656,7 +2656,6 @@ ReindexMultipleTables(const char *objectName, ReindexObjectType objectKind, PopActiveSnapshot(); } - CommitTransactionCommand(); } StartTransactionCommand(); @@ -2693,6 +2692,7 @@ ReindexRelationConcurrently(Oid relationOid, int options) char *relationName = NULL; char *relationNamespace = NULL; PGRUsage ru0; + bool rel_has_index = false; /* * Create a memory context that will survive forced transaction commits we @@ -2759,6 +2759,7 @@ ReindexRelationConcurrently(Oid relationOid, int options) Relation indexRelation = index_open(cellOid, ShareUpdateExclusiveLock); + rel_has_index = true; if (!indexRelation->rd_index->indisvalid) ereport(WARNING, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), @@ -2805,6 +2806,7 @@ ReindexRelationConcurrently(Oid relationOid, int options) Relation indexRelation = index_open(cellOid, ShareUpdateExclusiveLock); + rel_has_index = true; if (!indexRelation->rd_index->indisvalid) ereport(WARNING, (errcode(ERRCODE_INDEX_CORRUPTED), @@ -2843,6 +2845,7 @@ ReindexRelationConcurrently(Oid relationOid, int options) (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), errmsg("cannot reindex a system catalog concurrently"))); + rel_has_index = true; /* Save the list of relation OIDs in private context */ oldcontext = MemoryContextSwitchTo(private_context); @@ -2873,11 +2876,11 @@ ReindexRelationConcurrently(Oid relationOid, int options) break; } - /* Definitely no indexes, so leave */ + /* Definitely no indexes to rebuild, so leave */ if (indexIds == NIL) { PopActiveSnapshot(); - return false; + return rel_has_index; } Assert(heapRelationIds != NIL); diff --git a/src/test/regress/expected/create_index.out b/src/test/regress/expected/create_index.out index c8bc6be0613..9a9401c280e 100644 --- a/src/test/regress/expected/create_index.out +++ b/src/test/regress/expected/create_index.out @@ -2150,7 +2150,6 @@ DELETE FROM concur_reindex_tab4 WHERE c1 = 1; -- The invalid index is not processed when running REINDEX TABLE. REINDEX TABLE CONCURRENTLY concur_reindex_tab4; WARNING: cannot reindex invalid index "public.concur_reindex_ind5" concurrently, skipping -NOTICE: table "concur_reindex_tab4" has no indexes \d concur_reindex_tab4 Table "public.concur_reindex_tab4" Column | Type | Collation | Nullable | Default -- 2.19.1