mirror of
https://github.com/postgres/postgres.git
synced 2025-06-29 10:41:53 +03:00
Change tupledesc->attrs[n] to TupleDescAttr(tupledesc, n).
This is a mechanical change in preparation for a later commit that will change the layout of TupleDesc. Introducing a macro to abstract the details of where attributes are stored will allow us to change that in separate step and revise it in future. Author: Thomas Munro, editorialized by Andres Freund Reviewed-By: Andres Freund Discussion: https://postgr.es/m/CAEepm=0ZtQ-SpsgCyzzYpsXS6e=kZWqk3g5Ygn3MDV7A8dabUA@mail.gmail.com
This commit is contained in:
@ -96,6 +96,8 @@ initGinState(GinState *state, Relation index)
|
||||
|
||||
for (i = 0; i < origTupdesc->natts; i++)
|
||||
{
|
||||
Form_pg_attribute attr = TupleDescAttr(origTupdesc, i);
|
||||
|
||||
if (state->oneCol)
|
||||
state->tupdesc[i] = state->origTupdesc;
|
||||
else
|
||||
@ -105,11 +107,11 @@ initGinState(GinState *state, Relation index)
|
||||
TupleDescInitEntry(state->tupdesc[i], (AttrNumber) 1, NULL,
|
||||
INT2OID, -1, 0);
|
||||
TupleDescInitEntry(state->tupdesc[i], (AttrNumber) 2, NULL,
|
||||
origTupdesc->attrs[i]->atttypid,
|
||||
origTupdesc->attrs[i]->atttypmod,
|
||||
origTupdesc->attrs[i]->attndims);
|
||||
attr->atttypid,
|
||||
attr->atttypmod,
|
||||
attr->attndims);
|
||||
TupleDescInitEntryCollation(state->tupdesc[i], (AttrNumber) 2,
|
||||
origTupdesc->attrs[i]->attcollation);
|
||||
attr->attcollation);
|
||||
}
|
||||
|
||||
/*
|
||||
@ -126,13 +128,13 @@ initGinState(GinState *state, Relation index)
|
||||
{
|
||||
TypeCacheEntry *typentry;
|
||||
|
||||
typentry = lookup_type_cache(origTupdesc->attrs[i]->atttypid,
|
||||
typentry = lookup_type_cache(attr->atttypid,
|
||||
TYPECACHE_CMP_PROC_FINFO);
|
||||
if (!OidIsValid(typentry->cmp_proc_finfo.fn_oid))
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_UNDEFINED_FUNCTION),
|
||||
errmsg("could not identify a comparison function for type %s",
|
||||
format_type_be(origTupdesc->attrs[i]->atttypid))));
|
||||
format_type_be(attr->atttypid))));
|
||||
fmgr_info_copy(&(state->compareFn[i]),
|
||||
&(typentry->cmp_proc_finfo),
|
||||
CurrentMemoryContext);
|
||||
|
Reference in New Issue
Block a user