NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit94f565d

committed

Fix erroneous range-union logic for varlena types in contrib/btree_gist.

gbt_var_bin_union() failed to do the right thing when the existing rangeneeded to be widened at both ends rather than just one end. This couldresult in an invalid index in which keys that are present would not befound by searches, because the searches would not think they need todescend to the relevant leaf pages. This error affected all the varlenadatatypes supported by btree_gist (text, bytea, bit, numeric).Per investigation of a trouble report from Tomas Vondra. (There is alsoan issue in gbt_var_penalty(), but that should only result in inefficiencynot wrong answers. I'm committing this separately so that we have a gitstate in which it can be tested that bad penalty results don't produceinvalid indexes.) Back-patch to all supported branches.

1 parent166d534 commit94f565dCopy full SHA for 94f565d

File tree

1 file changed

+11

-10

lines changed

contrib/btree_gist
- btree_utils_var.c

1 file changed

+11

-10

lines changed

`‎contrib/btree_gist/btree_utils_var.c`

Lines changed: 11 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -225,39 +225,40 @@ void`
`225`	`225`	`gbt_var_bin_union(Datumu,GBT_VARKEYe,Oidcollation,`
`226`	`226`	`constgbtree_vinfo*tinfo)`
`227`	`227`	`{`
`228`		`-GBT_VARKEY*nk=NULL;`
`229`		`-GBT_VARKEY*tmp=NULL;`
`230`		`-GBT_VARKEY_Rnr;`
`231`	`228`	`GBT_VARKEY_Reo=gbt_var_key_readable(e);`
	`229`	`+GBT_VARKEY_Rnr;`
`232`	`230`
`233`	`231`	`if (eo.lower==eo.upper)/* leaf */`
`234`	`232`	`{`
	`233`	`+GBT_VARKEY*tmp;`
	`234`	`+`
`235`	`235`	`tmp=gbt_var_leaf2node(e,tinfo);`
`236`	`236`	`if (tmp!=e)`
`237`	`237`	`eo=gbt_var_key_readable(tmp);`
`238`	`238`	`}`
`239`	`239`
`240`	`240`	`if (DatumGetPointer(*u))`
`241`	`241`	`{`
`242`		`-`
`243`	`242`	`GBT_VARKEY_Rro=gbt_var_key_readable((GBT_VARKEY)DatumGetPointer(u));`
	`243`	`+boolupdate= false;`
	`244`	`+`
	`245`	`+nr.lower=ro.lower;`
	`246`	`+nr.upper=ro.upper;`
`244`	`247`
`245`	`248`	`if ((*tinfo->f_cmp) (ro.lower,eo.lower,collation)>0)`
`246`	`249`	`{`
`247`	`250`	`nr.lower=eo.lower;`
`248`		`-nr.upper=ro.upper;`
`249`		`-nk=gbt_var_key_copy(&nr, TRUE);`
	`251`	`+update= true;`
`250`	`252`	`}`
`251`	`253`
`252`	`254`	`if ((*tinfo->f_cmp) (ro.upper,eo.upper,collation)<0)`
`253`	`255`	`{`
`254`	`256`	`nr.upper=eo.upper;`
`255`		`-nr.lower=ro.lower;`
`256`		`-nk=gbt_var_key_copy(&nr, TRUE);`
	`257`	`+update= true;`
`257`	`258`	`}`
`258`	`259`
`259`		`-if (nk)`
`260`		`-*u=PointerGetDatum(nk);`
	`260`	`+if (update)`
	`261`	`+*u=PointerGetDatum(gbt_var_key_copy(&nr, TRUE));`
`261`	`262`	`}`
`262`	`263`	`else`
`263`	`264`	`{`

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!

Commit94f565d

File tree

1 file changed

1 file changed

`‎contrib/btree_gist/btree_utils_var.c`

0 commit comments