diff options
Diffstat (limited to 'src/backend/executor')
| -rw-r--r-- | src/backend/executor/nodeIndexonlyscan.c | 4 | ||||
| -rw-r--r-- | src/backend/executor/nodeMemoize.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/executor/nodeIndexonlyscan.c b/src/backend/executor/nodeIndexonlyscan.c index b49194c0167..612c6738950 100644 --- a/src/backend/executor/nodeIndexonlyscan.c +++ b/src/backend/executor/nodeIndexonlyscan.c @@ -658,7 +658,7 @@ ExecInitIndexOnlyScan(IndexOnlyScan *node, EState *estate, int eflags) /* First, count the number of such index keys */ for (int attnum = 0; attnum < indnkeyatts; attnum++) { - if (indexRelation->rd_att->attrs[attnum].atttypid == CSTRINGOID && + if (TupleDescAttr(indexRelation->rd_att, attnum)->atttypid == CSTRINGOID && indexRelation->rd_opcintype[attnum] == NAMEOID) namecount++; } @@ -676,7 +676,7 @@ ExecInitIndexOnlyScan(IndexOnlyScan *node, EState *estate, int eflags) for (int attnum = 0; attnum < indnkeyatts; attnum++) { - if (indexRelation->rd_att->attrs[attnum].atttypid == CSTRINGOID && + if (TupleDescAttr(indexRelation->rd_att, attnum)->atttypid == CSTRINGOID && indexRelation->rd_opcintype[attnum] == NAMEOID) indexstate->ioss_NameCStringAttNums[idx++] = (AttrNumber) attnum; } diff --git a/src/backend/executor/nodeMemoize.c b/src/backend/executor/nodeMemoize.c index 45157ffb9c7..df8e3fff082 100644 --- a/src/backend/executor/nodeMemoize.c +++ b/src/backend/executor/nodeMemoize.c @@ -175,10 +175,10 @@ MemoizeHash_hash(struct memoize_hash *tb, const MemoizeKey *key) if (!pslot->tts_isnull[i]) /* treat nulls as having hash key 0 */ { - FormData_pg_attribute *attr; + Form_pg_attribute attr; uint32 hkey; - attr = &pslot->tts_tupleDescriptor->attrs[i]; + attr = TupleDescAttr(pslot->tts_tupleDescriptor, i); hkey = datum_image_hash(pslot->tts_values[i], attr->attbyval, attr->attlen); @@ -242,7 +242,7 @@ MemoizeHash_equal(struct memoize_hash *tb, const MemoizeKey *key1, for (int i = 0; i < numkeys; i++) { - FormData_pg_attribute *attr; + Form_pg_attribute attr; if (tslot->tts_isnull[i] != pslot->tts_isnull[i]) { @@ -255,7 +255,7 @@ MemoizeHash_equal(struct memoize_hash *tb, const MemoizeKey *key1, continue; /* perform binary comparison on the two datums */ - attr = &tslot->tts_tupleDescriptor->attrs[i]; + attr = TupleDescAttr(tslot->tts_tupleDescriptor, i); if (!datum_image_eq(tslot->tts_values[i], pslot->tts_values[i], attr->attbyval, attr->attlen)) { |