You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2015/05/27 20:54:38 UTC
spark git commit: Removed Guava dependency from JavaTypeInference's
type signature.
Repository: spark
Updated Branches:
refs/heads/master 0db76c90a -> 6fec1a940
Removed Guava dependency from JavaTypeInference's type signature.
This should also close #6243.
Author: Reynold Xin <rx...@databricks.com>
Closes #6431 from rxin/JavaTypeInference-guava and squashes the following commits:
e58df3c [Reynold Xin] Removed Gauva dependency from JavaTypeInference's type signature.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/6fec1a94
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/6fec1a94
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/6fec1a94
Branch: refs/heads/master
Commit: 6fec1a9409b34d8ce58ea1c330b52cc7ef3e7e7e
Parents: 0db76c9
Author: Reynold Xin <rx...@databricks.com>
Authored: Wed May 27 11:54:35 2015 -0700
Committer: Reynold Xin <rx...@databricks.com>
Committed: Wed May 27 11:54:35 2015 -0700
----------------------------------------------------------------------
.../apache/spark/sql/catalyst/JavaTypeInference.scala | 11 ++++++++++-
.../src/main/scala/org/apache/spark/sql/SQLContext.scala | 4 +---
2 files changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/6fec1a94/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/JavaTypeInference.scala
----------------------------------------------------------------------
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/JavaTypeInference.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/JavaTypeInference.scala
index 625c8d3..9a3f969 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/JavaTypeInference.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/JavaTypeInference.scala
@@ -39,11 +39,20 @@ private [sql] object JavaTypeInference {
private val valuesReturnType = classOf[JMap[_, _]].getMethod("values").getGenericReturnType
/**
+ * Infers the corresponding SQL data type of a JavaClean class.
+ * @param beanClass Java type
+ * @return (SQL data type, nullable)
+ */
+ def inferDataType(beanClass: Class[_]): (DataType, Boolean) = {
+ inferDataType(TypeToken.of(beanClass))
+ }
+
+ /**
* Infers the corresponding SQL data type of a Java type.
* @param typeToken Java type
* @return (SQL data type, nullable)
*/
- private [sql] def inferDataType(typeToken: TypeToken[_]): (DataType, Boolean) = {
+ private def inferDataType(typeToken: TypeToken[_]): (DataType, Boolean) = {
// TODO: All of this could probably be moved to Catalyst as it is mostly not Spark specific.
typeToken.getRawType match {
case c: Class[_] if c.isAnnotationPresent(classOf[SQLUserDefinedType]) =>
http://git-wip-us.apache.org/repos/asf/spark/blob/6fec1a94/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala
----------------------------------------------------------------------
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala b/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala
index 3935f7b..15c3035 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala
@@ -27,8 +27,6 @@ import scala.language.implicitConversions
import scala.reflect.runtime.universe.TypeTag
import scala.util.control.NonFatal
-import com.google.common.reflect.TypeToken
-
import org.apache.spark.SparkContext
import org.apache.spark.annotation.{DeveloperApi, Experimental}
import org.apache.spark.api.java.{JavaRDD, JavaSparkContext}
@@ -1011,7 +1009,7 @@ class SQLContext(@transient val sparkContext: SparkContext)
* Returns a Catalyst Schema for the given java bean class.
*/
protected def getSchema(beanClass: Class[_]): Seq[AttributeReference] = {
- val (dataType, _) = JavaTypeInference.inferDataType(TypeToken.of(beanClass))
+ val (dataType, _) = JavaTypeInference.inferDataType(beanClass)
dataType.asInstanceOf[StructType].fields.map { f =>
AttributeReference(f.name, f.dataType, f.nullable)()
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org