NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit11de6c9

committed

Change signature of TupleHashTableHash().

Commit4eaea3d introduced TupleHashTableHash(), but the signaturedidn't match the other exposed functions. Separate it into internaland external versions. The external version hides the details behindan API more consistent with the other external functions, and theinternal version is still suitable for simplehash.

1 parent8fa8e01 commit11de6c9Copy full SHA for 11de6c9

File tree

2 files changed

+31

-8

lines changed

src
- backend/executor
  - execGrouping.c
- include/executor
  - executor.h

2 files changed

+31

-8

lines changed

`‎src/backend/executor/execGrouping.c`

Lines changed: 29 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,8 @@`
`26`	`26`	`#include"utils/memutils.h"`
`27`	`27`
`28`	`28`	`staticintTupleHashTableMatch(structtuplehash_hash*tb,constMinimalTupletuple1,constMinimalTupletuple2);`
	`29`	`+staticuint32TupleHashTableHash_internal(structtuplehash_hash*tb,`
	`30`	`+constMinimalTupletuple);`
`29`	`31`	`staticTupleHashEntryLookupTupleHashEntry_internal(`
`30`	`32`	`TupleHashTablehashtable,TupleTableSlotslot,boolisnew,uint32hash);`
`31`	`33`
`@@ -38,7 +40,7 @@ static TupleHashEntry LookupTupleHashEntry_internal(`
`38`	`40`	`#defineSH_ELEMENT_TYPE TupleHashEntryData`
`39`	`41`	`#defineSH_KEY_TYPE MinimalTuple`
`40`	`42`	`#defineSH_KEY firstTuple`
`41`		`-#defineSH_HASH_KEY(tb,key)TupleHashTableHash(tb, key)`
	`43`	`+#defineSH_HASH_KEY(tb,key)TupleHashTableHash_internal(tb, key)`
`42`	`44`	`#defineSH_EQUAL(tb,a,b) TupleHashTableMatch(tb, a, b) == 0`
`43`	`45`	`#defineSH_SCOPE extern`
`44`	`46`	`#defineSH_STORE_HASH`
`@@ -313,14 +315,36 @@ LookupTupleHashEntry(TupleHashTable hashtable, TupleTableSlot *slot,`
`313`	`315`	`hashtable->in_hash_funcs=hashtable->tab_hash_funcs;`
`314`	`316`	`hashtable->cur_eq_func=hashtable->tab_eq_func;`
`315`	`317`
`316`		`-hash=TupleHashTableHash(hashtable->hashtab,NULL);`
	`318`	`+hash=TupleHashTableHash_internal(hashtable->hashtab,NULL);`
`317`	`319`	`entry=LookupTupleHashEntry_internal(hashtable,slot,isnew,hash);`
`318`	`320`
`319`	`321`	`MemoryContextSwitchTo(oldContext);`
`320`	`322`
`321`	`323`	`returnentry;`
`322`	`324`	`}`
`323`	`325`
	`326`	`+/*`
	`327`	`+ * Compute the hash value for a tuple`
	`328`	`+ */`
	`329`	`+uint32`
	`330`	`+TupleHashTableHash(TupleHashTablehashtable,TupleTableSlot*slot)`
	`331`	`+{`
	`332`	`+MemoryContextoldContext;`
	`333`	`+uint32hash;`
	`334`	`+`
	`335`	`+hashtable->inputslot=slot;`
	`336`	`+hashtable->in_hash_funcs=hashtable->tab_hash_funcs;`
	`337`	`+`
	`338`	`+/* Need to run the hash functions in short-lived context */`
	`339`	`+oldContext=MemoryContextSwitchTo(hashtable->tempcxt);`
	`340`	`+`
	`341`	`+hash=TupleHashTableHash_internal(hashtable->hashtab,NULL);`
	`342`	`+`
	`343`	`+MemoryContextSwitchTo(oldContext);`
	`344`	`+`
	`345`	`+returnhash;`
	`346`	`+}`
	`347`	`+`
`324`	`348`	`/*`
`325`	`349`	`* A variant of LookupTupleHashEntry for callers that have already computed`
`326`	`350`	`* the hash value.`
`@@ -382,17 +406,16 @@ FindTupleHashEntry(TupleHashTable hashtable, TupleTableSlot *slot,`
`382`	`406`	`}`
`383`	`407`
`384`	`408`	`/*`
`385`		`- * Compute the hash value for a tuple`
`386`		`- *`
`387`	`409`	`* If tuple is NULL, use the input slot instead. This convention avoids the`
`388`	`410`	`* need to materialize virtual input tuples unless they actually need to get`
`389`	`411`	`* copied into the table.`
`390`	`412`	`*`
`391`	`413`	`* Also, the caller must select an appropriate memory context for running`
`392`	`414`	`* the hash functions. (dynahash.c doesn't change CurrentMemoryContext.)`
`393`	`415`	`*/`
`394`		`-uint32`
`395`		`-TupleHashTableHash(structtuplehash_hash*tb,constMinimalTupletuple)`
	`416`	`+staticuint32`
	`417`	`+TupleHashTableHash_internal(structtuplehash_hash*tb,`
	`418`	`+constMinimalTupletuple)`
`396`	`419`	`{`
`397`	`420`	`TupleHashTablehashtable= (TupleHashTable)tb->private_data;`
`398`	`421`	`intnumCols=hashtable->numCols;`

`‎src/include/executor/executor.h`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -140,8 +140,8 @@ extern TupleHashTable BuildTupleHashTableExt(PlanState *parent,`
`140`	`140`	`externTupleHashEntryLookupTupleHashEntry(TupleHashTablehashtable,`
`141`	`141`	`TupleTableSlot*slot,`
`142`	`142`	`bool*isnew);`
`143`		`-externuint32TupleHashTableHash(structtuplehash_hash*tb,`
`144`		`-constMinimalTupletuple);`
	`143`	`+externuint32TupleHashTableHash(TupleHashTablehashtable,`
	`144`	`+TupleTableSlot*slot);`
`145`	`145`	`externTupleHashEntryLookupTupleHashEntryHash(TupleHashTablehashtable,`
`146`	`146`	`TupleTableSlot*slot,`
`147`	`147`	`bool*isnew,uint32hash);`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit11de6c9

File tree

2 files changed

2 files changed

`‎src/backend/executor/execGrouping.c`

`‎src/include/executor/executor.h`

0 commit comments