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

Commit28847ae

Browse files
committed
Seems like a bad idea that REINDEX TABLE supports (or thinks it does)
reindexing system tables without ignoring system indexes, when theother two varieties of REINDEX disallow it. Make all three act the same,and simplify downstream code accordingly.
1 parent580e08a commit28847ae

File tree

2 files changed

+63
-91
lines changed

2 files changed

+63
-91
lines changed

‎src/backend/catalog/index.c‎

Lines changed: 35 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.214 2003/08/04 02:39:58 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.215 2003/09/19 19:57:42 tgl Exp $
1212
*
1313
*
1414
* INTERFACE ROUTINES
@@ -76,7 +76,6 @@ static void UpdateIndexRelation(Oid indexoid, Oid heapoid,
7676
Oid*classOids,
7777
boolprimary);
7878
staticOidIndexGetRelation(OidindexId);
79-
staticboolactivate_index(OidindexId,boolactivate,boolinplace);
8079

8180

8281
staticboolreindexing= false;
@@ -1690,23 +1689,8 @@ IndexGetRelation(Oid indexId)
16901689
returnresult;
16911690
}
16921691

1693-
/* ---------------------------------
1694-
* activate_index -- activate/deactivate the specified index.
1695-
*Note that currently PostgreSQL doesn't hold the
1696-
*status per index
1697-
* ---------------------------------
1698-
*/
1699-
staticbool
1700-
activate_index(OidindexId,boolactivate,boolinplace)
1701-
{
1702-
if (!activate)/* Currently does nothing */
1703-
return true;
1704-
returnreindex_index(indexId, false,inplace);
1705-
}
1706-
1707-
/* --------------------------------
1692+
/*
17081693
* reindex_index - This routine is used to recreate an index
1709-
* --------------------------------
17101694
*/
17111695
bool
17121696
reindex_index(OidindexId,boolforce,boolinplace)
@@ -1745,22 +1729,24 @@ reindex_index(Oid indexId, bool force, bool inplace)
17451729
* the relcache can't cope with changing its relfilenode.
17461730
*
17471731
* In either of these cases, we are definitely processing a system index,
1748-
* so we'd better be ignoring system indexes.
1732+
* so we'd better be ignoring system indexes. (These checks are just
1733+
* for paranoia's sake --- upstream code should have disallowed reindex
1734+
* in such cases already.)
17491735
*/
17501736
if (iRel->rd_rel->relisshared)
17511737
{
17521738
if (!IsIgnoringSystemIndexes())
1753-
ereport(ERROR,
1754-
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
1755-
errmsg("the target relation %u is shared",indexId)));
1739+
elog(ERROR,
1740+
"must be ignoring system indexes to reindex shared index %u",
1741+
indexId);
17561742
inplace= true;
17571743
}
17581744
if (iRel->rd_isnailed)
17591745
{
17601746
if (!IsIgnoringSystemIndexes())
1761-
ereport(ERROR,
1762-
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
1763-
errmsg("the target relation %u is nailed",indexId)));
1747+
elog(ERROR,
1748+
"must be ignoring system indexes to reindex nailed index %u",
1749+
indexId);
17641750
inplace= true;
17651751
}
17661752

@@ -1801,13 +1787,12 @@ reindex_index(Oid indexId, bool force, bool inplace)
18011787
return true;
18021788
}
18031789

1790+
#ifdefNOT_USED
18041791
/*
1805-
* ----------------------------
18061792
* activate_indexes_of_a_table
18071793
*activate/deactivate indexes of the specified table.
18081794
*
18091795
* Caller must already hold exclusive lock on the table.
1810-
* ----------------------------
18111796
*/
18121797
bool
18131798
activate_indexes_of_a_table(Relationheaprel,boolactivate)
@@ -1829,11 +1814,11 @@ activate_indexes_of_a_table(Relation heaprel, bool activate)
18291814
}
18301815
return true;
18311816
}
1817+
#endif/* NOT_USED */
18321818

1833-
/* --------------------------------
1834-
* reindex_relation - This routine is used to recreate indexes
1819+
/*
1820+
* reindex_relation - This routine is used to recreateallindexes
18351821
* of a relation.
1836-
* --------------------------------
18371822
*/
18381823
bool
18391824
reindex_relation(Oidrelid,boolforce)
@@ -1844,11 +1829,10 @@ reindex_relation(Oid relid, bool force)
18441829
HeapTupleindexTuple;
18451830
boolold,
18461831
reindexed;
1847-
booldeactivate_needed,
1848-
overwrite;
1832+
booloverwrite;
18491833
Relationrel;
18501834

1851-
overwrite=deactivate_needed=false;
1835+
overwrite= false;
18521836

18531837
/*
18541838
* Ensure to hold an exclusive lock throughout the transaction. The
@@ -1858,62 +1842,50 @@ reindex_relation(Oid relid, bool force)
18581842
rel=heap_open(relid,AccessExclusiveLock);
18591843

18601844
/*
1861-
*ignore theindexesof the target system relation while processing
1862-
*reindex.
1845+
*Should be ignoring systemindexesif we are reindexing a system table.
1846+
*(This is elog not ereport because caller should have caught it.)
18631847
*/
18641848
if (!IsIgnoringSystemIndexes()&&
18651849
IsSystemRelation(rel)&& !IsToastRelation(rel))
1866-
deactivate_needed= true;
1850+
elog(ERROR,
1851+
"must be ignoring system indexes to reindex system table %u",
1852+
relid);
18671853

