Change reindex command to work properly with gist/hash/rtree

Hiroshi Inoue · Hiroshi Inoue · commit a50aaa728973 · 2000-03-01T05:39:24.000Z
diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c
@@ -6,7 +6,7 @@
  *
  *
  * 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 $
  *
  *-------------------------------------------------------------------------
  */
@@ -284,12 +284,13 @@ gistbuild(Relation heap,
 	{
 		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;
diff --git a/src/backend/access/hash/hash.c b/src/backend/access/hash/hash.c
@@ -8,7 +8,7 @@
  *
  *
  * 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.
@@ -242,12 +242,13 @@ hashbuild(Relation heap,
 	{
 		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;
diff --git a/src/backend/access/rtree/rtree.c b/src/backend/access/rtree/rtree.c
@@ -8,7 +8,7 @@
  *
  *
  * 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 $
  *
  *-------------------------------------------------------------------------
  */
@@ -261,12 +261,13 @@ rtbuild(Relation heap,
 	{
 		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;
diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
@@ -8,7 +8,7 @@
  *
  *
  * 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
@@ -2057,7 +2057,6 @@ reindex_index(Oid indexId, bool force)
 	Oid		heapId, procId, accessMethodId;
 	Node		*oldPred = NULL;
 	PredInfo	*predInfo;
-	List		*cnfPred = NULL;
 	AttrNumber	*attributeNumberA;
 	FuncIndexInfo	fInfo, *funcInfo = NULL;
 	int		i, numberOfAttributes;
@@ -2096,8 +2095,8 @@ reindex_index(Oid indexId, bool force)
 		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));
@@ -2247,5 +2246,5 @@ reindex_relation(Oid relid, bool force)
 		setRelhasindexInplace(relid, true, false);
 	}
 	SetReindexProcessing(old);
-	return true;
+	return reindexed;
 }

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`*`
`8`	`8`	`* IDENTIFICATION`
`9`		`- * $Header: /cvsroot/pgsql/src/backend/access/gist/gist.c,v 1.50 2000/01/19 23:54:46 tgl Exp $`
	`9`	`+ * $Header: /cvsroot/pgsql/src/backend/access/gist/gist.c,v 1.51 2000/03/01 05:39:20 inoue Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -284,12 +284,13 @@ gistbuild(Relation heap,`
`284`	`284`	`{`
`285`	`285`	`Oid hrelid = RelationGetRelid(heap);`
`286`	`286`	`Oid irelid = RelationGetRelid(index);`
	`287`	`+ bool inplace = IsReindexProcessing();`
`287`	`288`
`288`	`289`	`heap_close(heap, NoLock);`
`289`	`290`	`index_close(index);`
`290`		`- UpdateStats(hrelid, nh, true);`
`291`		`- UpdateStats(irelid, ni, false);`
`292`		`- if (oldPred != NULL)`
	`291`	`+ UpdateStats(hrelid, nh, inplace);`
	`292`	`+ UpdateStats(irelid, ni, inplace);`
	`293`	`+ if (oldPred != NULL && !inplace)`
`293`	`294`	`{`
`294`	`295`	`if (ni == nh)`
`295`	`296`	`pred = NULL;`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.35 2000/01/26 05:55:55 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.36 2000/03/01 05:39:22 inoue Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`* This file contains only the public interface routines.`
`@@ -242,12 +242,13 @@ hashbuild(Relation heap,`
`242`	`242`	`{`
`243`	`243`	`Oid hrelid = RelationGetRelid(heap);`
`244`	`244`	`Oid irelid = RelationGetRelid(index);`
	`245`	`+ bool inplace = IsReindexProcessing();`
`245`	`246`
`246`	`247`	`heap_close(heap, NoLock);`
`247`	`248`	`index_close(index);`
`248`		`- UpdateStats(hrelid, nhtups, true);`
`249`		`- UpdateStats(irelid, nitups, false);`
`250`		`- if (oldPred != NULL)`
	`249`	`+ UpdateStats(hrelid, nhtups, inplace);`
	`250`	`+ UpdateStats(irelid, nitups, inplace);`
	`251`	`+ if (oldPred != NULL && !inplace)`
`251`	`252`	`{`
`252`	`253`	`if (nitups == nhtups)`
`253`	`254`	`pred = NULL;`