NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit6fcde24

committed

Fix some minor errors in new PHJ code.

Correct ExecParallelHashTuplePrealloc's estimate of whether thespace_allowed limit is exceeded. Be more consistent about tuples thatare exactly HASH_CHUNK_THRESHOLD in size (they're "small", not "large").Neither of these things explain the current buildfarm unhappiness, butthey're still bugs.Thomas Munro, per gripe by meDiscussion:https://postgr.es/m/CAEepm=34PDuR69kfYVhmZPgMdy8pSA-MYbpesEN1SR+2oj3Y+w@mail.gmail.com

1 parent3decd15 commit6fcde24Copy full SHA for 6fcde24

File tree

1 file changed

-2

lines changed

src/backend/executor
- nodeHash.c

1 file changed

-2

lines changed

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

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2740,7 +2740,7 @@ ExecParallelHashTupleAlloc(HashJoinTable hashtable, size_t size,`
`2740`	`2740`	`*/`
`2741`	`2741`	`chunk=hashtable->current_chunk;`
`2742`	`2742`	`if (chunk!=NULL&&`
`2743`		`-size<HASH_CHUNK_THRESHOLD&&`
	`2743`	`+size <=HASH_CHUNK_THRESHOLD&&`
`2744`	`2744`	`chunk->maxlen-chunk->used >=size)`
`2745`	`2745`	`{`
`2746`	`2746`
`@@ -3260,6 +3260,7 @@ ExecParallelHashTuplePrealloc(HashJoinTable hashtable, int batchno, size_t size)`
`3260`	`3260`
`3261`	`3261`	`Assert(batchno>0);`
`3262`	`3262`	`Assert(batchno<hashtable->nbatch);`
	`3263`	`+Assert(size==MAXALIGN(size));`
`3263`	`3264`
`3264`	`3265`	`LWLockAcquire(&pstate->lock,LW_EXCLUSIVE);`
`3265`	`3266`
`@@ -3280,7 +3281,8 @@ ExecParallelHashTuplePrealloc(HashJoinTable hashtable, int batchno, size_t size)`
`3280`	`3281`
`3281`	`3282`	`if (pstate->growth!=PHJ_GROWTH_DISABLED&&`
`3282`	`3283`	`batch->at_least_one_chunk&&`
`3283`		`-(batch->shared->estimated_size+size>pstate->space_allowed))`
	`3284`	`+(batch->shared->estimated_size+want+HASH_CHUNK_HEADER_SIZE`
	`3285`	`+>pstate->space_allowed))`
`3284`	`3286`	`{`
`3285`	`3287`	`/*`
`3286`	`3288`	`* We have determined that this batch would exceed the space budget if`

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!

Commit6fcde24

File tree

1 file changed

1 file changed

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

0 commit comments