diff options
| author | Feynman Liang <fliang@databricks.com> | 2015-08-30 23:12:56 -0700 |
|---|---|---|
| committer | Reynold Xin <rxin@databricks.com> | 2015-08-30 23:12:56 -0700 |
| commit | 8694c3ad7dcafca9563649e93b7a08076748d6f2 (patch) | |
| tree | fd17897047316569da0e1d07d5b019c305274c4b /unsafe | |
| parent | 35e896a79bb5e72d63b82b047f46f4f6fa2e1970 (diff) | |
| download | spark-8694c3ad7dcafca9563649e93b7a08076748d6f2.tar.gz spark-8694c3ad7dcafca9563649e93b7a08076748d6f2.tar.bz2 spark-8694c3ad7dcafca9563649e93b7a08076748d6f2.zip | |
[SPARK-10351] [SQL] Fixes UTF8String.fromAddress to handle off-heap memory
CC rxin marmbrus
Author: Feynman Liang <fliang@databricks.com>
Closes #8523 from feynmanliang/SPARK-10351.
Diffstat (limited to 'unsafe')
| -rw-r--r-- | unsafe/src/main/java/org/apache/spark/unsafe/types/UTF8String.java | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/unsafe/src/main/java/org/apache/spark/unsafe/types/UTF8String.java b/unsafe/src/main/java/org/apache/spark/unsafe/types/UTF8String.java index cbcab958c0..216aeea60d 100644 --- a/unsafe/src/main/java/org/apache/spark/unsafe/types/UTF8String.java +++ b/unsafe/src/main/java/org/apache/spark/unsafe/types/UTF8String.java @@ -90,11 +90,7 @@ public final class UTF8String implements Comparable<UTF8String>, Externalizable * Creates an UTF8String from given address (base and offset) and length. */ public static UTF8String fromAddress(Object base, long offset, int numBytes) { - if (base != null) { - return new UTF8String(base, offset, numBytes); - } else { - return null; - } + return new UTF8String(base, offset, numBytes); } /** |