diff options
author | Prashant Sharma <prashant.s@imaginea.com> | 2015-04-21 14:43:46 -0700 |
---|---|---|
committer | Michael Armbrust <michael@databricks.com> | 2015-04-21 14:43:46 -0700 |
commit | 04bf34e34f22e3d7e972fe755251774fc6a6d52e (patch) | |
tree | d18532d445f94e07a96a477120035373a6d42e12 /sql | |
parent | 45c47fa4176ea75886a58f5d73c44afcb29aa629 (diff) | |
download | spark-04bf34e34f22e3d7e972fe755251774fc6a6d52e.tar.gz spark-04bf34e34f22e3d7e972fe755251774fc6a6d52e.tar.bz2 spark-04bf34e34f22e3d7e972fe755251774fc6a6d52e.zip |
[SPARK-7011] Build(compilation) fails with scala 2.11 option, because a protected[sql] type is accessed in ml package.
[This](https://github.com/apache/spark/blob/master/mllib/src/main/scala/org/apache/spark/ml/feature/VectorAssembler.scala#L58) is where it is used and fails compilations at.
Author: Prashant Sharma <prashant.s@imaginea.com>
Closes #5593 from ScrapCodes/SPARK-7011/build-fix and squashes the following commits:
e6d57a3 [Prashant Sharma] [SPARK-7011] Build fails with scala 2.11 option, because a protected[sql] type is accessed in ml package.
Diffstat (limited to 'sql')
-rw-r--r-- | sql/catalyst/src/main/scala/org/apache/spark/sql/types/dataTypes.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/types/dataTypes.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/types/dataTypes.scala index c6fb22c26b..a108413497 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/types/dataTypes.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/types/dataTypes.scala @@ -299,7 +299,7 @@ class NullType private() extends DataType { case object NullType extends NullType -protected[sql] object NativeType { +protected[spark] object NativeType { val all = Seq( IntegerType, BooleanType, LongType, DoubleType, FloatType, ShortType, ByteType, StringType) @@ -327,7 +327,7 @@ protected[sql] object PrimitiveType { } } -protected[sql] abstract class NativeType extends DataType { +protected[spark] abstract class NativeType extends DataType { private[sql] type JvmType @transient private[sql] val tag: TypeTag[JvmType] private[sql] val ordering: Ordering[JvmType] |