You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2016/04/26 06:24:17 UTC

spark git commit: [HOTFIX] Fix compilation

Repository: spark
Updated Branches:
  refs/heads/master 18c2c9258 -> d2614eaad


[HOTFIX] Fix compilation


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

Branch: refs/heads/master
Commit: d2614eaadb93a48fba27fe7de64aff942e345f8e
Parents: 18c2c92
Author: Reynold Xin <rx...@databricks.com>
Authored: Mon Apr 25 21:24:06 2016 -0700
Committer: Reynold Xin <rx...@databricks.com>
Committed: Mon Apr 25 21:24:06 2016 -0700

----------------------------------------------------------------------
 .../main/scala/org/apache/spark/sql/hive/HiveContext.scala   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/d2614eaa/sql/hivecontext-compatibility/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala
----------------------------------------------------------------------
diff --git a/sql/hivecontext-compatibility/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala b/sql/hivecontext-compatibility/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala
index 65fcba8..bb76897 100644
--- a/sql/hivecontext-compatibility/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala
+++ b/sql/hivecontext-compatibility/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala
@@ -29,7 +29,7 @@ import org.apache.spark.sql.{SparkSession, SQLContext}
  */
 @deprecated("Use SparkSession.withHiveSupport instead", "2.0.0")
 class HiveContext private[hive](
-    @transient private val sparkSession: SparkSession,
+    sparkSession: SparkSession,
     isRootContext: Boolean)
   extends SQLContext(sparkSession, isRootContext) with Logging {
 
@@ -47,15 +47,15 @@ class HiveContext private[hive](
    * and Hive client (both of execution and metadata) with existing HiveContext.
    */
   override def newSession(): HiveContext = {
-    new HiveContext(sparkSession.newSession(), isRootContext = false)
+    new HiveContext(super.sparkSession.newSession(), isRootContext = false)
   }
 
   protected[sql] override def sessionState: HiveSessionState = {
-    sparkSession.sessionState.asInstanceOf[HiveSessionState]
+    super.sparkSession.sessionState.asInstanceOf[HiveSessionState]
   }
 
   protected[sql] override def sharedState: HiveSharedState = {
-    sparkSession.sharedState.asInstanceOf[HiveSharedState]
+    super.sparkSession.sharedState.asInstanceOf[HiveSharedState]
   }
 
 }


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


Re: spark git commit: [HOTFIX] Fix compilation

Posted by Jacek Laskowski <ja...@japila.pl>.
Thanks Reynold! I was going to ask about that one as it breaks the build for me.

[info] Compiling 1 Scala source to
/Users/jacek/dev/oss/spark/sql/hivecontext-compatibility/target/scala-2.11/classes...
[error] /Users/jacek/dev/oss/spark/sql/hivecontext-compatibility/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala:32:
overriding value sparkSession in class SQLContext of type
org.apache.spark.sql.SparkSession;
[error]  value sparkSession has weaker access privileges; it should
not be private
[error]     @transient private val sparkSession: SparkSession,
[error]                            ^
[error] one error found
[error] Compile failed at Apr 26, 2016 6:28:01 AM [0.449s]


Pozdrawiam,
Jacek Laskowski
----
https://medium.com/@jaceklaskowski/
Mastering Apache Spark http://bit.ly/mastering-apache-spark
Follow me at https://twitter.com/jaceklaskowski


On Tue, Apr 26, 2016 at 6:24 AM,  <rx...@apache.org> wrote:
> Repository: spark
> Updated Branches:
>   refs/heads/master 18c2c9258 -> d2614eaad
>
>
> [HOTFIX] Fix compilation
>
>
> Project: http://git-wip-us.apache.org/repos/asf/spark/repo
> Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/d2614eaa
> Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/d2614eaa
> Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/d2614eaa
>
> Branch: refs/heads/master
> Commit: d2614eaadb93a48fba27fe7de64aff942e345f8e
> Parents: 18c2c92
> Author: Reynold Xin <rx...@databricks.com>
> Authored: Mon Apr 25 21:24:06 2016 -0700
> Committer: Reynold Xin <rx...@databricks.com>
> Committed: Mon Apr 25 21:24:06 2016 -0700
>
> ----------------------------------------------------------------------
>  .../main/scala/org/apache/spark/sql/hive/HiveContext.scala   | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/spark/blob/d2614eaa/sql/hivecontext-compatibility/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala
> ----------------------------------------------------------------------
> diff --git a/sql/hivecontext-compatibility/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala b/sql/hivecontext-compatibility/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala
> index 65fcba8..bb76897 100644
> --- a/sql/hivecontext-compatibility/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala
> +++ b/sql/hivecontext-compatibility/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala
> @@ -29,7 +29,7 @@ import org.apache.spark.sql.{SparkSession, SQLContext}
>   */
>  @deprecated("Use SparkSession.withHiveSupport instead", "2.0.0")
>  class HiveContext private[hive](
> -    @transient private val sparkSession: SparkSession,
> +    sparkSession: SparkSession,
>      isRootContext: Boolean)
>    extends SQLContext(sparkSession, isRootContext) with Logging {
>
> @@ -47,15 +47,15 @@ class HiveContext private[hive](
>     * and Hive client (both of execution and metadata) with existing HiveContext.
>     */
>    override def newSession(): HiveContext = {
> -    new HiveContext(sparkSession.newSession(), isRootContext = false)
> +    new HiveContext(super.sparkSession.newSession(), isRootContext = false)
>    }
>
>    protected[sql] override def sessionState: HiveSessionState = {
> -    sparkSession.sessionState.asInstanceOf[HiveSessionState]
> +    super.sparkSession.sessionState.asInstanceOf[HiveSessionState]
>    }
>
>    protected[sql] override def sharedState: HiveSharedState = {
> -    sparkSession.sharedState.asInstanceOf[HiveSharedState]
> +    super.sparkSession.sharedState.asInstanceOf[HiveSharedState]
>    }
>
>  }
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
> For additional commands, e-mail: commits-help@spark.apache.org
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@spark.apache.org
For additional commands, e-mail: dev-help@spark.apache.org