*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/gist/gist.c,v 1.50 2000/01/19 23:54:46 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/gist/gist.c,v 1.51 2000/03/01 05:39:20 inoue Exp $
*
*-------------------------------------------------------------------------
*/
{
Oid hrelid = RelationGetRelid(heap);
Oid irelid = RelationGetRelid(index);
+ bool inplace = IsReindexProcessing();
heap_close(heap, NoLock);
index_close(index);
- UpdateStats(hrelid, nh, true);
- UpdateStats(irelid, ni, false);
- if (oldPred != NULL)
+ UpdateStats(hrelid, nh, inplace);
+ UpdateStats(irelid, ni, inplace);
+ if (oldPred != NULL && !inplace)
{
if (ni == nh)
pred = NULL;
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.35 2000/01/26 05:55:55 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.36 2000/03/01 05:39:22 inoue Exp $
*
* NOTES
* This file contains only the public interface routines.
{
Oid hrelid = RelationGetRelid(heap);
Oid irelid = RelationGetRelid(index);
+ bool inplace = IsReindexProcessing();
heap_close(heap, NoLock);
index_close(index);
- UpdateStats(hrelid, nhtups, true);
- UpdateStats(irelid, nitups, false);
- if (oldPred != NULL)
+ UpdateStats(hrelid, nhtups, inplace);
+ UpdateStats(irelid, nitups, inplace);
+ if (oldPred != NULL && !inplace)
{
if (nitups == nhtups)
pred = NULL;
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.43 2000/01/26 05:56:00 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.44 2000/03/01 05:39:23 inoue Exp $
*
*-------------------------------------------------------------------------
*/
{
Oid hrelid = RelationGetRelid(heap);
Oid irelid = RelationGetRelid(index);
+ bool inplace = IsReindexProcessing();
heap_close(heap, NoLock);
index_close(index);
- UpdateStats(hrelid, nh, true);
- UpdateStats(irelid, ni, false);
- if (oldPred != NULL)
+ UpdateStats(hrelid, nh, inplace);
+ UpdateStats(irelid, ni, inplace);
+ if (oldPred != NULL && !inplace)
{
if (ni == nh)
pred = NULL;
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.106 2000/02/25 02:58:47 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.107 2000/03/01 05:39:24 inoue Exp $
*
*
* INTERFACE ROUTINES
Oid heapId, procId, accessMethodId;
Node *oldPred = NULL;
PredInfo *predInfo;
- List *cnfPred = NULL;
AttrNumber *attributeNumberA;
FuncIndexInfo fInfo, *funcInfo = NULL;
int i, numberOfAttributes;
pfree(predString);
}
predInfo = (PredInfo *) palloc(sizeof(PredInfo));
- predInfo->pred = (Node *) cnfPred;
- predInfo->oldPred = oldPred;
+ predInfo->pred = (Node *) oldPred;
+ predInfo->oldPred = NULL;
/* Assign Index keys to attributes array */
attributeNumberA = (AttrNumber *) palloc(numberOfAttributes * sizeof(AttrNumber));
setRelhasindexInplace(relid, true, false);
}
SetReindexProcessing(old);
- return true;
+ return reindexed;
}