Commitcea9a7a

authored and

committed

Remove RelationGetIndexRawAttOptions()

There was only one caller left, for which this function was overkill.Also, having it in relcache.c was inappropriate, since it doesn't workwith the relcache at all.Discussion:https://www.postgresql.org/message-id/flat/f84640e3-00d3-5abd-3f41-e6a19d33c40b@eisentraut.org

1 parent57bc846 commitcea9a7aCopy full SHA for cea9a7a

File tree

-33

lines changed

-33

lines changed

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -301,12 +301,14 @@ CheckIndexCompatible(Oid oldId,`
`301`	`301`	`/* Any change in opclass options break compatibility. */`
`302`	`302`	`if (ret)`
`303`	`303`	`{`
`304`		`-Datum*oldOpclassOptions=RelationGetIndexRawAttOptions(irel);`
	`304`	`+Datum*oldOpclassOptions=palloc_array(Datum,old_natts);`
	`305`	`+`
	`306`	`+for (i=0;i<old_natts;i++)`
	`307`	`+oldOpclassOptions[i]=get_attoptions(oldId,i+1);`
`305`	`308`
`306`	`309`	`ret=CompareOpclassOptions(oldOpclassOptions,opclassOptions,old_natts);`
`307`	`310`
`308`		`-if (oldOpclassOptions)`
`309`		`-pfree(oldOpclassOptions);`
	`311`	`+pfree(oldOpclassOptions);`
`310`	`312`	`}`
`311`	`313`
`312`	`314`	`/* Any change in exclusion operator selections breaks compatibility. */`

Lines changed: 0 additions & 29 deletions

Original file line number	Diff line number	Diff line change
`@@ -5821,35 +5821,6 @@ RelationBuildPublicationDesc(Relation relation, PublicationDesc *pubdesc)`
`5821`	`5821`	`MemoryContextSwitchTo(oldcxt);`
`5822`	`5822`	`}`
`5823`	`5823`
`5824`		`-/*`
`5825`		`- * RelationGetIndexRawAttOptions -- get AM/opclass-specific options for the index`
`5826`		`- */`
`5827`		`-Datum*`
`5828`		`-RelationGetIndexRawAttOptions(Relationindexrel)`
`5829`		`-{`
`5830`		`-Oidindexrelid=RelationGetRelid(indexrel);`
`5831`		`-int16natts=RelationGetNumberOfAttributes(indexrel);`
`5832`		`-Datum*options=NULL;`
`5833`		`-int16attnum;`
`5834`		`-`
`5835`		`-for (attnum=1;attnum <=natts;attnum++)`
`5836`		`-{`
`5837`		`-if (indexrel->rd_indam->amoptsprocnum==0)`
`5838`		`-continue;`
`5839`		`-`
`5840`		`-if (!OidIsValid(index_getprocid(indexrel,attnum,`
`5841`		`-indexrel->rd_indam->amoptsprocnum)))`
`5842`		`-continue;`
`5843`		`-`
`5844`		`-if (!options)`
`5845`		`-options=palloc0(sizeof(Datum)*natts);`
`5846`		`-`
`5847`		`-options[attnum-1]=get_attoptions(indexrelid,attnum);`
`5848`		`-}`
`5849`		`-`
`5850`		`-returnoptions;`
`5851`		`-}`
`5852`		`-`
`5853`	`5824`	`staticbytea**`
`5854`	`5825`	`CopyIndexAttOptions(bytea**srcopts,intnatts)`
`5855`	`5826`	`{`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,6 @@ extern OidRelationGetReplicaIndex(Relation relation);`
`51`	`51`	`externList*RelationGetIndexExpressions(Relationrelation);`
`52`	`52`	`externList*RelationGetDummyIndexExpressions(Relationrelation);`
`53`	`53`	`externList*RelationGetIndexPredicate(Relationrelation);`
`54`		`-externDatum*RelationGetIndexRawAttOptions(Relationindexrel);`
`55`	`54`	`externbytea**RelationGetIndexAttOptions(Relationrelation,boolcopy);`
`56`	`55`
`57`	`56`	`/*`

Comments

(0)