git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c

index d1889e16c2c593184ad19bd06540eae2e039619a..86ff1f7929e99f0c5081ad9849d30e4828045253 100644 (file)

--- a/src/backend/catalog/index.c

+++ b/src/backend/catalog/index.c

*

*

* IDENTIFICATION

- * $PostgreSQL: pgsql/src/backend/catalog/index.c,v 1.313 2009年03月24日 20:17:12 tgl Exp $

+ * $PostgreSQL: pgsql/src/backend/catalog/index.c,v 1.314 2009年03月27日 15:57:11 tgl Exp $

*

*

* INTERFACE ROUTINES

pg_index;

Oid heapId;

bool inplace;

+ IndexInfo *indexInfo;

HeapTuple indexTuple;

Form_pg_index indexForm;

PG_TRY();

{

- IndexInfo *indexInfo;

-

/* Suppress use of the target index while rebuilding it */

SetReindexProcessing(heapId, indexId);

* If the index is marked invalid or not ready (ie, it's from a failed

* CREATE INDEX CONCURRENTLY), we can now mark it valid. This allows

* REINDEX to be used to clean up in such cases.

+ *

+ * We can also reset indcheckxmin, because we have now done a

+ * non-concurrent index build, *except* in the case where index_build

+ * found some still-broken HOT chains.

*/

pg_index = heap_open(IndexRelationId, RowExclusiveLock);

elog(ERROR, "cache lookup failed for index %u", indexId);

indexForm = (Form_pg_index) GETSTRUCT(indexTuple);

- if (!indexForm->indisvalid || !indexForm->indisready)

+ if (!indexForm->indisvalid || !indexForm->indisready ||

+ (indexForm->indcheckxmin && !indexInfo->ii_BrokenHotChain))

{

indexForm->indisvalid = true;

indexForm->indisready = true;

+ if (!indexInfo->ii_BrokenHotChain)

+ indexForm->indcheckxmin = false;

simple_heap_update(pg_index, &indexTuple->t_self, indexTuple);

CatalogUpdateIndexes(pg_index, indexTuple);

}