carbondata git commit: [CARBONDATA-1752] There are some scalastyle error should be optimized in CarbonData

2017-12-05 Thread jackylk 
Repository: carbondata
Updated Branches:
  refs/heads/master afe96a241 -> e2a2d9931


[CARBONDATA-1752] There are some scalastyle error should be optimized in 
CarbonData

There are some scalastyle error should be optimized in CarbonData, including 
removing useless import, optimizing method definition and so on. This PR remove 
some unused import

This closes #1569


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

Branch: refs/heads/master
Commit: e2a2d99316de86144ae47b5e25759a658c19e927
Parents: afe96a2
Author: xubo245 <601450...@qq.com>
Authored: Mon Dec 4 10:20:30 2017 +0800
Committer: Jacky Li 
Committed: Wed Dec 6 08:50:09 2017 +0800

--
 .../dictionary/AbstractDictionaryCacheTest.java |  1 -
 .../dictionary/ColumnDictionaryInfoTest.java|  2 --
 .../cache/dictionary/ForwardDictionaryTest.java |  1 -
 .../dictionary/ReverseDictionaryCacheTest.java  |  1 -
 .../core/carbon/ColumnIdentifierTest.java   |  1 -
 .../block/SegmentPropertiesTestUtil.java|  1 -
 .../datastore/page/encoding/RLECodecSuite.java  |  1 -
 ...ctDictionaryKeyGeneratorFactoryUnitTest.java |  1 -
 .../complextypes/PrimitiveQueryTypeTest.java|  1 -
 .../scan/expression/ExpressionResultTest.java   |  2 --
 .../conditional/EqualToExpressionUnitTest.java  |  2 --
 .../GreaterThanEqualToExpressionUnitTest.java   |  2 --
 .../GreaterThanExpressionUnitTest.java  |  2 --
 .../conditional/InExpressionUnitTest.java   |  1 -
 .../LessThanEqualToExpressionUnitTest.java  |  2 --
 .../conditional/LessThanExpressionUnitTest.java |  2 --
 .../conditional/ListExpressionUnitTest.java |  1 -
 .../NotEqualsExpressionUnitTest.java|  2 --
 .../conditional/NotInExpressionUnitTest.java|  1 -
 .../expression/logical/AndExpressionTest.java   |  1 -
 .../expression/logical/OrExpressionTest.java|  1 -
 .../carbondata/core/util/CarbonUtilTest.java|  1 -
 .../core/util/RangeFilterProcessorTest.java |  1 -
 .../CarbonDictionarySortInfoPreparatorTest.java |  1 -
 .../CarbonDictionarySortModelTest.java  |  2 --
 .../hadoop/ft/CarbonInputFormat_FT.java |  1 -
 .../hadoop/ft/CarbonInputMapperTest.java|  1 -
 .../test/util/ObjectSerializationUtilTest.java  |  1 -
 .../presto/CarbondataSplitManager.java  | 30 
 .../presto/util/CarbonDataStoreCreator.scala|  2 +-
 .../testsuite/datamap/DataMapWriterSuite.scala  |  5 +++-
 .../partition/TestDDLForPartitionTable.scala|  2 +-
 ...ForPartitionTableWithDefaultProperties.scala |  7 +++--
 .../spark/rdd/CarbonScanPartitionRDD.scala  |  4 +--
 .../carbondata/spark/util/CarbonScalaUtil.scala |  2 +-
 .../spark/sql/CarbonDictionaryDecoder.scala |  7 ++---
 .../src/main/spark2.1/CarbonSessionState.scala  |  5 
 37 files changed, 16 insertions(+), 85 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/carbondata/blob/e2a2d993/core/src/test/java/org/apache/carbondata/core/cache/dictionary/AbstractDictionaryCacheTest.java
--
diff --git 
a/core/src/test/java/org/apache/carbondata/core/cache/dictionary/AbstractDictionaryCacheTest.java
 
b/core/src/test/java/org/apache/carbondata/core/cache/dictionary/AbstractDictionaryCacheTest.java
index 54881a8..16c09fd 100644
--- 
a/core/src/test/java/org/apache/carbondata/core/cache/dictionary/AbstractDictionaryCacheTest.java
+++ 
b/core/src/test/java/org/apache/carbondata/core/cache/dictionary/AbstractDictionaryCacheTest.java
@@ -33,7 +33,6 @@ import org.apache.carbondata.core.cache.Cache;
 import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier;
 import org.apache.carbondata.core.metadata.CarbonTableIdentifier;
 import org.apache.carbondata.core.metadata.ColumnIdentifier;
-import org.apache.carbondata.core.metadata.datatype.DataType;
 import org.apache.carbondata.core.metadata.datatype.DataTypes;
 import org.apache.carbondata.core.util.path.CarbonStorePath;
 import org.apache.carbondata.core.util.path.CarbonTablePath;

