You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by hv...@apache.org on 2016/12/06 13:51:47 UTC
spark git commit: [SPARK-18634][SQL][TRIVIAL] Touch-up Generate
Repository: spark
Updated Branches:
refs/heads/master 7863c6237 -> 381ef4ea7
[SPARK-18634][SQL][TRIVIAL] Touch-up Generate
## What changes were proposed in this pull request?
I jumped the gun on merging https://github.com/apache/spark/pull/16120, and missed a tiny potential problem. This PR fixes that by changing a val into a def; this should prevent potential serialization/initialization weirdness from happening.
## How was this patch tested?
Existing tests.
Author: Herman van Hovell <hv...@databricks.com>
Closes #16170 from hvanhovell/SPARK-18634.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/381ef4ea
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/381ef4ea
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/381ef4ea
Branch: refs/heads/master
Commit: 381ef4ea76b0920e05c81adb44b1fef88bee5d25
Parents: 7863c62
Author: Herman van Hovell <hv...@databricks.com>
Authored: Tue Dec 6 05:51:39 2016 -0800
Committer: Herman van Hovell <hv...@databricks.com>
Committed: Tue Dec 6 05:51:39 2016 -0800
----------------------------------------------------------------------
.../spark/sql/catalyst/plans/logical/basicLogicalOperators.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/381ef4ea/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/basicLogicalOperators.scala
----------------------------------------------------------------------
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/basicLogicalOperators.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/basicLogicalOperators.scala
index 324662e..c210b74 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/basicLogicalOperators.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/basicLogicalOperators.scala
@@ -93,7 +93,7 @@ case class Generate(
override def producedAttributes: AttributeSet = AttributeSet(generatorOutput)
- val qualifiedGeneratorOutput: Seq[Attribute] = qualifier.map { q =>
+ def qualifiedGeneratorOutput: Seq[Attribute] = qualifier.map { q =>
// prepend the new qualifier to the existed one
generatorOutput.map(a => a.withQualifier(Some(q)))
}.getOrElse(generatorOutput)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org