From c1658cbed07c9cb47108be866cdec892e845f7ad Mon Sep 17 00:00:00 2001 From: Marcelo Vanzin Date: Mon, 18 May 2015 13:22:28 -0700 Subject: [PATCH] [minor] [sql] Partial revert of e683182c3e. Moving this file to a different module breaks the maven build; because it exposes a Guava type in an API used from a different module, unit tests that end up calling into this code will fail because Guava is shaded in the maven build. --- .../main/scala/org/apache/spark/sql}/JavaTypeInference.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename sql/{catalyst/src/main/scala/org/apache/spark/sql/catalyst => core/src/main/scala/org/apache/spark/sql}/JavaTypeInference.scala (99%) diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/JavaTypeInference.scala b/sql/core/src/main/scala/org/apache/spark/sql/JavaTypeInference.scala similarity index 99% rename from sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/JavaTypeInference.scala rename to sql/core/src/main/scala/org/apache/spark/sql/JavaTypeInference.scala index 625c8d3a6212..e4a77e87c1c1 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/JavaTypeInference.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/JavaTypeInference.scala @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.spark.sql.catalyst +package org.apache.spark.sql import java.beans.Introspector import java.lang.{Iterable => JIterable}