mirror of
https://github.com/postgres/postgres.git
synced 2025-07-08 11:42:09 +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:
@ -49,7 +49,6 @@ tstoreStartupReceiver(DestReceiver *self, int operation, TupleDesc typeinfo)
|
||||
{
|
||||
TStoreState *myState = (TStoreState *) self;
|
||||
bool needtoast = false;
|
||||
Form_pg_attribute *attrs = typeinfo->attrs;
|
||||
int natts = typeinfo->natts;
|
||||
int i;
|
||||
|
||||
@ -58,9 +57,11 @@ tstoreStartupReceiver(DestReceiver *self, int operation, TupleDesc typeinfo)
|
||||
{
|
||||
for (i = 0; i < natts; i++)
|
||||
{
|
||||
if (attrs[i]->attisdropped)
|
||||
Form_pg_attribute attr = TupleDescAttr(typeinfo, i);
|
||||
|
||||
if (attr->attisdropped)
|
||||
continue;
|
||||
if (attrs[i]->attlen == -1)
|
||||
if (attr->attlen == -1)
|
||||
{
|
||||
needtoast = true;
|
||||
break;
|
||||
@ -109,7 +110,6 @@ tstoreReceiveSlot_detoast(TupleTableSlot *slot, DestReceiver *self)
|
||||
{
|
||||
TStoreState *myState = (TStoreState *) self;
|
||||
TupleDesc typeinfo = slot->tts_tupleDescriptor;
|
||||
Form_pg_attribute *attrs = typeinfo->attrs;
|
||||
int natts = typeinfo->natts;
|
||||
int nfree;
|
||||
int i;
|
||||
@ -127,10 +127,9 @@ tstoreReceiveSlot_detoast(TupleTableSlot *slot, DestReceiver *self)
|
||||
for (i = 0; i < natts; i++)
|
||||
{
|
||||
Datum val = slot->tts_values[i];
|
||||
Form_pg_attribute attr = TupleDescAttr(typeinfo, i);
|
||||
|
||||
if (!attrs[i]->attisdropped &&
|
||||
attrs[i]->attlen == -1 &&
|
||||
!slot->tts_isnull[i])
|
||||
if (!attr->attisdropped && attr->attlen == -1 && !slot->tts_isnull[i])
|
||||
{
|
||||
if (VARATT_IS_EXTERNAL(DatumGetPointer(val)))
|
||||
{
|
||||
|
Reference in New Issue
Block a user