Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 55d9cd4

Browse files
committed
Avoid misbehavior when hash_table_bytes < bucket_size.
It's possible to reach this case when work_mem is very small and tupsize is (relatively) very large. In that case ExecChooseHashTableSize would get an assertion failure, or with asserts off it'd compute nbuckets = 0, which'd likely cause misbehavior later (I've not checked). To fix, clamp the number of buckets to be at least 1. This is due to faulty conversion of old my_log2() coding in 28d9360. Back-patch to v13, as that was. Zhang Mingli Discussion: https://postgr.es/m/beb64ca0-91e2-44ac-bf4a-7ea36275ec02@Spark
1 parent f558088 commit 55d9cd4

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

src/backend/executor/nodeHash.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -832,7 +832,10 @@ ExecChooseHashTableSize(double ntuples, int tupwidth, bool useskew,
832832
* overhead for the hash code, pointer to the next tuple, etc.
833833
*/
834834
bucket_size = (tupsize * NTUP_PER_BUCKET + sizeof(HashJoinTuple));
835-
sbuckets = pg_nextpower2_size_t(hash_table_bytes / bucket_size);
835+
if (hash_table_bytes <= bucket_size)
836+
sbuckets = 1; /* avoid pg_nextpower2_size_t(0) */
837+
else
838+
sbuckets = pg_nextpower2_size_t(hash_table_bytes / bucket_size);
836839
sbuckets = Min(sbuckets, max_pointers);
837840
nbuckets = (int) sbuckets;
838841
nbuckets = pg_nextpower2_32(nbuckets);

0 commit comments

Comments
 (0)