From 26c89312e97997670a9ad643bcb0b796d8aab3a7 Mon Sep 17 00:00:00 2001
From: Josh Rosen <joshrosen@databricks.com>
Date: Thu, 18 Jun 2015 15:21:10 -0700
Subject: [PATCH] Back out some Hive changes that aren't needed anymore

---
 .../SortMergeCompatibilitySuite.scala         |  1 -
 .../UnsafeSortMergeCompatibiltySuite.scala    | 41 -------------------
 2 files changed, 42 deletions(-)
 delete mode 100644 sql/hive/compatibility/src/test/scala/org/apache/spark/sql/hive/execution/UnsafeSortMergeCompatibiltySuite.scala

diff --git a/sql/hive/compatibility/src/test/scala/org/apache/spark/sql/hive/execution/SortMergeCompatibilitySuite.scala b/sql/hive/compatibility/src/test/scala/org/apache/spark/sql/hive/execution/SortMergeCompatibilitySuite.scala
index 7129007cdfbc2..f458567e5d7ea 100644
--- a/sql/hive/compatibility/src/test/scala/org/apache/spark/sql/hive/execution/SortMergeCompatibilitySuite.scala
+++ b/sql/hive/compatibility/src/test/scala/org/apache/spark/sql/hive/execution/SortMergeCompatibilitySuite.scala
@@ -19,7 +19,6 @@ package org.apache.spark.sql.hive.execution
 
 import org.apache.spark.sql.SQLConf
 import org.apache.spark.sql.hive.test.TestHive
-import org.apache.spark.sql.test.TestSQLContext._
 
 /**
  * Runs the test cases that are included in the hive distribution with sort merge join is true.
diff --git a/sql/hive/compatibility/src/test/scala/org/apache/spark/sql/hive/execution/UnsafeSortMergeCompatibiltySuite.scala b/sql/hive/compatibility/src/test/scala/org/apache/spark/sql/hive/execution/UnsafeSortMergeCompatibiltySuite.scala
deleted file mode 100644
index 093ce3504e2c2..0000000000000
--- a/sql/hive/compatibility/src/test/scala/org/apache/spark/sql/hive/execution/UnsafeSortMergeCompatibiltySuite.scala
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.spark.sql.hive.execution
-
-import org.apache.spark.sql.SQLConf
-import org.apache.spark.sql.hive.test.TestHive
-
-/**
- * Runs the test cases that are included in the hive distribution with sort merge join and
- * unsafe external sort enabled.
- */
-class UnsafeSortMergeCompatibiltySuite extends SortMergeCompatibilitySuite {
-  override def beforeAll() {
-    super.beforeAll()
-    TestHive.setConf(SQLConf.CODEGEN_ENABLED, "true")
-    TestHive.setConf(SQLConf.UNSAFE_ENABLED, "true")
-    TestHive.setConf(SQLConf.EXTERNAL_SORT, "true")
-  }
-
-  override def afterAll() {
-    TestHive.setConf(SQLConf.CODEGEN_ENABLED, "false")
-    TestHive.setConf(SQLConf.UNSAFE_ENABLED, "false")
-    TestHive.setConf(SQLConf.EXTERNAL_SORT, "false")
-    super.afterAll()
-  }
-}
\ No newline at end of file