Repository: spark Updated Branches: refs/heads/branch-2.0 2dddec40d -> 1db37417c
[SPARK-14346] Fix scala-2.10 build ## What changes were proposed in this pull request? Scala 2.10 build was broken by #13079. I am reverting the change of that line. Author: Yin Huai <yh...@databricks.com> Closes #13157 from yhuai/SPARK-14346-fix-scala2.10. (cherry picked from commit 2a5db9c140b9d60a5ec91018be19bec7b80850ee) Signed-off-by: Yin Huai <yh...@databricks.com> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/1db37417 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/1db37417 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/1db37417 Branch: refs/heads/branch-2.0 Commit: 1db37417c25429c0001c19d2f10f4a314fe4585c Parents: 2dddec4 Author: Yin Huai <yh...@databricks.com> Authored: Tue May 17 18:02:31 2016 -0700 Committer: Yin Huai <yh...@databricks.com> Committed: Tue May 17 18:02:45 2016 -0700 ---------------------------------------------------------------------- .../scala/org/apache/spark/sql/catalyst/catalog/interface.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/1db37417/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/interface.scala ---------------------------------------------------------------------- diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/interface.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/interface.scala index d4f5cbb..3fdd411 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/interface.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/interface.scala @@ -208,6 +208,6 @@ case class SimpleCatalogRelation( } require( - metadata.identifier.database.contains(databaseName), + metadata.identifier.database == Some(databaseName), "provided database does not match the one specified in the table definition") } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
