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/11/21 00:38:07 UTC
spark git commit: [SPARK-11890][SQL] Fix compilation for Scala 2.11
Repository: spark
Updated Branches:
refs/heads/master 968acf3bd -> 68ed04683
[SPARK-11890][SQL] Fix compilation for Scala 2.11
Author: Michael Armbrust <mi...@databricks.com>
Closes #9871 from marmbrus/scala211-break.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/68ed0468
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/68ed0468
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/68ed0468
Branch: refs/heads/master
Commit: 68ed046836975b492b594967256d3c7951b568a5
Parents: 968acf3
Author: Michael Armbrust <mi...@databricks.com>
Authored: Fri Nov 20 15:38:04 2015 -0800
Committer: Michael Armbrust <mi...@databricks.com>
Committed: Fri Nov 20 15:38:04 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/68ed0468/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 918050b..4a4a62e 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.
*/
- private def silentSchemaFor(tpe: `Type`): Schema = try {
+ protected def silentSchemaFor(tpe: `Type`): Schema = try {
schemaFor(tpe)
} catch {
case _: UnsupportedOperationException => Schema(NullType, nullable = true)
}
/** Returns the full class name for a type. */
- private def getClassNameFromType(tpe: `Type`): String = {
+ protected def getClassNameFromType(tpe: `Type`): String = {
tpe.erasure.typeSymbol.asClass.fullName
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org