Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:EDV_Lotse:1C
postgresql10
00012-index_getattr_optimization.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 00012-index_getattr_optimization.patch of Package postgresql10
diff --git a/src/backend/access/common/indextuple.c b/src/backend/access/common/indextuple.c index 37a21057d0..6c2eea0f6a 100644 --- a/src/backend/access/common/indextuple.c +++ b/src/backend/access/common/indextuple.c @@ -416,14 +416,70 @@ void index_deform_tuple(IndexTuple tup, TupleDesc tupleDescriptor, Datum *values, bool *isnull) { - int i; + int natts = tupleDescriptor->natts; /* number of atts to extract */ + int attnum; + char *tp; /* ptr to tuple data */ + int off; /* offset in tuple data */ + bits8 *bp; /* ptr to null bitmap in tuple */ + bool slow = false; /* can we use/set attcacheoff? */ /* Assert to protect callers who allocate fixed-size arrays */ - Assert(tupleDescriptor->natts <= INDEX_MAX_KEYS); + Assert(natts <= INDEX_MAX_KEYS); + + tp = (char *) tup + IndexInfoFindDataOffset(tup->t_info); + off = 0; + /* XXX "knows" t_bits are just after fixed tuple header! */ + bp = (bits8 *) ((char *) tup + sizeof(IndexTupleData)); - for (i = 0; i < tupleDescriptor->natts; i++) + for (attnum = 0; attnum < natts; attnum++) { - values[i] = index_getattr(tup, i + 1, tupleDescriptor, &isnull[i]); + Form_pg_attribute thisatt = TupleDescAttr(tupleDescriptor, attnum); + + if (IndexTupleHasNulls(tup) && att_isnull(attnum, bp)) + { + values[attnum] = (Datum) 0; + isnull[attnum] = true; + slow = true; /* can't use attcacheoff anymore */ + continue; + } + + isnull[attnum] = false; + + if (!slow && thisatt->attcacheoff >= 0) + off = thisatt->attcacheoff; + else if (thisatt->attlen == -1) + { + /* + * We can only cache the offset for a varlena attribute if the + * offset is already suitably aligned, so that there would be no + * pad bytes in any case: then the offset will be valid for either + * an aligned or unaligned value. + */ + if (!slow && + off == att_align_nominal(off, thisatt->attalign)) + thisatt->attcacheoff = off; + else + { + off = att_align_pointer(off, thisatt->attalign, -1, + tp + off); + slow = true; + } + } + else + { + /* not varlena, so safe to use att_align_nominal */ + off = att_align_nominal(off, thisatt->attalign); + + if (!slow) + thisatt->attcacheoff = off; + } + + values[attnum] = fetchatt(thisatt, tp + off); + + off = att_addlength_pointer(off, thisatt->attlen, tp + off); + + if (thisatt->attlen <= 0) + slow = true; /* can't use attcacheoff anymore */ } } diff --git a/src/backend/executor/nodeIndexonlyscan.c b/src/backend/executor/nodeIndexonlyscan.c index f452e0fd5f..d87ef5b26b 100644 --- a/src/backend/executor/nodeIndexonlyscan.c +++ b/src/backend/executor/nodeIndexonlyscan.c @@ -268,11 +268,6 @@ IndexOnlyNext(IndexOnlyScanState *node) static void StoreIndexTuple(TupleTableSlot *slot, IndexTuple itup, TupleDesc itupdesc) { - int nindexatts = itupdesc->natts; - Datum *values = slot->tts_values; - bool *isnull = slot->tts_isnull; - int i; - /* * Note: we must use the tupdesc supplied by the AM in index_getattr, not * the slot's tupdesc, in case the latter has different datatypes (this @@ -280,11 +275,10 @@ StoreIndexTuple(TupleTableSlot *slot, IndexTuple itup, TupleDesc itupdesc) * number of columns though, as well as being datatype-compatible which is * something we can't so easily check. */ - Assert(slot->tts_tupleDescriptor->natts == nindexatts); + Assert(slot->tts_tupleDescriptor->natts == itupdesc->natts); ExecClearTuple(slot); - for (i = 0; i < nindexatts; i++) - values[i] = index_getattr(itup, i + 1, itupdesc, &isnull[i]); + index_deform_tuple(itup, itupdesc, slot->tts_values, slot->tts_isnull); ExecStoreVirtualTuple(slot); }
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor