Skip to content

Branch 2.2 merge #232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
csd-jenkins merged 14 commits into from
May 15, 2018
Merged

Branch 2.2 merge #232

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e957c4e
[SPARK-23816][CORE] Killed tasks should ignore FetchFailures.
squito Apr 9, 2018
a902323
[SPARK-24007][SQL] EqualNullSafe for FloatType and DoubleType might g…
ueshin Apr 18, 2018
041aec4
[SPARK-23963][SQL] Properly handle large number of columns in query o…
bersprockets Apr 13, 2018
e77d62a
[MINOR][DOCS] Fix comments of SQLExecution#withExecutionId
seancxmao Apr 24, 2018
4f1ae3a
[SPARK-23941][MESOS] Mesos task failed on specific spark app name
BounkongK May 1, 2018
154bbc9
[SPARK-23433][CORE] Late zombie task completions update all tasksets
squito May 3, 2018
768d0b7
[SPARK-23489][SQL][TEST][BRANCH-2.2] HiveExternalCatalogVersionsSuite…
dongjoon-hyun May 4, 2018
866270e
[SPARK-23697][CORE] LegacyAccumulatorWrapper should define isZero cor…
cloud-fan May 4, 2018
f9d6a16
[SPARK-21278][PYSPARK] Upgrade to Py4J 0.10.6
dongjoon-hyun Jul 5, 2017
23e7935
[SPARK-16406][SQL] Improve performance of LogicalPlan.resolve
hvanhovell May 7, 2018
850b7d8
[PYSPARK] Update py4j to version 0.10.7.
Apr 13, 2018
f96d13d
[SPARKR] Match pyspark features in SparkR communication protocol.
Apr 17, 2018
89f2eb9
Keep old-style messages for AnalysisException with ambiguous references
markhamstra May 14, 2018
8955592
Merge branch 'branch-2.2' of github.com:apache/spark into branch-2.2-…
markhamstra May 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Keep old-style messages for AnalysisException with ambiguous references
  • Loading branch information
@markhamstra
markhamstra committed May 14, 2018
commit 89f2eb959fc670377e7690eb57f0c3f197b21e9c
2 changes: 1 addition & 1 deletion sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/package.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ package object expressions {

case ambiguousReferences =>
// More than one match.
val referenceNames = ambiguousReferences.map(_.qualifiedName).mkString(", ")
val referenceNames = ambiguousReferences.mkString(", ")
throw new AnalysisException(s"Reference '$name' is ambiguous, could be: $referenceNames.")
}
}
Expand Down