aboutsummaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorCheng Hao <hao.cheng@intel.com>2014-11-10 17:46:05 -0800
committerMichael Armbrust <michael@databricks.com>2014-11-10 17:54:22 -0800
commit50c02d68a7fbc9e91c01fea4997846f46f7ea910 (patch)
tree9ff712492bd0078e6b7a8f68c6c257badc1613cc /sql
parent07ba50f7eff3db68f120d979a5f0ca37cb2a886e (diff)
downloadspark-50c02d68a7fbc9e91c01fea4997846f46f7ea910.tar.gz
spark-50c02d68a7fbc9e91c01fea4997846f46f7ea910.tar.bz2
spark-50c02d68a7fbc9e91c01fea4997846f46f7ea910.zip
[SPARK-4274] [SQL] Fix NPE in printing the details of the query plan
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 c764d0ac1c6410ca2dd2558cb6bcbe8ad5f02481) Signed-off-by: Michael Armbrust <michael@databricks.com>
Diffstat (limited to 'sql')
-rw-r--r--sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala2
1 files changed, 1 insertions, 1 deletions
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 84eaf401f2..31cc4170aa 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
}