diff options
Diffstat (limited to 'src/backend/executor/execGrouping.c')
| -rw-r--r-- | src/backend/executor/execGrouping.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/backend/executor/execGrouping.c b/src/backend/executor/execGrouping.c index 2fc5fc7eebd..38a2a974ec1 100644 --- a/src/backend/executor/execGrouping.c +++ b/src/backend/executor/execGrouping.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/execGrouping.c,v 1.18 2006/03/05 15:58:25 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/executor/execGrouping.c,v 1.19 2006/06/28 17:05:49 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -389,7 +389,7 @@ LookupTupleHashEntry(TupleHashTable hashtable, TupleTableSlot *slot, /* Copy the first tuple into the table context */ MemoryContextSwitchTo(hashtable->tablecxt); - entry->firstTuple = ExecCopySlotTuple(slot); + entry->firstTuple = ExecCopySlotMinimalTuple(slot); *isnew = true; } @@ -405,23 +405,23 @@ LookupTupleHashEntry(TupleHashTable hashtable, TupleTableSlot *slot, /* * Compute the hash value for a tuple * - * The passed-in key is a pointer to TupleHashEntryData. In an actual - * hash table entry, the firstTuple field therein points to a physical - * tuple. LookupTupleHashEntry sets up a dummy TupleHashEntryData with - * a NULL firstTuple field --- that cues us to look at the inputslot instead. - * This convention avoids the need to materialize virtual input tuples - * unless they actually need to get copied into the table. + * The passed-in key is a pointer to TupleHashEntryData. In an actual hash + * table entry, the firstTuple field points to a tuple (in MinimalTuple + * format). LookupTupleHashEntry sets up a dummy TupleHashEntryData with a + * NULL firstTuple field --- that cues us to look at the inputslot instead. + * This convention avoids the need to materialize virtual input tuples unless + * they actually need to get copied into the table. * * CurTupleHashTable must be set before calling this, since dynahash.c * doesn't provide any API that would let us get at the hashtable otherwise. * * Also, the caller must select an appropriate memory context for running - * the hash functions. (dynahash.c doesn't change CurrentMemoryContext.) + * the hash functions. (dynahash.c doesn't change CurrentMemoryContext.) */ static uint32 TupleHashTableHash(const void *key, Size keysize) { - HeapTuple tuple = ((const TupleHashEntryData *) key)->firstTuple; + MinimalTuple tuple = ((const TupleHashEntryData *) key)->firstTuple; TupleTableSlot *slot; TupleHashTable hashtable = CurTupleHashTable; int numCols = hashtable->numCols; @@ -439,7 +439,7 @@ TupleHashTableHash(const void *key, Size keysize) /* Process a tuple already stored in the table */ /* (this case never actually occurs in current dynahash.c code) */ slot = hashtable->tableslot; - ExecStoreTuple(tuple, slot, InvalidBuffer, false); + ExecStoreMinimalTuple(tuple, slot, false); } for (i = 0; i < numCols; i++) @@ -480,10 +480,10 @@ TupleHashTableHash(const void *key, Size keysize) static int TupleHashTableMatch(const void *key1, const void *key2, Size keysize) { - HeapTuple tuple1 = ((const TupleHashEntryData *) key1)->firstTuple; + MinimalTuple tuple1 = ((const TupleHashEntryData *) key1)->firstTuple; #ifdef USE_ASSERT_CHECKING - HeapTuple tuple2 = ((const TupleHashEntryData *) key2)->firstTuple; + MinimalTuple tuple2 = ((const TupleHashEntryData *) key2)->firstTuple; #endif TupleTableSlot *slot1; TupleTableSlot *slot2; @@ -497,7 +497,7 @@ TupleHashTableMatch(const void *key1, const void *key2, Size keysize) */ Assert(tuple1 != NULL); slot1 = hashtable->tableslot; - ExecStoreTuple(tuple1, slot1, InvalidBuffer, false); + ExecStoreMinimalTuple(tuple1, slot1, false); Assert(tuple2 == NULL); slot2 = hashtable->inputslot; |