NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitdb35bf5

committed

Fix tuple counting in SP-GiST index build.

Count the number of tuples in the index honestly, instead of assumingthat it's the same as the number of tuples in the heap. (It might bedifferent if the index is partial.)Back-patch to all supported versions.Tomas VondraDiscussion:https://postgr.es/m/3b3d8eac-c709-0d25-088e-b98339a1b28a@2ndquadrant.com

1 parentdf90401 commitdb35bf5Copy full SHA for db35bf5

File tree

1 file changed

-1

lines changed

src/backend/access/spgist
- spginsert.c

1 file changed

-1

lines changed

`‎src/backend/access/spgist/spginsert.c`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@`
`31`	`31`	`typedefstruct`
`32`	`32`	`{`
`33`	`33`	`SpGistStatespgstate;/* SPGiST's working state */`
	`34`	`+int64indtuples;/* total number of tuples indexed */`
`34`	`35`	`MemoryContexttmpCtx;/* per-tuple temporary context */`
`35`	`36`	`}SpGistBuildState;`
`36`	`37`
`@@ -58,6 +59,9 @@ spgistBuildCallback(Relation index, HeapTuple htup, Datum *values,`
`58`	`59`	`MemoryContextReset(buildstate->tmpCtx);`
`59`	`60`	`}`
`60`	`61`
	`62`	`+/* Update total tuple count */`
	`63`	`+buildstate->indtuples+=1;`
	`64`	`+`
`61`	`65`	`MemoryContextSwitchTo(oldCtx);`
`62`	`66`	`MemoryContextReset(buildstate->tmpCtx);`
`63`	`67`	`}`
`@@ -131,6 +135,7 @@ spgbuild(Relation heap, Relation index, IndexInfo *indexInfo)`
`131`	`135`	`*/`
`132`	`136`	`initSpGistState(&buildstate.spgstate,index);`
`133`	`137`	`buildstate.spgstate.isBuild= true;`
	`138`	`+buildstate.indtuples=0;`
`134`	`139`
`135`	`140`	`buildstate.tmpCtx=AllocSetContextCreate(CurrentMemoryContext,`
`136`	`141`	`"SP-GiST build temporary context",`
`@@ -144,7 +149,8 @@ spgbuild(Relation heap, Relation index, IndexInfo *indexInfo)`
`144`	`149`	`SpGistUpdateMetaPage(index);`
`145`	`150`
`146`	`151`	`result= (IndexBuildResult*)palloc0(sizeof(IndexBuildResult));`
`147`		`-result->heap_tuples=result->index_tuples=reltuples;`
	`152`	`+result->heap_tuples=reltuples;`
	`153`	`+result->index_tuples=buildstate.indtuples;`
`148`	`154`
`149`	`155`	`returnresult;`
`150`	`156`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitdb35bf5

File tree

1 file changed

1 file changed

`‎src/backend/access/spgist/spginsert.c`

0 commit comments