You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ma...@apache.org on 2014/11/11 02:54:07 UTC
spark git commit: [SPARK-4274] [SQL] Fix NPE in printing the details
of the query plan
Repository: spark
Updated Branches:
refs/heads/master ce6ed2abd -> c764d0ac1
[SPARK-4274] [SQL] Fix NPE in printing the details of the query plan
Author: Cheng Hao <ha...@intel.com>
Closes #3139 from chenghao-intel/comparison_test and squashes the following commits:
f5d7146 [Cheng Hao] avoid exception in printing the codegen enabled
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/c764d0ac
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/c764d0ac
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/c764d0ac
Branch: refs/heads/master
Commit: c764d0ac1c6410ca2dd2558cb6bcbe8ad5f02481
Parents: ce6ed2a
Author: Cheng Hao <ha...@intel.com>
Authored: Mon Nov 10 17:46:05 2014 -0800
Committer: Michael Armbrust <mi...@databricks.com>
Committed: Mon Nov 10 17:46:05 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/c764d0ac/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: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org