Repository: spark Updated Branches: refs/heads/branch-2.0 3c6f686f9 -> 1d5615857
[MINOR][SQL] Enhance the exception message if checkpointLocation is not set Enhance the exception message when `checkpointLocation` is not set, previously the message is: ``` java.util.NoSuchElementException: None.get at scala.None$.get(Option.scala:347) at scala.None$.get(Option.scala:345) at org.apache.spark.sql.DataFrameWriter$$anonfun$8.apply(DataFrameWriter.scala:338) at org.apache.spark.sql.DataFrameWriter$$anonfun$8.apply(DataFrameWriter.scala:338) at scala.collection.MapLike$class.getOrElse(MapLike.scala:128) at scala.collection.AbstractMap.getOrElse(Map.scala:59) at org.apache.spark.sql.DataFrameWriter.startStream(DataFrameWriter.scala:337) at org.apache.spark.sql.DataFrameWriter.startStream(DataFrameWriter.scala:277) ... 48 elided ``` This is not so meaningful, so changing to make it more specific. Local verified. Author: jerryshao <[email protected]> Closes #12998 from jerryshao/improve-exception-message. (cherry picked from commit ee6a8d7eaaafafb7eee6f9f2d633759b12732062) Signed-off-by: Andrew Or <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/1d561585 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/1d561585 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/1d561585 Branch: refs/heads/branch-2.0 Commit: 1d561585744be606a181a10c03e705aae4f041c5 Parents: 3c6f686 Author: jerryshao <[email protected]> Authored: Mon May 9 11:13:29 2016 -0700 Committer: Andrew Or <[email protected]> Committed: Mon May 9 11:15:02 2016 -0700 ---------------------------------------------------------------------- .../scala/org/apache/spark/sql/DataFrameWriter.scala | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/1d561585/sql/core/src/main/scala/org/apache/spark/sql/DataFrameWriter.scala ---------------------------------------------------------------------- diff --git a/sql/core/src/main/scala/org/apache/spark/sql/DataFrameWriter.scala b/sql/core/src/main/scala/org/apache/spark/sql/DataFrameWriter.scala index 0793b62..6b1ccbe 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/DataFrameWriter.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/DataFrameWriter.scala @@ -334,9 +334,15 @@ final class DataFrameWriter private[sql](df: DataFrame) { partitionColumns = normalizedParCols.getOrElse(Nil)) val queryName = extraOptions.getOrElse("queryName", StreamExecution.nextName) - val checkpointLocation = extraOptions.getOrElse("checkpointLocation", - new Path(df.sparkSession.sessionState.conf.checkpointLocation.get, queryName).toUri.toString - ) + val checkpointLocation = extraOptions.get("checkpointLocation") + .orElse { + df.sparkSession.sessionState.conf.checkpointLocation.map { l => + new Path(l, queryName).toUri.toString + } + }.getOrElse { + throw new AnalysisException("checkpointLocation must be specified either " + + "through option() or SQLConf") + } df.sparkSession.sessionState.continuousQueryManager.startQuery( queryName, --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