18681854
/*
18691855
* Shared system indexes must be overwritten because it's impossible
18701856
* to update pg_class tuples of all databases.
18711857
*/
18721858
if (rel->rd_rel->relisshared)
18731859
{
1874-
if (IsIgnoringSystemIndexes())
1875-
{
1876-
overwrite= true;
1877-
deactivate_needed= true;
1878-
}
1879-
else
1880-
ereport(ERROR,
1881-
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
1882-
errmsg("the target relation %u is shared",relid)));
1860+
if (!IsIgnoringSystemIndexes())/* shouldn't happen */
1861+
elog(ERROR,
1862+
"must be ignoring system indexes to reindex shared table %u",
1863+
relid);
1864+
overwrite= true;
18831865
}
18841866

18851867
old=SetReindexProcessing(true);
18861868

1887-
if (deactivate_needed)
1888-
{
1889-
if (IndexesAreActive(rel))
1890-
{
1891-
if (!force)
1892-
{
1893-
SetReindexProcessing(old);
1894-
heap_close(rel,NoLock);
1895-
return false;
1896-
}
1897-
activate_indexes_of_a_table(rel, false);
1898-
CommandCounterIncrement();
1899-
}
1900-
}
1901-
19021869
/*
19031870
* Continue to hold the lock.
19041871
*/
19051872
heap_close(rel,NoLock);
19061873

1874+
/*
1875+
* Find table's indexes by looking in pg_index (not trusting indexes...)
1876+
*/
19071877
indexRelation=heap_openr(IndexRelationName,AccessShareLock);
1908-
ScanKeyEntryInitialize(&entry,0,Anum_pg_index_indrelid,
1909-
F_OIDEQ,ObjectIdGetDatum(relid));
1878+
ScanKeyEntryInitialize(&entry,0,
1879+
Anum_pg_index_indrelid,
1880+
F_OIDEQ,
1881+
ObjectIdGetDatum(relid));
19101882
scan=heap_beginscan(indexRelation,SnapshotNow,1,&entry);
19111883
reindexed= false;
19121884
while ((indexTuple=heap_getnext(scan,ForwardScanDirection))!=NULL)
19131885
{
19141886
Form_pg_indexindex= (Form_pg_index)GETSTRUCT(indexTuple);
19151887

1916-
if (activate_index(index->indexrelid,true,overwrite))
1888+
if (reindex_index(index->indexrelid,false,overwrite))
19171889
reindexed= true;
19181890
else
19191891
{
@@ -1923,31 +1895,7 @@ reindex_relation(Oid relid, bool force)
19231895
}
19241896
heap_endscan(scan);
19251897
heap_close(indexRelation,AccessShareLock);
1926-
if (reindexed)
1927-
{
1928-
/*
1929-
* Ok,we could use the reindexed indexes of the target system
1930-
* relation now.
1931-
*/
1932-
if (deactivate_needed)
1933-
{
1934-
if (!overwrite&&relid==RelOid_pg_class)
1935-
{
1936-
/*
1937-
* For pg_class, relhasindex should be set to true here in
1938-
* place.
1939-
*/
1940-
setRelhasindex(relid, true, false,InvalidOid);
1941-
CommandCounterIncrement();
19421898

1943-
/*
1944-
* However the following setRelhasindex() is needed to
1945-
* keep consistency with WAL.
1946-
*/
1947-
}
1948-
setRelhasindex(relid, true, false,InvalidOid);
1949-
}
1950-
}
19511899
SetReindexProcessing(old);
19521900

19531901
returnreindexed;

‎src/backend/commands/indexcmds.c‎

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.106 2003/08/17 19:58:04 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.107 2003/09/19 19:57:42 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -658,17 +658,41 @@ void
658658
ReindexTable(RangeVar*relation,boolforce)
659659
{
660660
OidheapOid;
661-
charrelkind;
661+
HeapTupletuple;
662662

663663
heapOid=RangeVarGetRelid(relation, false);
664-
relkind=get_rel_relkind(heapOid);
664+
tuple=SearchSysCache(RELOID,
665+
ObjectIdGetDatum(heapOid),
666+
0,0,0);
667+
if (!HeapTupleIsValid(tuple))/* shouldn't happen */
668+
elog(ERROR,"cache lookup failed for relation %u",heapOid);
665669

666-
if (relkind!=RELKIND_RELATION&&relkind!=RELKIND_TOASTVALUE)
670+
if (((Form_pg_class)GETSTRUCT(tuple))->relkind!=RELKIND_RELATION&&
671+
((Form_pg_class)GETSTRUCT(tuple))->relkind!=RELKIND_TOASTVALUE)
667672
ereport(ERROR,
668673
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
669674
errmsg("relation \"%s\" is not a table",
670675
relation->relname)));
671676

677+
if (IsSystemClass((Form_pg_class)GETSTRUCT(tuple))&&
678+
!IsToastClass((Form_pg_class)GETSTRUCT(tuple)))
679+
{
680+
if (!allowSystemTableMods)
681+
ereport(ERROR,
682+
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
683+
errmsg("permission denied: \"%s\" is a system table",
684+
relation->relname),
685+
errhint("Do REINDEX in standalone postgres with -O -P options.")));
686+
if (!IsIgnoringSystemIndexes())
687+
ereport(ERROR,
688+
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
689+
errmsg("permission denied: \"%s\" is a system table",
690+
relation->relname),
691+
errhint("Do REINDEX in standalone postgres with -P -O options.")));
692+
}
693+
694+
ReleaseSysCache(tuple);
695+
672696
/*
673697
* In-place REINDEX within a transaction block is dangerous, because
674698
* if the transaction is later rolled back we have no way to undo

0 commit comments

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