Return-Path: X-Original-To: apmail-spark-commits-archive@minotaur.apache.org Delivered-To: apmail-spark-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4C91618A69 for ; Mon, 27 Jul 2015 20:28:21 +0000 (UTC) Received: (qmail 69267 invoked by uid 500); 27 Jul 2015 20:28:18 -0000 Delivered-To: apmail-spark-commits-archive@spark.apache.org Received: (qmail 69240 invoked by uid 500); 27 Jul 2015 20:28:18 -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 69231 invoked by uid 99); 27 Jul 2015 20:28:18 -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; Mon, 27 Jul 2015 20:28:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1DB49E04B0; Mon, 27 Jul 2015 20:28:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rxin@apache.org To: commits@spark.apache.org Message-Id: <97df92fa92fd46c2b92b023e62cc39ec@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: spark git commit: [SPARK-9378] [SQL] Fixes test case "CTAS with serde" Date: Mon, 27 Jul 2015 20:28:18 +0000 (UTC) Repository: spark Updated Branches: refs/heads/master 55946e76f -> 8e7d2bee2 [SPARK-9378] [SQL] Fixes test case "CTAS with serde" This is a proper version of PR #7693 authored by viirya The reason why "CTAS with serde" fails is that the `MetastoreRelation` gets converted to a Parquet data source relation by default. Author: Cheng Lian Closes #7700 from liancheng/spark-9378-fix-ctas-test and squashes the following commits: 4413af0 [Cheng Lian] Fixes test case "CTAS with serde" Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/8e7d2bee Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/8e7d2bee Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/8e7d2bee Branch: refs/heads/master Commit: 8e7d2bee23dad1535846dae2dc31e35058db16cd Parents: 55946e7 Author: Cheng Lian Authored: Mon Jul 27 13:28:03 2015 -0700 Committer: Reynold Xin Committed: Mon Jul 27 13:28:03 2015 -0700 ---------------------------------------------------------------------- .../spark/sql/hive/execution/SQLQuerySuite.scala | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/8e7d2bee/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/SQLQuerySuite.scala ---------------------------------------------------------------------- diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/SQLQuerySuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/SQLQuerySuite.scala index 8371dd0..c4923d8 100644 --- a/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/SQLQuerySuite.scala +++ b/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/SQLQuerySuite.scala @@ -406,13 +406,15 @@ class SQLQuerySuite extends QueryTest with SQLTestUtils { | FROM src | ORDER BY key, value""".stripMargin).collect() - checkExistence(sql("DESC EXTENDED ctas5"), true, - "name:key", "type:string", "name:value", "ctas5", - "org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat", - "org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat", - "org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe", - "MANAGED_TABLE" - ) + withSQLConf(HiveContext.CONVERT_METASTORE_PARQUET.key -> "false") { + checkExistence(sql("DESC EXTENDED ctas5"), true, + "name:key", "type:string", "name:value", "ctas5", + "org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat", + "org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat", + "org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe", + "MANAGED_TABLE" + ) + } // use the Hive SerDe for parquet tables withSQLConf(HiveContext.CONVERT_METASTORE_PARQUET.key -> "false") { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org For additional commands, e-mail: commits-help@spark.apache.org