You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ue...@apache.org on 2018/02/01 12:29:02 UTC
spark git commit: [SPARK-23280][SQL][FOLLOWUP] Enable
`MutableColumnarRow.getMap()`.
Repository: spark
Updated Branches:
refs/heads/master 8bb70b068 -> 89e8d556b
[SPARK-23280][SQL][FOLLOWUP] Enable `MutableColumnarRow.getMap()`.
## What changes were proposed in this pull request?
This is a followup pr of #20450.
We should've enabled `MutableColumnarRow.getMap()` as well.
## How was this patch tested?
Existing tests.
Author: Takuya UESHIN <ue...@databricks.com>
Closes #20471 from ueshin/issues/SPARK-23280/fup2.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/89e8d556
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/89e8d556
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/89e8d556
Branch: refs/heads/master
Commit: 89e8d556b93d1bf1b28fe153fd284f154045b0ee
Parents: 8bb70b0
Author: Takuya UESHIN <ue...@databricks.com>
Authored: Thu Feb 1 21:28:53 2018 +0900
Committer: Takuya UESHIN <ue...@databricks.com>
Committed: Thu Feb 1 21:28:53 2018 +0900
----------------------------------------------------------------------
.../spark/sql/execution/vectorized/MutableColumnarRow.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/89e8d556/sql/core/src/main/java/org/apache/spark/sql/execution/vectorized/MutableColumnarRow.java
----------------------------------------------------------------------
diff --git a/sql/core/src/main/java/org/apache/spark/sql/execution/vectorized/MutableColumnarRow.java b/sql/core/src/main/java/org/apache/spark/sql/execution/vectorized/MutableColumnarRow.java
index 66668f3..307c190 100644
--- a/sql/core/src/main/java/org/apache/spark/sql/execution/vectorized/MutableColumnarRow.java
+++ b/sql/core/src/main/java/org/apache/spark/sql/execution/vectorized/MutableColumnarRow.java
@@ -21,10 +21,10 @@ import java.math.BigDecimal;
import org.apache.spark.sql.catalyst.InternalRow;
import org.apache.spark.sql.catalyst.expressions.GenericInternalRow;
-import org.apache.spark.sql.catalyst.util.MapData;
import org.apache.spark.sql.types.*;
import org.apache.spark.sql.vectorized.ColumnarArray;
import org.apache.spark.sql.vectorized.ColumnarBatch;
+import org.apache.spark.sql.vectorized.ColumnarMap;
import org.apache.spark.sql.vectorized.ColumnarRow;
import org.apache.spark.sql.vectorized.ColumnVector;
import org.apache.spark.unsafe.types.CalendarInterval;
@@ -162,8 +162,9 @@ public final class MutableColumnarRow extends InternalRow {
}
@Override
- public MapData getMap(int ordinal) {
- throw new UnsupportedOperationException();
+ public ColumnarMap getMap(int ordinal) {
+ if (columns[ordinal].isNullAt(rowId)) return null;
+ return columns[ordinal].getMap(rowId);
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org