[SPARK-7011] Build fails with scala 2.11 option, because a protected[sql] type is accessed in ml package.

ScrapCodes · ScrapCodes · commit e6d57a33f54e · 2015-04-20T17:22:08.000+05:30
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
@@ -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]

Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,7 @@ class NullType private() extends DataType {`
`299`	`299`	`case object NullType extends NullType`
`300`	`300`
`301`	`301`
`302`		`-protected[sql] object NativeType {`
	`302`	`+protected[spark] object NativeType {`
`303`	`303`	`val all = Seq(`
`304`	`304`	`IntegerType, BooleanType, LongType, DoubleType, FloatType, ShortType, ByteType, StringType)`
`305`	`305`
`@@ -327,7 +327,7 @@ protected[sql] object PrimitiveType {`
`327`	`327`	`}`
`328`	`328`	`}`
`329`	`329`
`330`		`-protected[sql] abstract class NativeType extends DataType {`
	`330`	`+protected[spark] abstract class NativeType extends DataType {`
`331`	`331`	`private[sql] type JvmType`
`332`	`332`	`@transient private[sql] val tag: TypeTag[JvmType]`
`333`	`333`	`private[sql] val ordering: Ordering[JvmType]`