You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ra...@apache.org on 2016/08/06 10:00:34 UTC
[17/20] incubator-carbondata git commit: Fixed issues after merge
Fixed issues after merge
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/d5b62e21
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/d5b62e21
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/d5b62e21
Branch: refs/heads/master
Commit: d5b62e218f3148bf71458113d92da70f9f00dc0f
Parents: 9759838
Author: ravipesala <ra...@gmail.com>
Authored: Thu Aug 4 19:39:56 2016 +0530
Committer: ravipesala <ra...@gmail.com>
Committed: Thu Aug 4 19:39:56 2016 +0530
----------------------------------------------------------------------
.../carbondata/spark/util/CarbonScalaUtil.scala | 21 ++++++--------------
1 file changed, 6 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/d5b62e21/integration/spark/src/main/scala/org/carbondata/spark/util/CarbonScalaUtil.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/scala/org/carbondata/spark/util/CarbonScalaUtil.scala b/integration/spark/src/main/scala/org/carbondata/spark/util/CarbonScalaUtil.scala
index 8b91745..635418f 100644
--- a/integration/spark/src/main/scala/org/carbondata/spark/util/CarbonScalaUtil.scala
+++ b/integration/spark/src/main/scala/org/carbondata/spark/util/CarbonScalaUtil.scala
@@ -83,21 +83,6 @@ object CarbonScalaUtil extends Logging {
}
}
- def getKettleHomePath(sqlContext: SQLContext): String = {
- val carbonHome = System.getenv("CARBON_HOME")
- var kettleHomePath: String = null
- if (carbonHome != null) {
- kettleHomePath = System.getenv("CARBON_HOME") + "/processing/carbonplugins"
- }
- if (kettleHomePath == null) {
- kettleHomePath = sqlContext.getConf("carbon.kettle.home", null)
- }
- if (null == kettleHomePath) {
- kettleHomePath = CarbonProperties.getInstance.getProperty("carbon.kettle.home")
- }
- kettleHomePath
- }
-
def updateDataType(
currentDataType: org.apache.spark.sql.types.DataType): org.apache.spark.sql.types.DataType = {
currentDataType match {
@@ -133,6 +118,12 @@ object CarbonScalaUtil extends Logging {
if (null == kettleHomePath) {
kettleHomePath = CarbonProperties.getInstance.getProperty("carbon.kettle.home")
}
+ if (null == kettleHomePath) {
+ val carbonHome = System.getenv("CARBON_HOME")
+ if (null != carbonHome) {
+ kettleHomePath = carbonHome + "/processing/carbonplugins"
+ }
+ }
if (kettleHomePath != null) {
val sparkMaster = sqlContext.sparkContext.getConf.get("spark.master").toLowerCase()
// get spark master, if local, need to correct the kettle home