Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id ECE692009D9 for ; Wed, 18 May 2016 03:02:36 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id EB643160A1F; Wed, 18 May 2016 01:02:36 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 3E6E71609F5 for ; Wed, 18 May 2016 03:02:36 +0200 (CEST) Received: (qmail 93494 invoked by uid 500); 18 May 2016 01:02:35 -0000 Mailing-List: contact commits-help@spark.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@spark.apache.org Received: (qmail 93485 invoked by uid 99); 18 May 2016 01:02:35 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 May 2016 01:02:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 58BC2DFB79; Wed, 18 May 2016 01:02:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yhuai@apache.org To: commits@spark.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: spark git commit: [SPARK-14346] Fix scala-2.10 build Date: Wed, 18 May 2016 01:02:35 +0000 (UTC) archived-at: Wed, 18 May 2016 01:02:37 -0000 Repository: spark Updated Branches: refs/heads/master 25b315e6c -> 2a5db9c14 [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 Closes #13157 from yhuai/SPARK-14346-fix-scala2.10. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/2a5db9c1 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/2a5db9c1 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/2a5db9c1 Branch: refs/heads/master Commit: 2a5db9c140b9d60a5ec91018be19bec7b80850ee Parents: 25b315e Author: Yin Huai Authored: Tue May 17 18:02:31 2016 -0700 Committer: Yin Huai Committed: Tue May 17 18:02:31 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/2a5db9c1/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-unsubscribe@spark.apache.org For additional commands, e-mail: commits-help@spark.apache.org