Repository: spark Updated Branches: refs/heads/branch-1.2 07ba50f7e -> 50c02d68a
[SPARK-4274] [SQL] Fix NPE in printing the details of the query plan Author: Cheng Hao <[email protected]> Closes #3139 from chenghao-intel/comparison_test and squashes the following commits: f5d7146 [Cheng Hao] avoid exception in printing the codegen enabled (cherry picked from commit c764d0ac1c6410ca2dd2558cb6bcbe8ad5f02481) Signed-off-by: Michael Armbrust <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/50c02d68 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/50c02d68 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/50c02d68 Branch: refs/heads/branch-1.2 Commit: 50c02d68a7fbc9e91c01fea4997846f46f7ea910 Parents: 07ba50f Author: Cheng Hao <[email protected]> Authored: Mon Nov 10 17:46:05 2014 -0800 Committer: Michael Armbrust <[email protected]> Committed: Mon Nov 10 17:54:22 2014 -0800 ---------------------------------------------------------------------- sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/50c02d68/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala ---------------------------------------------------------------------- diff --git a/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala b/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala index 84eaf40..31cc417 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala @@ -444,7 +444,7 @@ class SQLContext(@transient val sparkContext: SparkContext) |${stringOrError(optimizedPlan)} |== Physical Plan == |${stringOrError(executedPlan)} - |Code Generation: ${executedPlan.codegenEnabled} + |Code Generation: ${stringOrError(executedPlan.codegenEnabled)} |== RDD == """.stripMargin.trim } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
