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/11 09:27:21 UTC

[1/2] incubator-carbondata git commit: Fix example

Repository: incubator-carbondata
Updated Branches:
  refs/heads/master 5c476ec40 -> 05c02ef0e


Fix example


Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/532e3c93
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/532e3c93
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/532e3c93

Branch: refs/heads/master
Commit: 532e3c934cd7f0652b6389c32c87a7300fb7494a
Parents: 5c476ec
Author: Zhangshunyu <zh...@huawei.com>
Authored: Sun Dec 11 16:49:35 2016 +0800
Committer: chenliang613 <ch...@apache.org>
Committed: Sun Dec 11 17:23:53 2016 +0800

----------------------------------------------------------------------
 .../scala/org/apache/carbondata/examples/util/ExampleUtils.scala | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/532e3c93/examples/spark/src/main/scala/org/apache/carbondata/examples/util/ExampleUtils.scala
----------------------------------------------------------------------
diff --git a/examples/spark/src/main/scala/org/apache/carbondata/examples/util/ExampleUtils.scala b/examples/spark/src/main/scala/org/apache/carbondata/examples/util/ExampleUtils.scala
index 82387a4..653d78b 100644
--- a/examples/spark/src/main/scala/org/apache/carbondata/examples/util/ExampleUtils.scala
+++ b/examples/spark/src/main/scala/org/apache/carbondata/examples/util/ExampleUtils.scala
@@ -42,8 +42,10 @@ object ExampleUtils {
     println(s"Starting $appName using spark version ${sc.version}")
 
     val cc = new CarbonContext(sc, storeLocation, currentPath + "/target/carbonmetastore")
-    cc.setConf("carbon.kettle.home", kettleHome)
 
+    CarbonProperties.getInstance()
+      .addProperty("carbon.kettle.home", kettleHome)
+      .addProperty("carbon.storelocation", storeLocation)
     // whether use table split partition
     // true -> use table split partition, support multiple partition loading
     // false -> use node split partition, support data load by host partition


[2/2] incubator-carbondata git commit: [CARBONDATA-518]Fix the bug of CarbonExample in spark1.5 moudle This closes #416

Posted by ch...@apache.org.
[CARBONDATA-518]Fix the bug of CarbonExample in spark1.5 moudle This closes #416


Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/05c02ef0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/05c02ef0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/05c02ef0

Branch: refs/heads/master
Commit: 05c02ef0e10ad0b64da28be8927632f8b59f48d4
Parents: 5c476ec 532e3c9
Author: chenliang613 <ch...@apache.org>
Authored: Sun Dec 11 17:27:03 2016 +0800
Committer: chenliang613 <ch...@apache.org>
Committed: Sun Dec 11 17:27:03 2016 +0800

----------------------------------------------------------------------
 .../scala/org/apache/carbondata/examples/util/ExampleUtils.scala | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------