diff options
author | Wenchen Fan <wenchen@databricks.com> | 2016-02-08 12:06:00 -0800 |
---|---|---|
committer | Michael Armbrust <michael@databricks.com> | 2016-02-08 12:06:00 -0800 |
commit | 8e4d15f70713e1aaaa96dfb3ea4ccc5bb08eb2ce (patch) | |
tree | d03e7c60c6d08a606331bafa139dcd7cfa443e1b /sql/core | |
parent | 06f0df6df204c4722ff8a6bf909abaa32a715c41 (diff) | |
download | spark-8e4d15f70713e1aaaa96dfb3ea4ccc5bb08eb2ce.tar.gz spark-8e4d15f70713e1aaaa96dfb3ea4ccc5bb08eb2ce.tar.bz2 spark-8e4d15f70713e1aaaa96dfb3ea4ccc5bb08eb2ce.zip |
[SPARK-13101][SQL] nullability of array type element should not fail analysis of encoder
nullability should only be considered as an optimization rather than part of the type system, so instead of failing analysis for mismatch nullability, we should pass analysis and add runtime null check.
Author: Wenchen Fan <wenchen@databricks.com>
Closes #11035 from cloud-fan/ignore-nullability.
Diffstat (limited to 'sql/core')
-rw-r--r-- | sql/core/src/test/java/test/org/apache/spark/sql/JavaDatasetSuite.java | 4 | ||||
-rw-r--r-- | sql/core/src/test/scala/org/apache/spark/sql/DatasetSuite.scala | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/sql/core/src/test/java/test/org/apache/spark/sql/JavaDatasetSuite.java b/sql/core/src/test/java/test/org/apache/spark/sql/JavaDatasetSuite.java index a6fb62c17d..1181244c8a 100644 --- a/sql/core/src/test/java/test/org/apache/spark/sql/JavaDatasetSuite.java +++ b/sql/core/src/test/java/test/org/apache/spark/sql/JavaDatasetSuite.java @@ -850,9 +850,7 @@ public class JavaDatasetSuite implements Serializable { } nullabilityCheck.expect(RuntimeException.class); - nullabilityCheck.expectMessage( - "Null value appeared in non-nullable field " + - "test.org.apache.spark.sql.JavaDatasetSuite$SmallBean.b of type int."); + nullabilityCheck.expectMessage("Null value appeared in non-nullable field"); { Row row = new GenericRow(new Object[] { diff --git a/sql/core/src/test/scala/org/apache/spark/sql/DatasetSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/DatasetSuite.scala index 374f4320a9..f9ba607700 100644 --- a/sql/core/src/test/scala/org/apache/spark/sql/DatasetSuite.scala +++ b/sql/core/src/test/scala/org/apache/spark/sql/DatasetSuite.scala @@ -553,9 +553,7 @@ class DatasetSuite extends QueryTest with SharedSQLContext { buildDataset(Row(Row("hello", null))).collect() }.getMessage - assert(message.contains( - "Null value appeared in non-nullable field org.apache.spark.sql.ClassData.b of type Int." - )) + assert(message.contains("Null value appeared in non-nullable field")) } test("SPARK-12478: top level null field") { |