[22/25] carbondata git commit: [HOTFIX] Fixed all examples

[ravipesala]

[HOTFIX] Fixed all examples

Fixed all examples

This closes #2024


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

Branch: refs/heads/branch-1.3
Commit: 5b0b503f7338fa628c5ebbb7d74a393e98881a1f
Parents: f1a73bd
Author: ravipesala 
Authored: Fri Mar 2 21:46:50 2018 +0530
Committer: ravipesala 
Committed: Sat Mar 3 18:05:56 2018 +0530

--
 .../apache/carbondata/examples/CarbonDataFrameExample.scala  | 8 
 .../carbondata/examples/CarbonSortColumnsExample.scala   | 6 ++
 .../spark/testsuite/dataload/TestLoadDataGeneral.scala   | 1 +
 .../sql/execution/strategy/CarbonLateDecodeStrategy.scala| 5 -
 .../org/apache/spark/sql/parser/CarbonSpark2SqlParser.scala  | 2 +-
 5 files changed, 12 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/carbondata/blob/5b0b503f/examples/spark2/src/main/scala/org/apache/carbondata/examples/CarbonDataFrameExample.scala
--
diff --git 
a/examples/spark2/src/main/scala/org/apache/carbondata/examples/CarbonDataFrameExample.scala
 
b/examples/spark2/src/main/scala/org/apache/carbondata/examples/CarbonDataFrameExample.scala
index fe15659..c8f8023 100644
--- 
a/examples/spark2/src/main/scala/org/apache/carbondata/examples/CarbonDataFrameExample.scala
+++ 
b/examples/spark2/src/main/scala/org/apache/carbondata/examples/CarbonDataFrameExample.scala
@@ -54,13 +54,13 @@ object CarbonDataFrameExample {
 // Saves dataframe to carbondata file
 df.write
   .format("carbondata")
-  .option("tableName", "carbon_table")
+  .option("tableName", "carbon_df_table")
   .option("compress", "true")
   .option("tempCSV", "false")
   .mode(SaveMode.Overwrite)
   .save()
 
-spark.sql(""" SELECT * FROM carbon_table """).show()
+spark.sql(""" SELECT * FROM carbon_df_table """).show()
 
 // Specify schema
 import org.apache.spark.sql.types.{StructType, StructField, StringType, 
IntegerType}
@@ -74,7 +74,7 @@ object CarbonDataFrameExample {
   .format("carbondata")
   .schema(customSchema)
   // .option("dbname", "db_name") the system will use "default" as dbname 
if not set this option
-  .option("tableName", "carbon_table")
+  .option("tableName", "carbon_df_table")
   .load()
 
 // Dataframe operations
@@ -82,7 +82,7 @@ object CarbonDataFrameExample {
 carbondf.select($"c1", $"number" + 10).show()
 carbondf.filter($"number" > 31).show()
 
-spark.sql("DROP TABLE IF EXISTS carbon_table")
+spark.sql("DROP TABLE IF EXISTS carbon_df_table")
 
 spark.stop()
   }

http://git-wip-us.apache.org/repos/asf/carbondata/blob/5b0b503f/examples/spark2/src/main/scala/org/apache/carbondata/examples/CarbonSortColumnsExample.scala
--
diff --git 
a/examples/spark2/src/main/scala/org/apache/carbondata/examples/CarbonSortColumnsExample.scala
 
b/examples/spark2/src/main/scala/org/apache/carbondata/examples/CarbonSortColumnsExample.scala
index 3a9f26b..8d0eabf 100644
--- 
a/examples/spark2/src/main/scala/org/apache/carbondata/examples/CarbonSortColumnsExample.scala
+++ 
b/examples/spark2/src/main/scala/org/apache/carbondata/examples/CarbonSortColumnsExample.scala
@@ -99,15 +99,13 @@ object CarbonSortColumnsExample {
   s"""
  | LOAD DATA LOCAL INPATH '$path'
  | INTO TABLE no_sort_columns_table
- | 
OPTIONS('FILEHEADER'='shortField,intField,bigintField,doubleField,stringField,timestampField,decimalField,dateField,charField,floatField,complexData',
- | 'COMPLEX_DELIMITER_LEVEL_1'='#')
+ | OPTIONS('COMPLEX_DELIMITER_LEVEL_1'='#')
""".stripMargin)
 spark.sql(
   s"""
  | LOAD DATA LOCAL INPATH '$path'
  | INTO TABLE sort_columns_table
- | 
OPTIONS('FILEHEADER'='shortField,intField,bigintField,doubleField,stringField,timestampField,decimalField,dateField,charField,floatField,complexData',
- | 'COMPLEX_DELIMITER_LEVEL_1'='#')
+ | OPTIONS('COMPLEX_DELIMITER_LEVEL_1'='#')
""".stripMargin)
 // scalastyle:on
 

http://git-wip-us.apache.org/repos/asf/carbondata/blob/5b0b503f/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataGeneral.scala
--
diff --git 
a/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataGeneral.scala
 

carbondata git commit: [HOTFIX] Fixed all examples

[chenliang613]

Repository: carbondata
Updated Branches:
  refs/heads/master 3e36639ed -> 9c12f5dc8


[HOTFIX] Fixed all examples

Fixed all examples

This closes #2024


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

Branch: refs/heads/master
Commit: 9c12f5dc856ca034694841ec1537eaa0366eec96
Parents: 3e36639
Author: ravipesala 
Authored: Fri Mar 2 21:46:50 2018 +0530
Committer: chenliang613 
Committed: Sat Mar 3 12:11:03 2018 +0800

--
 .../apache/carbondata/examples/CarbonDataFrameExample.scala  | 8 
 .../carbondata/examples/CarbonSortColumnsExample.scala   | 6 ++
 .../spark/testsuite/dataload/TestLoadDataGeneral.scala   | 1 +
 .../sql/execution/strategy/CarbonLateDecodeStrategy.scala| 5 -
 .../org/apache/spark/sql/parser/CarbonSpark2SqlParser.scala  | 2 +-
 5 files changed, 12 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/carbondata/blob/9c12f5dc/examples/spark2/src/main/scala/org/apache/carbondata/examples/CarbonDataFrameExample.scala
--
diff --git 
a/examples/spark2/src/main/scala/org/apache/carbondata/examples/CarbonDataFrameExample.scala
 
b/examples/spark2/src/main/scala/org/apache/carbondata/examples/CarbonDataFrameExample.scala
index fe15659..c8f8023 100644
--- 
a/examples/spark2/src/main/scala/org/apache/carbondata/examples/CarbonDataFrameExample.scala
+++ 
b/examples/spark2/src/main/scala/org/apache/carbondata/examples/CarbonDataFrameExample.scala
@@ -54,13 +54,13 @@ object CarbonDataFrameExample {
 // Saves dataframe to carbondata file
 df.write
   .format("carbondata")
-  .option("tableName", "carbon_table")
+  .option("tableName", "carbon_df_table")
   .option("compress", "true")
   .option("tempCSV", "false")
   .mode(SaveMode.Overwrite)
   .save()
 
-spark.sql(""" SELECT * FROM carbon_table """).show()
+spark.sql(""" SELECT * FROM carbon_df_table """).show()
 
 // Specify schema
 import org.apache.spark.sql.types.{StructType, StructField, StringType, 
IntegerType}
@@ -74,7 +74,7 @@ object CarbonDataFrameExample {
   .format("carbondata")
   .schema(customSchema)
   // .option("dbname", "db_name") the system will use "default" as dbname 
if not set this option
-  .option("tableName", "carbon_table")
+  .option("tableName", "carbon_df_table")
   .load()
 
 // Dataframe operations
@@ -82,7 +82,7 @@ object CarbonDataFrameExample {
 carbondf.select($"c1", $"number" + 10).show()
 carbondf.filter($"number" > 31).show()
 
-spark.sql("DROP TABLE IF EXISTS carbon_table")
+spark.sql("DROP TABLE IF EXISTS carbon_df_table")
 
 spark.stop()
   }

http://git-wip-us.apache.org/repos/asf/carbondata/blob/9c12f5dc/examples/spark2/src/main/scala/org/apache/carbondata/examples/CarbonSortColumnsExample.scala
--
diff --git 
a/examples/spark2/src/main/scala/org/apache/carbondata/examples/CarbonSortColumnsExample.scala
 
b/examples/spark2/src/main/scala/org/apache/carbondata/examples/CarbonSortColumnsExample.scala
index 3a9f26b..8d0eabf 100644
--- 
a/examples/spark2/src/main/scala/org/apache/carbondata/examples/CarbonSortColumnsExample.scala
+++ 
b/examples/spark2/src/main/scala/org/apache/carbondata/examples/CarbonSortColumnsExample.scala
@@ -99,15 +99,13 @@ object CarbonSortColumnsExample {
   s"""
  | LOAD DATA LOCAL INPATH '$path'
  | INTO TABLE no_sort_columns_table
- | 
OPTIONS('FILEHEADER'='shortField,intField,bigintField,doubleField,stringField,timestampField,decimalField,dateField,charField,floatField,complexData',
- | 'COMPLEX_DELIMITER_LEVEL_1'='#')
+ | OPTIONS('COMPLEX_DELIMITER_LEVEL_1'='#')
""".stripMargin)
 spark.sql(
   s"""
  | LOAD DATA LOCAL INPATH '$path'
  | INTO TABLE sort_columns_table
- | 
OPTIONS('FILEHEADER'='shortField,intField,bigintField,doubleField,stringField,timestampField,decimalField,dateField,charField,floatField,complexData',
- | 'COMPLEX_DELIMITER_LEVEL_1'='#')
+ | OPTIONS('COMPLEX_DELIMITER_LEVEL_1'='#')
""".stripMargin)
 // scalastyle:on
 

http://git-wip-us.apache.org/repos/asf/carbondata/blob/9c12f5dc/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/dataload/TestLoadDataGeneral.scala
--
diff --git