[SPARK-9758] [TEST] [SQL] Compilation issue for hive test / wrong pac…

…kage? Move `test.org.apache.spark.sql.hive` package tests to apparent intended `org.apache.spark.sql.hive` as they don't intend to test behavior from outside org.apache.spark.* Alternate take, per discussion at apache/spark#8051 I think this is what vanzin and I had in mind but also CC rxin to cross-check, as this does indeed depend on whether these tests were accidentally in this package or not. Testing from a `test.org.apache.spark` package is legitimate but didn't seem to be the intent here. Author: Sean Owen <[email protected]> Closes #8307 from srowen/SPARK-9758.
kiszk · Aug 24, 2015 · cb2d2e1 · cb2d2e1
1 parent a2f4cdc
commit cb2d2e1
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 9 deletions.
diff --git a/...he/spark/sql/hive/JavaDataFrameSuite.java → ...he/spark/sql/hive/JavaDataFrameSuite.java b/...he/spark/sql/hive/JavaDataFrameSuite.java → ...he/spark/sql/hive/JavaDataFrameSuite.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package test.org.apache.spark.sql.hive;
+package org.apache.spark.sql.hive;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -31,10 +31,8 @@
 import org.apache.spark.sql.expressions.Window;
 import org.apache.spark.sql.expressions.UserDefinedAggregateFunction;
 import static org.apache.spark.sql.functions.*;
-import org.apache.spark.sql.hive.HiveContext;
 import org.apache.spark.sql.hive.test.TestHive$;
-import org.apache.spark.sql.expressions.UserDefinedAggregateFunction;
-import test.org.apache.spark.sql.hive.aggregate.MyDoubleSum;
+import org.apache.spark.sql.hive.aggregate.MyDoubleSum;
 
 public class JavaDataFrameSuite {
   private transient JavaSparkContext sc;

diff --git a/...l/hive/JavaMetastoreDataSourcesSuite.java → ...l/hive/JavaMetastoreDataSourcesSuite.java b/...l/hive/JavaMetastoreDataSourcesSuite.java → ...l/hive/JavaMetastoreDataSourcesSuite.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package test.org.apache.spark.sql.hive;
+package org.apache.spark.sql.hive;
 
 import java.io.File;
 import java.io.IOException;
@@ -37,7 +37,6 @@
 import org.apache.spark.sql.DataFrame;
 import org.apache.spark.sql.QueryTest$;
 import org.apache.spark.sql.Row;
-import org.apache.spark.sql.hive.HiveContext;
 import org.apache.spark.sql.hive.test.TestHive$;
 import org.apache.spark.sql.types.DataTypes;
 import org.apache.spark.sql.types.StructField;

diff --git a/...spark/sql/hive/aggregate/MyDoubleAvg.java → ...spark/sql/hive/aggregate/MyDoubleAvg.java b/...spark/sql/hive/aggregate/MyDoubleAvg.java → ...spark/sql/hive/aggregate/MyDoubleAvg.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package test.org.apache.spark.sql.hive.aggregate;
+package org.apache.spark.sql.hive.aggregate;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...spark/sql/hive/aggregate/MyDoubleSum.java → ...spark/sql/hive/aggregate/MyDoubleSum.java b/...spark/sql/hive/aggregate/MyDoubleSum.java → ...spark/sql/hive/aggregate/MyDoubleSum.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package test.org.apache.spark.sql.hive.aggregate;
+package org.apache.spark.sql.hive.aggregate;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...ql/hive/execution/UDFIntegerToString.java → ...ql/hive/execution/UDFIntegerToString.java b/...ql/hive/execution/UDFIntegerToString.java → ...ql/hive/execution/UDFIntegerToString.java
diff --git a/...rk/sql/hive/execution/UDFListListInt.java → ...rk/sql/hive/execution/UDFListListInt.java b/...rk/sql/hive/execution/UDFListListInt.java → ...rk/sql/hive/execution/UDFListListInt.java
diff --git a/...ark/sql/hive/execution/UDFListString.java → ...ark/sql/hive/execution/UDFListString.java b/...ark/sql/hive/execution/UDFListString.java → ...ark/sql/hive/execution/UDFListString.java
diff --git a/...k/sql/hive/execution/UDFStringString.java → ...k/sql/hive/execution/UDFStringString.java b/...k/sql/hive/execution/UDFStringString.java → ...k/sql/hive/execution/UDFStringString.java
diff --git a/...rk/sql/hive/execution/UDFTwoListList.java → ...rk/sql/hive/execution/UDFTwoListList.java b/...rk/sql/hive/execution/UDFTwoListList.java → ...rk/sql/hive/execution/UDFTwoListList.java
diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/AggregationQuerySuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/AggregationQuerySuite.scala
@@ -24,7 +24,7 @@ import org.apache.spark.sql.execution.aggregate
 import org.apache.spark.sql.hive.test.TestHive
 import org.apache.spark.sql.test.SQLTestUtils
 import org.apache.spark.sql.types.{IntegerType, StringType, StructField, StructType}
-import _root_.test.org.apache.spark.sql.hive.aggregate.{MyDoubleAvg, MyDoubleSum}
+import org.apache.spark.sql.hive.aggregate.{MyDoubleAvg, MyDoubleSum}
 
 abstract class AggregationQuerySuite extends QueryTest with SQLTestUtils with BeforeAndAfterAll {
   override def _sqlContext: SQLContext = TestHive