diff options
author | Jacek Laskowski <jacek@japila.pl> | 2016-02-01 13:57:48 -0800 |
---|---|---|
committer | Reynold Xin <rxin@databricks.com> | 2016-02-01 13:57:48 -0800 |
commit | a2973fed30fbe9a0b12e1c1225359fdf55d322b4 (patch) | |
tree | 7a9ea64df7fc61b1297ebd2fe4857e7cf82db2a9 /sql | |
parent | 064b029c6a15481fc4dfb147100c19a68cd1cc95 (diff) | |
download | spark-a2973fed30fbe9a0b12e1c1225359fdf55d322b4.tar.gz spark-a2973fed30fbe9a0b12e1c1225359fdf55d322b4.tar.bz2 spark-a2973fed30fbe9a0b12e1c1225359fdf55d322b4.zip |
Fix for [SPARK-12854][SQL] Implement complex types support in Columna…
…rBatch
Fixes build for Scala 2.11.
Author: Jacek Laskowski <jacek@japila.pl>
Closes #10946 from jaceklaskowski/SPARK-12854-fix.
Diffstat (limited to 'sql')
2 files changed, 2 insertions, 2 deletions
diff --git a/sql/core/src/main/java/org/apache/spark/sql/execution/vectorized/OffHeapColumnVector.java b/sql/core/src/main/java/org/apache/spark/sql/execution/vectorized/OffHeapColumnVector.java index 22c5e5fc81..7a224d19d1 100644 --- a/sql/core/src/main/java/org/apache/spark/sql/execution/vectorized/OffHeapColumnVector.java +++ b/sql/core/src/main/java/org/apache/spark/sql/execution/vectorized/OffHeapColumnVector.java @@ -367,7 +367,7 @@ public final class OffHeapColumnVector extends ColumnVector { } @Override - public final void loadBytes(Array array) { + public final void loadBytes(ColumnVector.Array array) { if (array.tmpByteArray.length < array.length) array.tmpByteArray = new byte[array.length]; Platform.copyMemory( null, data + array.offset, array.tmpByteArray, Platform.BYTE_ARRAY_OFFSET, array.length); diff --git a/sql/core/src/main/java/org/apache/spark/sql/execution/vectorized/OnHeapColumnVector.java b/sql/core/src/main/java/org/apache/spark/sql/execution/vectorized/OnHeapColumnVector.java index 32356334c0..c42bbd642e 100644 --- a/sql/core/src/main/java/org/apache/spark/sql/execution/vectorized/OnHeapColumnVector.java +++ b/sql/core/src/main/java/org/apache/spark/sql/execution/vectorized/OnHeapColumnVector.java @@ -331,7 +331,7 @@ public final class OnHeapColumnVector extends ColumnVector { } @Override - public final void loadBytes(Array array) { + public final void loadBytes(ColumnVector.Array array) { array.byteArray = byteData; array.byteArrayOffset = array.offset; } |