You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2016/02/01 22:57:52 UTC
spark git commit: Fix for [SPARK-12854][SQL] Implement complex types support in Columna…
Repository: spark
Updated Branches:
refs/heads/master 064b029c6 -> a2973fed3
Fix for [SPARK-12854][SQL] Implement complex types support in Columna…
…rBatch
Fixes build for Scala 2.11.
Author: Jacek Laskowski <ja...@japila.pl>
Closes #10946 from jaceklaskowski/SPARK-12854-fix.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/a2973fed
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/a2973fed
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/a2973fed
Branch: refs/heads/master
Commit: a2973fed30fbe9a0b12e1c1225359fdf55d322b4
Parents: 064b029
Author: Jacek Laskowski <ja...@japila.pl>
Authored: Mon Feb 1 13:57:48 2016 -0800
Committer: Reynold Xin <rx...@databricks.com>
Committed: Mon Feb 1 13:57:48 2016 -0800
----------------------------------------------------------------------
.../apache/spark/sql/execution/vectorized/OffHeapColumnVector.java | 2 +-
.../apache/spark/sql/execution/vectorized/OnHeapColumnVector.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/a2973fed/sql/core/src/main/java/org/apache/spark/sql/execution/vectorized/OffHeapColumnVector.java
----------------------------------------------------------------------
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 22c5e5f..7a224d1 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);
http://git-wip-us.apache.org/repos/asf/spark/blob/a2973fed/sql/core/src/main/java/org/apache/spark/sql/execution/vectorized/OnHeapColumnVector.java
----------------------------------------------------------------------
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 3235633..c42bbd6 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;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org