This is an automated email from the ASF dual-hosted git repository.
jackylk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/carbondata.git
The following commit(s) were added to refs/heads/master by this push:
new 567f190 [CARBONDATA-3575] optimize java code checkstyle for
OperatorWrap rule
567f190 is described below
commit 567f19056b653e5e6e2147694f5c636bf7ef83e7
Author: lamber-ken <[email protected]>
AuthorDate: Thu Nov 14 18:00:26 2019 +0800
[CARBONDATA-3575] optimize java code checkstyle for OperatorWrap rule
This closes #3458
---
.../core/constants/CarbonLoadOptionConstants.java | 13 ++++++-------
.../core/indexstore/BlockletDataMapIndexStore.java | 4 ++--
dev/javastyle-config.xml | 2 +-
.../processing/loading/sort/SortStepRowHandler.java | 3 +--
.../processing/partition/spliter/CarbonSplitExecutor.java | 4 ++--
5 files changed, 12 insertions(+), 14 deletions(-)
diff --git
a/core/src/main/java/org/apache/carbondata/core/constants/CarbonLoadOptionConstants.java
b/core/src/main/java/org/apache/carbondata/core/constants/CarbonLoadOptionConstants.java
index 3bcb06f..9547aba 100644
---
a/core/src/main/java/org/apache/carbondata/core/constants/CarbonLoadOptionConstants.java
+++
b/core/src/main/java/org/apache/carbondata/core/constants/CarbonLoadOptionConstants.java
@@ -138,8 +138,8 @@ public final class CarbonLoadOptionConstants {
* data. This option is especially useful when you encounter skewed data.
*/
@CarbonProperty
- public static final String ENABLE_CARBON_LOAD_SKEWED_DATA_OPTIMIZATION
- = "carbon.load.skewedDataOptimization.enabled";
+ public static final String ENABLE_CARBON_LOAD_SKEWED_DATA_OPTIMIZATION =
+ "carbon.load.skewedDataOptimization.enabled";
public static final String
ENABLE_CARBON_LOAD_SKEWED_DATA_OPTIMIZATION_DEFAULT = "false";
@@ -154,8 +154,8 @@ public final class CarbonLoadOptionConstants {
public static final String SORT_COLUMN_BOUNDS_ROW_DELIMITER = ";";
@CarbonProperty
- public static final String ENABLE_CARBON_LOAD_DIRECT_WRITE_TO_STORE_PATH
- = "carbon.load.directWriteToStorePath.enabled";
+ public static final String ENABLE_CARBON_LOAD_DIRECT_WRITE_TO_STORE_PATH =
+ "carbon.load.directWriteToStorePath.enabled";
public static final String
ENABLE_CARBON_LOAD_DIRECT_WRITE_TO_STORE_PATH_DEFAULT = "false";
@@ -167,12 +167,11 @@ public final class CarbonLoadOptionConstants {
* into sort memory, valid value is from 0 to 100.
*/
@CarbonProperty
- public static final String CARBON_LOAD_SORT_MEMORY_SPILL_PERCENTAGE
- = "carbon.load.sortmemory.spill.percentage";
+ public static final String CARBON_LOAD_SORT_MEMORY_SPILL_PERCENTAGE =
+ "carbon.load.sortmemory.spill.percentage";
public static final String CARBON_LOAD_SORT_MEMORY_SPILL_PERCENTAGE_DEFAULT
= "0";
-
/**
* carbon binary decoder when writing string data to binary, like decode
base64, Hex
*/
diff --git
a/core/src/main/java/org/apache/carbondata/core/indexstore/BlockletDataMapIndexStore.java
b/core/src/main/java/org/apache/carbondata/core/indexstore/BlockletDataMapIndexStore.java
index 9df9f80..9280899 100644
---
a/core/src/main/java/org/apache/carbondata/core/indexstore/BlockletDataMapIndexStore.java
+++
b/core/src/main/java/org/apache/carbondata/core/indexstore/BlockletDataMapIndexStore.java
@@ -162,8 +162,8 @@ public class BlockletDataMapIndexStore
public List<BlockletDataMapIndexWrapper> getAll(
List<TableBlockIndexUniqueIdentifierWrapper>
tableSegmentUniqueIdentifiers)
throws IOException {
- Map<String, Map<String, BlockMetaInfo>> segInfoCache
- = new HashMap<String, Map<String, BlockMetaInfo>>();
+ Map<String, Map<String, BlockMetaInfo>> segInfoCache =
+ new HashMap<String, Map<String, BlockMetaInfo>>();
List<BlockletDataMapIndexWrapper> blockletDataMapIndexWrappers =
new ArrayList<>(tableSegmentUniqueIdentifiers.size());
diff --git a/dev/javastyle-config.xml b/dev/javastyle-config.xml
index fea3124..20abe46 100644
--- a/dev/javastyle-config.xml
+++ b/dev/javastyle-config.xml
@@ -242,7 +242,7 @@
<!-- Checks for assign operators are at the end of the line. -->
<module name="OperatorWrap">
- <property name="severity" value="info"/>
+ <property name="severity" value="error"/>
<property name="option" value="eol"/>
<property name="tokens" value="ASSIGN"/>
</module>
diff --git
a/processing/src/main/java/org/apache/carbondata/processing/loading/sort/SortStepRowHandler.java
b/processing/src/main/java/org/apache/carbondata/processing/loading/sort/SortStepRowHandler.java
index 2157c60..f19fe1e 100644
---
a/processing/src/main/java/org/apache/carbondata/processing/loading/sort/SortStepRowHandler.java
+++
b/processing/src/main/java/org/apache/carbondata/processing/loading/sort/SortStepRowHandler.java
@@ -133,8 +133,7 @@ public class SortStepRowHandler implements Serializable {
public Object[] convertRawRowTo3Parts(Object[] row) {
Object[] holder = new Object[3];
try {
- int[] dictDims
- = new int[this.dictSortDimCnt + this.dictNoSortDimCnt];
+ int[] dictDims = new int[this.dictSortDimCnt + this.dictNoSortDimCnt];
Object[] nonDictArray = new Object[this.noDictSortDimCnt +
this.noDictNoSortDimCnt
+ this.varcharDimCnt +
this.complexDimCnt];
Object[] measures = new Object[this.measureCnt];
diff --git
a/processing/src/main/java/org/apache/carbondata/processing/partition/spliter/CarbonSplitExecutor.java
b/processing/src/main/java/org/apache/carbondata/processing/partition/spliter/CarbonSplitExecutor.java
index 1b65a8b..36fcf4f 100644
---
a/processing/src/main/java/org/apache/carbondata/processing/partition/spliter/CarbonSplitExecutor.java
+++
b/processing/src/main/java/org/apache/carbondata/processing/partition/spliter/CarbonSplitExecutor.java
@@ -58,8 +58,8 @@ public class CarbonSplitExecutor extends
AbstractCarbonQueryExecutor {
.dataConverter(converter)
.enableForcedDetailRawQuery()
.build();
- List<PartitionSpliterRawResultIterator> resultList
- = new ArrayList<>(CarbonCommonConstants.DEFAULT_COLLECTION_SIZE);
+ List<PartitionSpliterRawResultIterator> resultList =
+ new ArrayList<>(CarbonCommonConstants.DEFAULT_COLLECTION_SIZE);
TaskBlockInfo taskBlockInfo = segmentMapping.get(segmentId);
Set<String> taskBlockListMapping = taskBlockInfo.getTaskSet();
for (String task : taskBlockListMapping) {
