spark git commit: [SPARK-11819][SQL][FOLLOW-UP] fix scala 2.11 build

2015-11-20 Thread rxin 
Repository: spark
Updated Branches:
  refs/heads/branch-1.6 33d856df5 -> 95dfac0dd


[SPARK-11819][SQL][FOLLOW-UP] fix scala 2.11 build

seems scala 2.11 doesn't support: define private methods in `trait xxx` and use 
it in `object xxx extend xxx`.

Author: Wenchen Fan 

Closes #9879 from cloud-fan/follow.

(cherry picked from commit 7d3f922c4ba76c4193f98234ae662065c39cdfb1)
Signed-off-by: Reynold Xin 


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/95dfac0d
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/95dfac0d
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/95dfac0d

Branch: refs/heads/branch-1.6
Commit: 95dfac0dd073680f20ce94a3abb95d12684c8e1d
Parents: 33d856d
Author: Wenchen Fan 
Authored: Fri Nov 20 23:31:19 2015 -0800
Committer: Reynold Xin 
Committed: Fri Nov 20 23:31:39 2015 -0800

--
 .../scala/org/apache/spark/sql/catalyst/ScalaReflection.scala| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/95dfac0d/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/ScalaReflection.scala
--
diff --git 
a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/ScalaReflection.scala
 
b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/ScalaReflection.scala
index 4a4a62e..476bece 100644
--- 
a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/ScalaReflection.scala
+++ 
b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/ScalaReflection.scala
@@ -670,14 +670,14 @@ trait ScalaReflection {
* Unlike `schemaFor`, this method won't throw exception for un-supported 
type, it will return
* `NullType` silently instead.
*/
-  protected def silentSchemaFor(tpe: `Type`): Schema = try {
+  def silentSchemaFor(tpe: `Type`): Schema = try {
 schemaFor(tpe)
   } catch {
 case _: UnsupportedOperationException => Schema(NullType, nullable = true)
   }
 
   /** Returns the full class name for a type. */
-  protected def getClassNameFromType(tpe: `Type`): String = {
+  def getClassNameFromType(tpe: `Type`): String = {
 tpe.erasure.typeSymbol.asClass.fullName
   }
 


-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org

spark git commit: [SPARK-11819][SQL][FOLLOW-UP] fix scala 2.11 build

2015-11-20 Thread rxin 
Repository: spark
Updated Branches:
  refs/heads/master a2dce22e0 -> 7d3f922c4


[SPARK-11819][SQL][FOLLOW-UP] fix scala 2.11 build

seems scala 2.11 doesn't support: define private methods in `trait xxx` and use 
it in `object xxx extend xxx`.

Author: Wenchen Fan 

Closes #9879 from cloud-fan/follow.


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/7d3f922c
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/7d3f922c
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/7d3f922c

Branch: refs/heads/master
Commit: 7d3f922c4ba76c4193f98234ae662065c39cdfb1
Parents: a2dce22
Author: Wenchen Fan 
Authored: Fri Nov 20 23:31:19 2015 -0800
Committer: Reynold Xin 
Committed: Fri Nov 20 23:31:19 2015 -0800

--
 .../scala/org/apache/spark/sql/catalyst/ScalaReflection.scala| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/7d3f922c/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/ScalaReflection.scala
--
diff --git 
a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/ScalaReflection.scala
 
b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/ScalaReflection.scala
index 4a4a62e..476bece 100644
--- 
a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/ScalaReflection.scala
+++ 
b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/ScalaReflection.scala
@@ -670,14 +670,14 @@ trait ScalaReflection {
* Unlike `schemaFor`, this method won't throw exception for un-supported 
type, it will return
* `NullType` silently instead.
*/
-  protected def silentSchemaFor(tpe: `Type`): Schema = try {
+  def silentSchemaFor(tpe: `Type`): Schema = try {
 schemaFor(tpe)
   } catch {
 case _: UnsupportedOperationException => Schema(NullType, nullable = true)
   }
 
   /** Returns the full class name for a type. */
-  protected def getClassNameFromType(tpe: `Type`): String = {
+  def getClassNameFromType(tpe: `Type`): String = {
 tpe.erasure.typeSymbol.asClass.fullName
   }
 


-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org