diff options
| author | Reynold Xin <rxin@databricks.com> | 2017-04-12 09:05:05 -0700 |
|---|---|---|
| committer | Xiao Li <gatorsmile@gmail.com> | 2017-04-12 09:05:05 -0700 |
| commit | 540855382c8f139fbf4eb0800b31c7ce91f29c7f (patch) | |
| tree | d4e4be7de032dae3cc5700c8bacda825b6fa4e4a | |
| parent | 504e62e2f4b7df7e002ea014a855cebe1ff95193 (diff) | |
| download | spark-540855382c8f139fbf4eb0800b31c7ce91f29c7f.tar.gz spark-540855382c8f139fbf4eb0800b31c7ce91f29c7f.tar.bz2 spark-540855382c8f139fbf4eb0800b31c7ce91f29c7f.zip | |
[SPARK-20304][SQL] AssertNotNull should not include path in string representation
## What changes were proposed in this pull request?
AssertNotNull's toString/simpleString dumps the entire walkedTypePath. walkedTypePath is used for error message reporting and shouldn't be part of the output.
## How was this patch tested?
Manually tested.
Author: Reynold Xin <rxin@databricks.com>
Closes #17616 from rxin/SPARK-20304.
| -rw-r--r-- | sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/objects/objects.scala | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/objects/objects.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/objects/objects.scala index 6d94764f1b..eed773d4cb 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/objects/objects.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/objects/objects.scala @@ -996,6 +996,8 @@ case class AssertNotNull(child: Expression, walkedTypePath: Seq[String] = Nil) override def foldable: Boolean = false override def nullable: Boolean = false + override def flatArguments: Iterator[Any] = Iterator(child) + private val errMsg = "Null value appeared in non-nullable field:" + walkedTypePath.mkString("\n", "\n", "\n") + "If the schema is inferred from a Scala tuple/case class, or a Java bean, " + |