@@ -22,6 +22,8 @@ import org.apache.spark.sql.QueryTest
2222import org .apache .spark .sql .Row
2323import org .apache .spark .sql .hive .test .TestHive ._
2424import org .apache .spark .sql .types ._
25+ import org .apache .spark .util .Utils
26+ import org .apache .spark .sql .hive .HiveShim
2527
2628case class Nested1 (f1 : Nested2 )
2729case class Nested2 (f2 : Nested3 )
@@ -69,17 +71,6 @@ class SQLQuerySuite extends QueryTest {
6971 """ CREATE TABLE IF NOT EXISTS ctas4 AS
7072 | SELECT key, value FROM src ORDER BY key, value""" .stripMargin).collect()
7173
72- sql(
73- """ CREATE TABLE ctas5
74- | ROW FORMAT SERDE 'org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe'
75- | STORED AS
76- | INPUTFORMAT 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat'
77- | OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat'
78- | AS
79- | SELECT key, value
80- | FROM src
81- | ORDER BY key, value""" .stripMargin).collect
82-
8374 checkAnswer(
8475 sql(" SELECT k, value FROM ctas1 ORDER BY k, value" ),
8576 sql(" SELECT key, value FROM src ORDER BY key, value" ).collect().toSeq)
@@ -106,12 +97,21 @@ class SQLQuerySuite extends QueryTest {
10697 sql(" SELECT key, value FROM ctas4 ORDER BY key, value" ),
10798 sql(" SELECT key, value FROM ctas4 LIMIT 1" ).collect().toSeq)
10899
109- // use the Hive SerDe for parquet tables
110- sql(" set spark.sql.hive.convertMetastoreParquet = false" )
111- checkAnswer(
112- sql(" SELECT key, value FROM ctas5 ORDER BY key, value" ),
113- sql(" SELECT key, value FROM src ORDER BY key, value" ).collect().toSeq)
114- sql(" set spark.sql.hive.convertMetastoreParquet = true" )
100+ if (HiveShim .version == " 0.13.1" ) {
101+ sql(
102+ """ CREATE TABLE ctas5
103+ | STORED AS parquet AS
104+ | SELECT key, value
105+ | FROM src
106+ | ORDER BY key, value""" .stripMargin).collect
107+
108+ // use the Hive SerDe for parquet tables
109+ sql(" set spark.sql.hive.convertMetastoreParquet = false" )
110+ checkAnswer(
111+ sql(" SELECT key, value FROM ctas5 ORDER BY key, value" ),
112+ sql(" SELECT key, value FROM src ORDER BY key, value" ).collect().toSeq)
113+ sql(" set spark.sql.hive.convertMetastoreParquet = true" )
114+ }
115115
116116 checkExistence(sql(" DESC EXTENDED ctas2" ), true ,
117117 " name:key" , " type:string" , " name:value" , " ctas2" ,
0 commit comments