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 2017/03/13 05:45:03 UTC
[1/2] incubator-carbondata git commit: remove kettle related code in
CarbonExample.scala
Repository: incubator-carbondata
Updated Branches:
refs/heads/master cb2c2a3a2 -> 63bf4e0de
remove kettle related code in CarbonExample.scala
kettle will be removed in the future,so remove kettle related code in CarbonExample.scala to make the example simpler.
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/7901da64
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/7901da64
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/7901da64
Branch: refs/heads/master
Commit: 7901da6413b108364c98baf35156260ff42a3702
Parents: cb2c2a3
Author: sehriff <13...@qq.com>
Authored: Sun Mar 12 10:33:14 2017 +0800
Committer: chenliang613 <ch...@huawei.com>
Committed: Mon Mar 13 13:43:42 2017 +0800
----------------------------------------------------------------------
.../apache/carbondata/examples/CarbonExample.scala | 16 +---------------
1 file changed, 1 insertion(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/7901da64/examples/spark/src/main/scala/org/apache/carbondata/examples/CarbonExample.scala
----------------------------------------------------------------------
diff --git a/examples/spark/src/main/scala/org/apache/carbondata/examples/CarbonExample.scala b/examples/spark/src/main/scala/org/apache/carbondata/examples/CarbonExample.scala
index abf3aa9..b1d9e41 100644
--- a/examples/spark/src/main/scala/org/apache/carbondata/examples/CarbonExample.scala
+++ b/examples/spark/src/main/scala/org/apache/carbondata/examples/CarbonExample.scala
@@ -44,7 +44,7 @@ object CarbonExample {
// Currently there are two data loading flows in CarbonData, one uses Kettle as ETL tool
// in each node to do data loading, another uses a multi-thread framework without Kettle (See
// AbstractDataLoadProcessorStep)
- // Load data with Kettle
+ // Load data
cc.sql(s"""
LOAD DATA LOCAL INPATH '$testData' into table t3
""")
@@ -57,20 +57,6 @@ object CarbonExample {
GROUP BY country
""").show()
- // Load data without kettle
- cc.sql(s"""
- LOAD DATA LOCAL INPATH '$testData' into table t3
- OPTIONS('USE_KETTLE'='false')
- """)
-
- // Perform a query
- cc.sql("""
- SELECT country, count(salary) AS amount
- FROM t3
- WHERE country IN ('china','france')
- GROUP BY country
- """).show()
-
// Drop table
cc.sql("DROP TABLE IF EXISTS t3")
}
[2/2] incubator-carbondata git commit: [CARBONDATA-758] Remove kettle
related code in CarbonExample.scala This closes #648
Posted by ch...@apache.org.
[CARBONDATA-758] Remove kettle related code in CarbonExample.scala This closes #648
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/63bf4e0d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/63bf4e0d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/63bf4e0d
Branch: refs/heads/master
Commit: 63bf4e0de1ee162b2bee1ef32c8b4a5750821913
Parents: cb2c2a3 7901da6
Author: chenliang613 <ch...@huawei.com>
Authored: Mon Mar 13 13:44:40 2017 +0800
Committer: chenliang613 <ch...@huawei.com>
Committed: Mon Mar 13 13:44:40 2017 +0800
----------------------------------------------------------------------
.../apache/carbondata/examples/CarbonExample.scala | 16 +---------------
1 file changed, 1 insertion(+), 15 deletions(-)
----------------------------------------------------------------------