[SPARK-4274] [SQL] Fix NPE in printing the details of the query plan

chenghao-intel · marmbrus · commit 50c02d68a7fb · 2014-11-10T17:54:22.000-08:00
Author: Cheng Hao <hao.cheng@intel.com> 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 c764d0a) Signed-off-by: Michael Armbrust <michael@databricks.com>
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
@@ -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
   }

Original file line number	Diff line number	Diff line change
`@@ -444,7 +444,7 @@ class SQLContext(@transient val sparkContext: SparkContext)`
`444`	`444`	`\|${stringOrError(optimizedPlan)}`
`445`	`445`	`\|== Physical Plan ==`
`446`	`446`	`\|${stringOrError(executedPlan)}`
`447`		`- \|Code Generation: ${executedPlan.codegenEnabled}`
	`447`	`+ \|Code Generation: ${stringOrError(executedPlan.codegenEnabled)}`
`448`	`448`	`\|== RDD ==`
`449`	`449`	`""".stripMargin.trim`
`450`	`450`	`}`