From cfe76028bb116d72eab6601bff3b2a1856597370 Mon Sep 17 00:00:00 2001
From: Dongjoon Hyun <dongjoon@apache.org>
Date: Thu, 3 Nov 2016 23:15:33 -0700
Subject: [PATCH] [SPARK-18200][GRAPHX][FOLLOW-UP] Support zero as an initial
capacity in OpenHashSet
## What changes were proposed in this pull request?
This is a follow-up PR of #15741 in order to keep `nextPowerOf2` consistent.
**Before**
```
nextPowerOf2(0) => 2
nextPowerOf2(1) => 1
nextPowerOf2(2) => 2
nextPowerOf2(3) => 4
nextPowerOf2(4) => 4
nextPowerOf2(5) => 8
```
**After**
```
nextPowerOf2(0) => 1
nextPowerOf2(1) => 1
nextPowerOf2(2) => 2
nextPowerOf2(3) => 4
nextPowerOf2(4) => 4
nextPowerOf2(5) => 8
```
## How was this patch tested?
N/A
Author: Dongjoon Hyun <dongjoon@apache.org>
Closes #15754 from dongjoon-hyun/SPARK-18200-2.
(cherry picked from commit 27602c33751cebf6cd173c0de103454608cf6625)
Signed-off-by: Reynold Xin <rxin@databricks.com>
---
.../scala/org/apache/spark/util/collection/OpenHashSet.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/src/main/scala/org/apache/spark/util/collection/OpenHashSet.scala b/core/src/main/scala/org/apache/spark/util/collection/OpenHashSet.scala
index 7a1be8515d..60f6f537c1 100644
--- a/core/src/main/scala/org/apache/spark/util/collection/OpenHashSet.scala
+++ b/core/src/main/scala/org/apache/spark/util/collection/OpenHashSet.scala
@@ -272,7 +272,7 @@ class OpenHashSet[@specialized(Long, Int) T: ClassTag](
private def nextPowerOf2(n: Int): Int = {
if (n == 0) {
- 2
+ 1
} else {
val highBit = Integer.highestOneBit(n)
if (highBit == n) n else highBit << 1
--
GitLab