http://git-wip-us.apache.org/repos/asf/carbondata/blob/e2a2d993/core/src/test/java/org/apache/carbondata/core/cache/dictionary/ColumnDictionaryInfoTest.java
--
diff --git 
a/core/src/test/java/org/apache/carbondata/core/cache/dictionary/ColumnDictionaryInfoTest.java
 
b/core/src/test/java/org/apache/carbondata/core/cache/dictionary/ColumnDictionaryInfoTest.java
index cb0892f..6ef5565 100644
--- 
a/core/src/test/java/org/apache/carbondata/core/cache/dictionary/ColumnDictionaryInfoTest.java
+++

[17/28] carbondata git commit: [CARBONDATA-1752] There are some scalastyle error should be optimized in CarbonData

2017-11-18 Thread jackylk 
[CARBONDATA-1752] There are some scalastyle error should be optimized in 
CarbonData

There are some scalastyle error should be optimized in CarbonData

This closes #1518


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

Branch: refs/heads/fgdatamap
Commit: 1d2af629367b906f5424819f94e208aa9f30db4d
Parents: dfc7442
Author: xubo245 <601450...@qq.com>
Authored: Fri Nov 17 11:25:14 2017 +0800
Committer: Jacky Li 
Committed: Fri Nov 17 17:23:50 2017 +0800

--
 .../org/apache/carbondata/api/CarbonStore.scala |  2 +-
 .../carbondata/spark/util/CommonUtil.scala  |  5 ++--
 .../spark/util/DataTypeConverterUtil.scala  |  2 +-
 .../spark/sql/catalyst/CarbonDDLSqlParser.scala |  2 +-
 .../command/carbonTableSchemaCommon.scala   | 25 +++-
 5 files changed, 19 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/carbondata/blob/1d2af629/integration/spark-common/src/main/scala/org/apache/carbondata/api/CarbonStore.scala
--
diff --git 
a/integration/spark-common/src/main/scala/org/apache/carbondata/api/CarbonStore.scala
 
b/integration/spark-common/src/main/scala/org/apache/carbondata/api/CarbonStore.scala
index 3d93a65..a2c9c6d 100644
--- 
a/integration/spark-common/src/main/scala/org/apache/carbondata/api/CarbonStore.scala
+++ 
b/integration/spark-common/src/main/scala/org/apache/carbondata/api/CarbonStore.scala
@@ -29,7 +29,7 @@ import org.apache.carbondata.common.logging.LogServiceFactory
 import org.apache.carbondata.core.constants.CarbonCommonConstants
 import org.apache.carbondata.core.datastore.impl.FileFactory
 import org.apache.carbondata.core.locks.{CarbonLockUtil, ICarbonLock, 
LockUsage}
-import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, 
CarbonTableIdentifier}
+import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier}
 import org.apache.carbondata.core.metadata.schema.table.CarbonTable
 import org.apache.carbondata.core.mutate.CarbonUpdateUtil
 import org.apache.carbondata.core.statusmanager.SegmentStatusManager

http://git-wip-us.apache.org/repos/asf/carbondata/blob/1d2af629/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/CommonUtil.scala
--
diff --git 
a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/CommonUtil.scala
 
b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/CommonUtil.scala
index a3572ed..6c0e802 100644
--- 
a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/CommonUtil.scala
+++ 
b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/CommonUtil.scala
@@ -27,10 +27,9 @@ import scala.collection.mutable.Map
 
 import org.apache.commons.lang3.StringUtils
 import org.apache.hadoop.conf.Configuration
-import org.apache.hadoop.fs.Path
 import org.apache.hadoop.mapreduce.lib.input.FileInputFormat
 import org.apache.spark.SparkContext
-import org.apache.spark.sql.{Row, RowFactory, SQLContext}
+import org.apache.spark.sql.{Row, RowFactory}
 import org.apache.spark.sql.catalyst.expressions.{Attribute, 
AttributeReference}
 import org.apache.spark.sql.execution.command.{ColumnProperty, Field, 
PartitionerField}
 import org.apache.spark.sql.types.{MetadataBuilder, StringType}
@@ -41,7 +40,7 @@ import 
org.apache.carbondata.core.constants.CarbonCommonConstants
 import org.apache.carbondata.core.datastore.filesystem.CarbonFile
 import org.apache.carbondata.core.datastore.impl.FileFactory
 import org.apache.carbondata.core.memory.{UnsafeMemoryManager, 
UnsafeSortMemoryManager}
-import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, 
CarbonTableIdentifier}
+import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier}
 import org.apache.carbondata.core.metadata.datatype.{DataType, DataTypes}
 import org.apache.carbondata.core.metadata.schema.PartitionInfo
 import org.apache.carbondata.core.metadata.schema.partition.PartitionType

