From 162007913f962910d40be7f03a39cf2541ab8dcc Mon Sep 17 00:00:00 2001
From: Michael Armbrust <michael@databricks.com>
Date: Mon, 18 Aug 2014 11:55:57 -0700
Subject: [PATCH] Revert "remove hive parquet bundle"

This reverts commit 41ebc5f912093fdf7b21808ce19da1bae514435e.

Conflicts:
	sql/hive/src/main/scala/org/apache/spark/sql/hive/parquet/FakeParquetSerDe.scala
---
 .../spark/sql/parquet/ParquetMetastoreSuite.scala      | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/parquet/ParquetMetastoreSuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/parquet/ParquetMetastoreSuite.scala
index 8bc4b7927fd34..0723be7298e15 100644
--- a/sql/hive/src/test/scala/org/apache/spark/sql/parquet/ParquetMetastoreSuite.scala
+++ b/sql/hive/src/test/scala/org/apache/spark/sql/parquet/ParquetMetastoreSuite.scala
@@ -63,7 +63,10 @@ class ParquetMetastoreSuite extends QueryTest with BeforeAndAfterAll {
       stringField STRING
     )
     PARTITIONED BY (p int)
-    ROW FORMAT SERDE 'org.apache.spark.sql.hive.parquet.FakeParquetSerDe'
+    ROW FORMAT SERDE 'org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe'
+     STORED AS
+     INPUTFORMAT 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat'
+     OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat'
     location '${partitionedTableDir.getCanonicalPath}'
     """)
 
@@ -73,7 +76,10 @@ class ParquetMetastoreSuite extends QueryTest with BeforeAndAfterAll {
       intField INT,
       stringField STRING
     )
-    ROW FORMAT SERDE 'org.apache.spark.sql.hive.parquet.FakeParquetSerDe'
+    ROW FORMAT SERDE 'org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe'
+     STORED AS
+     INPUTFORMAT 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat'
+     OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat'
     location '${new File(partitionedTableDir, "p=1").getCanonicalPath}'
     """)