aboutsummaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorQifan Pu <qifan.pu@gmail.com>2016-07-24 21:53:21 -0700
committerReynold Xin <rxin@databricks.com>2016-07-24 21:54:42 -0700
commit468a3c3ac5d039f21613f9237c7bdef9b92f5fea (patch)
tree6e7631f491d696ad33326218fc6ac4626a008542 /sql
parentdaace6014216b996bcc8937f1fdcea732b6910ca (diff)
downloadspark-468a3c3ac5d039f21613f9237c7bdef9b92f5fea.tar.gz
spark-468a3c3ac5d039f21613f9237c7bdef9b92f5fea.tar.bz2
spark-468a3c3ac5d039f21613f9237c7bdef9b92f5fea.zip
[SPARK-16699][SQL] Fix performance bug in hash aggregate on long string keys
In the following code in `VectorizedHashMapGenerator.scala`: ``` def hashBytes(b: String): String = { val hash = ctx.freshName("hash") s""" |int $result = 0; |for (int i = 0; i < $b.length; i++) { | ${genComputeHash(ctx, s"$b[i]", ByteType, hash)} | $result = ($result ^ (0x9e3779b9)) + $hash + ($result << 6) + ($result >>> 2); |} """.stripMargin } ``` when b=input.getBytes(), the current 2.0 code results in getBytes() being called n times, n being length of input. getBytes() involves memory copy is thus expensive and causes a performance degradation. Fix is to evaluate getBytes() before the for loop. Performance bug, no additional test added. Author: Qifan Pu <qifan.pu@gmail.com> Closes #14337 from ooq/SPARK-16699. (cherry picked from commit d226dce12babcd9f30db033417b2b9ce79f44312) Signed-off-by: Reynold Xin <rxin@databricks.com>
Diffstat (limited to 'sql')
-rw-r--r--sql/core/src/main/scala/org/apache/spark/sql/execution/aggregate/VectorizedHashMapGenerator.scala6
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/aggregate/VectorizedHashMapGenerator.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/aggregate/VectorizedHashMapGenerator.scala
index 8a3f466ccf..b4a9059299 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/execution/aggregate/VectorizedHashMapGenerator.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/aggregate/VectorizedHashMapGenerator.scala
@@ -313,10 +313,12 @@ class VectorizedHashMapGenerator(
def hashLong(l: String): String = s"long $result = $l;"
def hashBytes(b: String): String = {
val hash = ctx.freshName("hash")
+ val bytes = ctx.freshName("bytes")
s"""
|int $result = 0;
- |for (int i = 0; i < $b.length; i++) {
- | ${genComputeHash(ctx, s"$b[i]", ByteType, hash)}
+ |byte[] $bytes = $b;
+ |for (int i = 0; i < $bytes.length; i++) {
+ | ${genComputeHash(ctx, s"$bytes[i]", ByteType, hash)}
| $result = ($result ^ (0x9e3779b9)) + $hash + ($result << 6) + ($result >>> 2);
|}
""".stripMargin