NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitc6ce5f7

committed

Fix handling of non-key columns get_index_column_opclass()

f2e4038 introduces support of non-key attributes in GiST indexes. Then ifget_index_column_opclass() is asked by gistproperty() to get an opclass ofnon-key column, it returns garbage past oidvector value. This commit fixesthat by making get_index_column_opclass() return InvalidOid in this case.Discussion:https://postgr.es/m/20190902231948.GA5343%40alvherre.pgsqlAuthor: Nikita Glukhov, Alexander KorotkovBackpatch-through: 12

1 parent55a808c commitc6ce5f7Copy full SHA for c6ce5f7

File tree

1 file changed

+11

-1

lines changed

src/backend/utils/cache
- lsyscache.c

1 file changed

+11

-1

lines changed

`‎src/backend/utils/cache/lsyscache.c`

Lines changed: 11 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3157,7 +3157,8 @@ get_range_subtype(Oid rangeOid)`
`3157`	`3157`	`*`
`3158`	`3158`	`*Given the index OID and column number,`
`3159`	`3159`	`*return opclass of the index column`
`3160`		`- *or InvalidOid if the index was not found.`
	`3160`	`+ *or InvalidOid if the index was not found`
	`3161`	`+ *or column is non-key one.`
`3161`	`3162`	`*/`
`3162`	`3163`	`Oid`
`3163`	`3164`	`get_index_column_opclass(Oidindex_oid,intattno)`
`@@ -3180,11 +3181,20 @@ get_index_column_opclass(Oid index_oid, int attno)`
`3180`	`3181`	`/* caller is supposed to guarantee this */`
`3181`	`3182`	`Assert(attno>0&&attno <=rd_index->indnatts);`
`3182`	`3183`
	`3184`	`+/* Non-key attributes don't have an opclass */`
	`3185`	`+if (attno>rd_index->indnkeyatts)`
	`3186`	`+{`
	`3187`	`+ReleaseSysCache(tuple);`
	`3188`	`+returnInvalidOid;`
	`3189`	`+}`
	`3190`	`+`
`3183`	`3191`	`datum=SysCacheGetAttr(INDEXRELID,tuple,`
`3184`	`3192`	`Anum_pg_index_indclass,&isnull);`
`3185`	`3193`	`Assert(!isnull);`
`3186`	`3194`
`3187`	`3195`	`indclass= ((oidvector*)DatumGetPointer(datum));`
	`3196`	`+`
	`3197`	`+Assert(attno <=indclass->dim1);`
`3188`	`3198`	`opclass=indclass->values[attno-1];`
`3189`	`3199`
`3190`	`3200`	`ReleaseSysCache(tuple);`

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!

Commitc6ce5f7

File tree

1 file changed

1 file changed

`‎src/backend/utils/cache/lsyscache.c`

0 commit comments