You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ma...@apache.org on 2015/04/21 23:43:50 UTC
spark git commit: [SPARK-7011] Build(compilation) fails with scala
2.11 option, because a protected[sql] type is accessed in ml package.
Repository: spark
Updated Branches:
refs/heads/master 45c47fa41 -> 04bf34e34
[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 <pr...@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.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/04bf34e3
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/04bf34e3
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/04bf34e3
Branch: refs/heads/master
Commit: 04bf34e34f22e3d7e972fe755251774fc6a6d52e
Parents: 45c47fa
Author: Prashant Sharma <pr...@imaginea.com>
Authored: Tue Apr 21 14:43:46 2015 -0700
Committer: Michael Armbrust <mi...@databricks.com>
Committed: Tue Apr 21 14:43:46 2015 -0700
----------------------------------------------------------------------
.../src/main/scala/org/apache/spark/sql/types/dataTypes.scala | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/04bf34e3/sql/catalyst/src/main/scala/org/apache/spark/sql/types/dataTypes.scala
----------------------------------------------------------------------
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 c6fb22c..a108413 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]
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org