Commita50aaa7

Hiroshi Inoue

committed

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

1 parentab3dc66 commita50aaa7Copy full SHA for a50aaa7

File tree

+19

-17

lines changed

+19

-17

lines changed

Lines changed: 5 additions & 4 deletions

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`	`Oidhrelid=RelationGetRelid(heap);`
`286`	`286`	`Oidirelid=RelationGetRelid(index);`
	`287`	`+boolinplace=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;`

Lines changed: 5 additions & 4 deletions

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`	`Oidhrelid=RelationGetRelid(heap);`
`244`	`244`	`Oidirelid=RelationGetRelid(index);`
	`245`	`+boolinplace=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;`

Lines changed: 5 additions & 4 deletions

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/rtree/Attic/rtree.c,v 1.43 2000/01/26 05:56:00 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.44 2000/03/01 05:39:23 inoue Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -261,12 +261,13 @@ rtbuild(Relation heap,`
`261`	`261`	`{`
`262`	`262`	`Oidhrelid=RelationGetRelid(heap);`
`263`	`263`	`Oidirelid=RelationGetRelid(index);`
	`264`	`+boolinplace=IsReindexProcessing();`
`264`	`265`
`265`	`266`	`heap_close(heap,NoLock);`
`266`	`267`	`index_close(index);`
`267`		`-UpdateStats(hrelid,nh,true);`
`268`		`-UpdateStats(irelid,ni,false);`
`269`		`-if (oldPred!=NULL)`
	`268`	`+UpdateStats(hrelid,nh,inplace);`
	`269`	`+UpdateStats(irelid,ni,inplace);`
	`270`	`+if (oldPred!=NULL&& !inplace)`
`270`	`271`	`{`
`271`	`272`	`if (ni==nh)`
`272`	`273`	`pred=NULL;`

Lines changed: 4 additions & 5 deletions

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/catalog/index.c,v 1.106 2000/02/25 02:58:47 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.107 2000/03/01 05:39:24 inoue Exp $`
`12`	`12`	`*`
`13`	`13`	`*`
`14`	`14`	`* INTERFACE ROUTINES`
`@@ -2057,7 +2057,6 @@ reindex_index(Oid indexId, bool force)`
`2057`	`2057`	`OidheapId,procId,accessMethodId;`
`2058`	`2058`	`Node*oldPred=NULL;`
`2059`	`2059`	`PredInfo*predInfo;`
`2060`		`-List*cnfPred=NULL;`
`2061`	`2060`	`AttrNumber*attributeNumberA;`
`2062`	`2061`	`FuncIndexInfofInfo,*funcInfo=NULL;`
`2063`	`2062`	`inti,numberOfAttributes;`
`@@ -2096,8 +2095,8 @@ reindex_index(Oid indexId, bool force)`
`2096`	`2095`	`pfree(predString);`
`2097`	`2096`	`}`
`2098`	`2097`	`predInfo= (PredInfo*)palloc(sizeof(PredInfo));`
`2099`		`-predInfo->pred= (Node*)cnfPred;`
`2100`		`-predInfo->oldPred=oldPred;`
	`2098`	`+predInfo->pred= (Node*)oldPred;`
	`2099`	`+predInfo->oldPred=NULL;`
`2101`	`2100`
`2102`	`2101`	`/* Assign Index keys to attributes array */`
`2103`	`2102`	`attributeNumberA= (AttrNumber)palloc(numberOfAttributessizeof(AttrNumber));`
`@@ -2247,5 +2246,5 @@ reindex_relation(Oid relid, bool force)`
`2247`	`2246`	`setRelhasindexInplace(relid, true, false);`
`2248`	`2247`	`}`
`2249`	`2248`	`SetReindexProcessing(old);`
`2250`		`-returntrue;`
	`2249`	`+returnreindexed;`
`2251`	`2250`	`}`

Comments

(0)