http://git-wip-us.apache.org/repos/asf/carbondata/blob/1d2af629/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/DataTypeConverterUtil.scala
--
diff --git 
a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/DataTypeConverterUtil.scala
 
b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/DataTypeConverterUtil.scala
index 6cf7298..38657ac 100644
---

carbondata git commit: [CARBONDATA-1752] There are some scalastyle error should be optimized in CarbonData

2017-11-17 Thread jackylk 
Repository: carbondata
Updated Branches:
  refs/heads/master dfc7442a4 -> 1d2af6293


[CARBONDATA-1752] There are some scalastyle error should be optimized in 
CarbonData

There are some scalastyle error should be optimized in CarbonData

This closes #1518


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

Branch: refs/heads/master
Commit: 1d2af629367b906f5424819f94e208aa9f30db4d
Parents: dfc7442
Author: xubo245 <601450...@qq.com>
Authored: Fri Nov 17 11:25:14 2017 +0800
Committer: Jacky Li 
Committed: Fri Nov 17 17:23:50 2017 +0800

--
 .../org/apache/carbondata/api/CarbonStore.scala |  2 +-
 .../carbondata/spark/util/CommonUtil.scala  |  5 ++--
 .../spark/util/DataTypeConverterUtil.scala  |  2 +-
 .../spark/sql/catalyst/CarbonDDLSqlParser.scala |  2 +-
 .../command/carbonTableSchemaCommon.scala   | 25 +++-
 5 files changed, 19 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/carbondata/blob/1d2af629/integration/spark-common/src/main/scala/org/apache/carbondata/api/CarbonStore.scala
--
diff --git 
a/integration/spark-common/src/main/scala/org/apache/carbondata/api/CarbonStore.scala
 
b/integration/spark-common/src/main/scala/org/apache/carbondata/api/CarbonStore.scala
index 3d93a65..a2c9c6d 100644
--- 
a/integration/spark-common/src/main/scala/org/apache/carbondata/api/CarbonStore.scala
+++ 
b/integration/spark-common/src/main/scala/org/apache/carbondata/api/CarbonStore.scala
@@ -29,7 +29,7 @@ import org.apache.carbondata.common.logging.LogServiceFactory
 import org.apache.carbondata.core.constants.CarbonCommonConstants
 import org.apache.carbondata.core.datastore.impl.FileFactory
 import org.apache.carbondata.core.locks.{CarbonLockUtil, ICarbonLock, 
LockUsage}
-import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, 
CarbonTableIdentifier}
+import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier}
 import org.apache.carbondata.core.metadata.schema.table.CarbonTable
 import org.apache.carbondata.core.mutate.CarbonUpdateUtil
 import org.apache.carbondata.core.statusmanager.SegmentStatusManager

http://git-wip-us.apache.org/repos/asf/carbondata/blob/1d2af629/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/CommonUtil.scala
--
diff --git 
a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/CommonUtil.scala
 
b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/CommonUtil.scala
index a3572ed..6c0e802 100644
--- 
a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/CommonUtil.scala
+++ 
b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/CommonUtil.scala
@@ -27,10 +27,9 @@ import scala.collection.mutable.Map
 
 import org.apache.commons.lang3.StringUtils
 import org.apache.hadoop.conf.Configuration
-import org.apache.hadoop.fs.Path
 import org.apache.hadoop.mapreduce.lib.input.FileInputFormat
 import org.apache.spark.SparkContext
-import org.apache.spark.sql.{Row, RowFactory, SQLContext}
+import org.apache.spark.sql.{Row, RowFactory}
 import org.apache.spark.sql.catalyst.expressions.{Attribute, 
AttributeReference}
 import org.apache.spark.sql.execution.command.{ColumnProperty, Field, 
PartitionerField}
 import org.apache.spark.sql.types.{MetadataBuilder, StringType}
@@ -41,7 +40,7 @@ import 
org.apache.carbondata.core.constants.CarbonCommonConstants
 import org.apache.carbondata.core.datastore.filesystem.CarbonFile
 import org.apache.carbondata.core.datastore.impl.FileFactory
 import org.apache.carbondata.core.memory.{UnsafeMemoryManager, 
UnsafeSortMemoryManager}
-import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, 
CarbonTableIdentifier}
+import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier}
 import org.apache.carbondata.core.metadata.datatype.{DataType, DataTypes}
 import org.apache.carbondata.core.metadata.schema.PartitionInfo
 import org.apache.carbondata.core.metadata.schema.partition.PartitionType

http://git-wip-us.apache.org/repos/asf/carbondata/blob/1d2af629/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/DataTypeConverterUtil.scala
--
diff --git 
a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/DataTypeConverterUtil.scala
 
b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/DataTypeConverterUtil.scala
index 6cf7298..38657ac