Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commite24a815

Browse files
committed
Fix confusing NOTICE text in REINDEX CONCURRENTLY
When performing REINDEX TABLE CONCURRENTLY, if all of the table's indexescould not be reindexed, a NOTICE message claimed that the table had noindexes. This was confusing, so let's change the NOTICE text to somethingless confusing.In passing, also mention in the comment before ReindexRelationConcurrentlythat materialized views are supported too and also explain what the returnvalue of the function means.Author: Ashwin AgrawalReviewed-by: Michael PaquierDiscussion:https://postgr.es/m/CALfoeithHvi13p_VyR8kt9o6Pa7Z=Smi6Nfc2anHnQx5Lj8bTQ@mail.gmail.com
1 parent56b3b38 commite24a815

File tree

2 files changed

+30
-15
lines changed

2 files changed

+30
-15
lines changed

‎src/backend/commands/indexcmds.c

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2444,17 +2444,25 @@ ReindexTable(RangeVar *relation, int options, bool concurrent)
24442444
RangeVarCallbackOwnsTable,NULL);
24452445

24462446
if (concurrent)
2447+
{
24472448
result=ReindexRelationConcurrently(heapOid,options);
2449+
2450+
if (!result)
2451+
ereport(NOTICE,
2452+
(errmsg("table \"%s\" has no indexes that can be reindexed concurrently",
2453+
relation->relname)));
2454+
}
24482455
else
2456+
{
24492457
result=reindex_relation(heapOid,
24502458
REINDEX_REL_PROCESS_TOAST |
24512459
REINDEX_REL_CHECK_CONSTRAINTS,
24522460
options);
2453-
2454-
if (!result)
2455-
ereport(NOTICE,
2456-
(errmsg("table \"%s\" has no indexes",
2457-
relation->relname)));
2461+
if (!result)
2462+
ereport(NOTICE,
2463+
(errmsg("table \"%s\" has no indexes to reindex",
2464+
relation->relname)));
2465+
}
24582466

24592467
returnheapOid;
24602468
}
@@ -2636,19 +2644,20 @@ ReindexMultipleTables(const char *objectName, ReindexObjectType objectKind,
26362644
foreach(l,relids)
26372645
{
26382646
Oidrelid=lfirst_oid(l);
2639-
boolresult;
26402647

26412648
StartTransactionCommand();
26422649
/* functions in indexes may want a snapshot set */
26432650
PushActiveSnapshot(GetTransactionSnapshot());
26442651

26452652
if (concurrent)
26462653
{
2647-
result=ReindexRelationConcurrently(relid,options);
2654+
(void)ReindexRelationConcurrently(relid,options);
26482655
/* ReindexRelationConcurrently() does the verbose output */
26492656
}
26502657
else
26512658
{
2659+
boolresult;
2660+
26522661
result=reindex_relation(relid,
26532662
REINDEX_REL_PROCESS_TOAST |
26542663
REINDEX_REL_CHECK_CONSTRAINTS,
@@ -2675,13 +2684,19 @@ ReindexMultipleTables(const char *objectName, ReindexObjectType objectKind,
26752684
* ReindexRelationConcurrently - process REINDEX CONCURRENTLY for given
26762685
* relation OID
26772686
*
2678-
* The relation can be either an index or a table. If it is a table, all its
2679-
* valid indexes will be rebuilt, including its associated toast table
2680-
* indexes. If it is an index, this index itself will be rebuilt.
2687+
* 'relationOid' can either belong to an index, a table or a materialized
2688+
* view. For tables and materialized views, all its indexes will be rebuilt,
2689+
* excluding invalid indexes and any indexes used in exclusion constraints,
2690+
* but including its associated toast table indexes. For indexes, the index
2691+
* itself will be rebuilt. If 'relationOid' belongs to a partitioned table
2692+
* then we issue a warning to mention these are not yet supported.
26812693
*
26822694
* The locks taken on parent tables and involved indexes are kept until the
26832695
* transaction is committed, at which point a session lock is taken on each
26842696
* relation. Both of these protect against concurrent schema changes.
2697+
*
2698+
* Returns true if any indexes have been rebuilt (including toast table's
2699+
* indexes, when relevant), otherwise returns false.
26852700
*/
26862701
staticbool
26872702
ReindexRelationConcurrently(OidrelationOid,intoptions)

‎src/test/regress/expected/create_index.out

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1944,9 +1944,9 @@ DROP TABLE reindex_verbose;
19441944
CREATE TABLE concur_reindex_tab (c1 int);
19451945
-- REINDEX
19461946
REINDEX TABLE concur_reindex_tab; -- notice
1947-
NOTICE: table "concur_reindex_tab" has no indexes
1947+
NOTICE: table "concur_reindex_tab" has no indexes to reindex
19481948
REINDEX TABLE CONCURRENTLY concur_reindex_tab; -- notice
1949-
NOTICE: table "concur_reindex_tab" has no indexes
1949+
NOTICE: table "concur_reindex_tab" has no indexes that can be reindexed concurrently
19501950
ALTER TABLE concur_reindex_tab ADD COLUMN c2 text; -- add toast index
19511951
-- Normal index with integer column
19521952
CREATE UNIQUE INDEX concur_reindex_ind1 ON concur_reindex_tab(c1);
@@ -2043,10 +2043,10 @@ ERROR: REINDEX is not yet implemented for partitioned indexes
20432043
-- REINDEX is a no-op for partitioned tables
20442044
REINDEX TABLE concur_reindex_part_10;
20452045
WARNING: REINDEX of partitioned tables is not yet implemented, skipping "concur_reindex_part_10"
2046-
NOTICE: table "concur_reindex_part_10" has no indexes
2046+
NOTICE: table "concur_reindex_part_10" has no indexes to reindex
20472047
REINDEX TABLE CONCURRENTLY concur_reindex_part_10;
20482048
WARNING: REINDEX of partitioned tables is not yet implemented, skipping "concur_reindex_part_10"
2049-
NOTICE: table "concur_reindex_part_10" has no indexes
2049+
NOTICE: table "concur_reindex_part_10" has no indexes that can be reindexed concurrently
20502050
SELECT relid, parentrelid, level FROM pg_partition_tree('concur_reindex_part_index')
20512051
ORDER BY relid, level;
20522052
relid | parentrelid | level
@@ -2150,7 +2150,7 @@ DELETE FROM concur_reindex_tab4 WHERE c1 = 1;
21502150
-- The invalid index is not processed when running REINDEX TABLE.
21512151
REINDEX TABLE CONCURRENTLY concur_reindex_tab4;
21522152
WARNING: cannot reindex invalid index "public.concur_reindex_ind5" concurrently, skipping
2153-
NOTICE: table "concur_reindex_tab4" has no indexes
2153+
NOTICE: table "concur_reindex_tab4" has no indexes that can be reindexed concurrently
21542154
\d concur_reindex_tab4
21552155
Table "public.concur_reindex_tab4"
21562156
Column | Type | Collation | Nullable | Default

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp