[11/50] [abbrv] carbondata git commit: [CARBONDATA-3060]Improve the command for cli and fixed other issues

2018-11-21 Thread ravipesala 
[CARBONDATA-3060]Improve the command for cli and fixed other issues

improve the syntax for CLI DDL: CarbonCli for table  options('-cmd 
summary/benchmark -a -s -v -c  -m')

This closes #2882


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

Branch: refs/heads/branch-1.5
Commit: e0963c16bd67b12e3a82eabb9766275f4d2d9ef1
Parents: 4db5efd
Author: akashrn5 
Authored: Mon Oct 29 18:14:24 2018 +0530
Committer: ravipesala 
Committed: Wed Nov 21 22:39:53 2018 +0530

--
 .../schema/table/column/ColumnSchema.java   |  9 ++
 .../examples/sdk/CarbonReaderExample.java   |  4 +-
 .../TestNonTransactionalCarbonTable.scala   |  2 +-
 .../spark/sql/catalyst/CarbonDDLSqlParser.scala | 10 +-
 .../command/management/CarbonCliCommand.scala   | 62 +
 .../management/CarbonShowSummaryCommand.scala   | 62 -
 .../sql/parser/CarbonSpark2SqlParser.scala  | 12 +--
 .../org/apache/carbondata/tool/CarbonCli.java   | 21 -
 .../org/apache/carbondata/tool/DataFile.java| 15 ++-
 .../org/apache/carbondata/tool/DataSummary.java | 98 +++-
 10 files changed, 172 insertions(+), 123 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/carbondata/blob/e0963c16/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/ColumnSchema.java
--
diff --git 
a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/ColumnSchema.java
 
b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/ColumnSchema.java
index 8eba101..cf7ecab 100644
--- 
a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/ColumnSchema.java
+++ 
b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/ColumnSchema.java
@@ -571,4 +571,13 @@ public class ColumnSchema implements Serializable, 
Writable {
 }
 this.isLocalDictColumn = in.readBoolean();
   }
+
+  /**
+   * returns whether column is complex column based on column name for child 
column
+   * @return
+   */
+  public boolean isComplexColumn() {
+return this.getColumnName()
+.contains(".val") || this.getColumnName().contains(".");
+  }
 }

http://git-wip-us.apache.org/repos/asf/carbondata/blob/e0963c16/examples/spark2/src/main/java/org/apache/carbondata/examples/sdk/CarbonReaderExample.java
--
diff --git 
a/examples/spark2/src/main/java/org/apache/carbondata/examples/sdk/CarbonReaderExample.java
 
b/examples/spark2/src/main/java/org/apache/carbondata/examples/sdk/CarbonReaderExample.java
index ef4ae7a..a2f2eee 100644
--- 
a/examples/spark2/src/main/java/org/apache/carbondata/examples/sdk/CarbonReaderExample.java
+++ 
b/examples/spark2/src/main/java/org/apache/carbondata/examples/sdk/CarbonReaderExample.java
@@ -61,7 +61,9 @@ public class CarbonReaderExample {
 CarbonWriter writer = CarbonWriter.builder()
 .outputPath(path)
 .withLoadOptions(map)
-.withCsvInput(new Schema(fields)).build();
+.withCsvInput(new Schema(fields))
+.writtenBy("CarbonReaderExample")
+.build();
 
 for (int i = 0; i < 10; i++) {
 String[] row2 = new String[]{

http://git-wip-us.apache.org/repos/asf/carbondata/blob/e0963c16/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/createTable/TestNonTransactionalCarbonTable.scala
--
diff --git 
a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/createTable/TestNonTransactionalCarbonTable.scala
 
b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/createTable/TestNonTransactionalCarbonTable.scala
index a3a3fc3..5b93553 100644
--- 
a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/createTable/TestNonTransactionalCarbonTable.scala
+++ 
b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/createTable/TestNonTransactionalCarbonTable.scala
@@ -389,7 +389,7 @@ class TestNonTransactionalCarbonTable extends QueryTest 
with BeforeAndAfterAll {
  |'carbondata' LOCATION
  |'$writerPath' """.stripMargin)
 
-val output = sql("show summary for table sdkOutputTable 
options('command'='-cmd,summary,-p,-a,-v,-c,age')").collect()
+val output = sql("Carboncli for table sdkOutputTable options('-cmd summary 
-a -v -c age')").collect()

carbondata git commit: [CARBONDATA-3060]Improve the command for cli and fixed other issues

2018-11-04 Thread jackylk 
Repository: carbondata
Updated Branches:
  refs/heads/master 63a28a951 -> 789055e19


[CARBONDATA-3060]Improve the command for cli and fixed other issues

improve the syntax for CLI DDL: CarbonCli for table  options('-cmd 
summary/benchmark -a -s -v -c  -m')

This closes #2882


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

Branch: refs/heads/master
Commit: 789055e1972c9456998c3a1a7516720fb7d506c2
Parents: 63a28a9
Author: akashrn5 
Authored: Mon Oct 29 18:14:24 2018 +0530
Committer: Jacky Li 
Committed: Mon Nov 5 15:20:56 2018 +0800

--
 .../schema/table/column/ColumnSchema.java   |  9 ++
 .../examples/sdk/CarbonReaderExample.java   |  4 +-
 .../TestNonTransactionalCarbonTable.scala   |  2 +-
 .../spark/sql/catalyst/CarbonDDLSqlParser.scala | 10 +-
 .../command/management/CarbonCliCommand.scala   | 62 +
 .../management/CarbonShowSummaryCommand.scala   | 62 -
 .../sql/parser/CarbonSpark2SqlParser.scala  | 12 +--
 .../org/apache/carbondata/tool/CarbonCli.java   | 21 -
 .../org/apache/carbondata/tool/DataFile.java| 15 ++-
 .../org/apache/carbondata/tool/DataSummary.java | 98 +++-
 10 files changed, 172 insertions(+), 123 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/carbondata/blob/789055e1/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/ColumnSchema.java
--
diff --git 
a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/ColumnSchema.java
 
b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/ColumnSchema.java
index 8eba101..cf7ecab 100644
--- 
a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/ColumnSchema.java
+++ 
b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/column/ColumnSchema.java
@@ -571,4 +571,13 @@ public class ColumnSchema implements Serializable, 
Writable {
 }
 this.isLocalDictColumn = in.readBoolean();
   }
+
+  /**
+   * returns whether column is complex column based on column name for child 
column
+   * @return
+   */
+  public boolean isComplexColumn() {
+return this.getColumnName()
+.contains(".val") || this.getColumnName().contains(".");
+  }
 }

http://git-wip-us.apache.org/repos/asf/carbondata/blob/789055e1/examples/spark2/src/main/java/org/apache/carbondata/examples/sdk/CarbonReaderExample.java
--
diff --git 
a/examples/spark2/src/main/java/org/apache/carbondata/examples/sdk/CarbonReaderExample.java
 
b/examples/spark2/src/main/java/org/apache/carbondata/examples/sdk/CarbonReaderExample.java
index ef4ae7a..a2f2eee 100644
--- 
a/examples/spark2/src/main/java/org/apache/carbondata/examples/sdk/CarbonReaderExample.java
+++ 
b/examples/spark2/src/main/java/org/apache/carbondata/examples/sdk/CarbonReaderExample.java
@@ -61,7 +61,9 @@ public class CarbonReaderExample {
 CarbonWriter writer = CarbonWriter.builder()
 .outputPath(path)
 .withLoadOptions(map)
-.withCsvInput(new Schema(fields)).build();
+.withCsvInput(new Schema(fields))
+.writtenBy("CarbonReaderExample")
+.build();
 
 for (int i = 0; i < 10; i++) {
 String[] row2 = new String[]{

http://git-wip-us.apache.org/repos/asf/carbondata/blob/789055e1/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/createTable/TestNonTransactionalCarbonTable.scala
--
diff --git 
a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/createTable/TestNonTransactionalCarbonTable.scala
 
b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/createTable/TestNonTransactionalCarbonTable.scala
index a3a3fc3..5b93553 100644
--- 
a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/createTable/TestNonTransactionalCarbonTable.scala
+++ 
b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/createTable/TestNonTransactionalCarbonTable.scala
@@ -389,7 +389,7 @@ class TestNonTransactionalCarbonTable extends QueryTest 
with BeforeAndAfterAll {
  |'carbondata' LOCATION
  |'$writerPath' """.stripMargin)
 
-val output = sql("show summary for table sdkOutputTable 
options('command'='-cmd,summary,-p,-a,-v,-c,age')").collect()
+val output = sql("Carboncli for table sdkOutputTable