You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ch...@apache.org on 2016/12/29 06:31:04 UTC
[1/2] incubator-carbondata git commit: Fix using carbon commands in
spark shell
Repository: incubator-carbondata
Updated Branches:
refs/heads/master 629061816 -> 9d7afb589
Fix using carbon commands in spark shell
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/efced725
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/efced725
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/efced725
Branch: refs/heads/master
Commit: efced72563696c36dffe94fad729dc3a1792f899
Parents: 6290618
Author: ravipesala <ra...@gmail.com>
Authored: Thu Dec 29 09:33:02 2016 +0530
Committer: chenliang613 <ch...@apache.org>
Committed: Thu Dec 29 14:30:07 2016 +0800
----------------------------------------------------------------------
.../src/main/scala/org/apache/spark/sql/CarbonSession.scala | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/efced725/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonSession.scala
----------------------------------------------------------------------
diff --git a/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonSession.scala b/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonSession.scala
index e654c0e..d5034dd 100644
--- a/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonSession.scala
+++ b/integration/spark2/src/main/scala/org/apache/spark/sql/CarbonSession.scala
@@ -90,7 +90,7 @@ object CarbonSession {
// Get the session from current thread's active session.
var session: SparkSession = SparkSession.getActiveSession match {
- case Some(sparkSession) =>
+ case Some(sparkSession: CarbonSession) =>
if ((sparkSession ne null) && !sparkSession.sparkContext.isStopped) {
options.foreach { case (k, v) => sparkSession.conf.set(k, v) }
sparkSession
@@ -107,7 +107,7 @@ object CarbonSession {
SparkSession.synchronized {
// If the current thread does not have an active session, get it from the global session.
session = SparkSession.getDefaultSession match {
- case Some(sparkSession) =>
+ case Some(sparkSession: CarbonSession) =>
if ((sparkSession ne null) && !sparkSession.sparkContext.isStopped) {
options.foreach { case (k, v) => sparkSession.conf.set(k, v) }
sparkSession
[2/2] incubator-carbondata git commit: [CARBONDATA-577]Fix carbon
commands in spark shell This closes #478
Posted by ch...@apache.org.
[CARBONDATA-577]Fix carbon commands in spark shell This closes #478
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/9d7afb58
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/9d7afb58
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/9d7afb58
Branch: refs/heads/master
Commit: 9d7afb58988b196c5d5b9b6d50046bb8e8d52ebf
Parents: 6290618 efced72
Author: chenliang613 <ch...@apache.org>
Authored: Thu Dec 29 14:30:46 2016 +0800
Committer: chenliang613 <ch...@apache.org>
Committed: Thu Dec 29 14:30:46 2016 +0800
----------------------------------------------------------------------
.../src/main/scala/org/apache/spark/sql/CarbonSession.scala | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------