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 e4bed33 [CARBONDATA-3572] optimize java code checkstyle for LeftCurly rule e4bed33 is described below commit e4bed335752a38abf23edca7173432dc55a2fb3b Author: lamber-ken <2217232...@qq.com> AuthorDate: Tue Nov 12 22:47:37 2019 +0800 [CARBONDATA-3572] optimize java code checkstyle for LeftCurly rule This closes #3441 --- .../core/datastore/compression/AbstractCompressor.java | 4 +++- .../apache/carbondata/core/keygenerator/mdkey/Bits.java | 12 ++++++------ .../core/keygenerator/mdkey/NumberCompressor.java | 10 ++++------ .../impl/DictionaryBasedVectorResultCollector.java | 5 ++--- .../core/scan/executor/infos/BlockExecutionInfo.java | 5 ++--- .../scan/filter/executer/RowLevelFilterExecuterImpl.java | 3 +-- .../scan/result/vector/impl/CarbonColumnVectorImpl.java | 4 +++- .../main/java/org/apache/carbondata/events/Event.java | 4 +++- .../org/apache/carbondata/hadoop/CarbonInputSplit.java | 12 +++++++++--- dev/javastyle-config.xml | 6 +++--- .../apache/carbondata/presto/impl/CarbonTableConfig.java | 16 ++++++++++++---- .../processing/loading/csvinput/BlockDetails.java | 12 +++++++++--- .../processing/merger/CarbonCompactionUtil.java | 3 +-- .../processing/merger/RowResultMergerProcessor.java | 3 +-- .../processing/partition/spliter/RowResultProcessor.java | 3 +-- .../processing/store/CarbonFactDataHandlerModel.java | 4 +++- 16 files changed, 63 insertions(+), 43 deletions(-) diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/compression/AbstractCompressor.java b/core/src/main/java/org/apache/carbondata/core/datastore/compression/AbstractCompressor.java index 9978b68..c88719d 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/compression/AbstractCompressor.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/compression/AbstractCompressor.java @@ -125,5 +125,7 @@ public abstract class AbstractCompressor implements Compressor { } @Override - public boolean supportUnsafe() { return false; } + public boolean supportUnsafe() { + return false; + } } diff --git a/core/src/main/java/org/apache/carbondata/core/keygenerator/mdkey/Bits.java b/core/src/main/java/org/apache/carbondata/core/keygenerator/mdkey/Bits.java index 868c5ad..a292083 100644 --- a/core/src/main/java/org/apache/carbondata/core/keygenerator/mdkey/Bits.java +++ b/core/src/main/java/org/apache/carbondata/core/keygenerator/mdkey/Bits.java @@ -139,8 +139,8 @@ public class Bits implements Serializable { if (nextIndex != idx) { int consideredBits = lens[i] - ll & 0x3f; - if (consideredBits < lens[i]) //Check for spill over only if all the bits are not considered - { + //Check for spill over only if all the bits are not considered + if (consideredBits < lens[i]) { mask = (val >> (lens[i] - ll & 0x3f));//& (0x7fffffffffffffffL >> (0x3f-pos)); word = words[nextIndex]; words[nextIndex] = (word | mask); @@ -176,8 +176,8 @@ public class Bits implements Serializable { if (nextIndex != index) { int consideredBits = lens[i] - ll & 0x3f; - if (consideredBits < lens[i]) //Check for spill over only if all the bits are not considered - { + //Check for spill over only if all the bits are not considered + if (consideredBits < lens[i]) { // Check for spill over mask = (val >> (lens[i] - ll & 0x3f)); word = words[nextIndex]; @@ -207,8 +207,8 @@ public class Bits implements Serializable { int nextIndex = ll >> 6; if (nextIndex != index) { pos = ll & 0x3f; - if (pos != 0) // Number of bits pending for current key is zero, no spill over - { + // Number of bits pending for current key is zero, no spill over + if (pos != 0) { mask = (LONG_MAX >>> (MAX_LENGTH - pos)); val = words[nextIndex]; vals[i] = vals[i] | ((val & mask) << (lens[i] - pos)); diff --git a/core/src/main/java/org/apache/carbondata/core/keygenerator/mdkey/NumberCompressor.java b/core/src/main/java/org/apache/carbondata/core/keygenerator/mdkey/NumberCompressor.java index be680e9..601b917 100644 --- a/core/src/main/java/org/apache/carbondata/core/keygenerator/mdkey/NumberCompressor.java +++ b/core/src/main/java/org/apache/carbondata/core/keygenerator/mdkey/NumberCompressor.java @@ -89,10 +89,8 @@ public class NumberCompressor { if (nextIndex != index) { int consideredBits = bitsLength - ll & 0x3f; - if (consideredBits < bitsLength) // Check for spill over only if - // all the bits are not - // considered - { + // Check for spill over only if all the bits are not considered + if (consideredBits < bitsLength) { // Check for spill over mask = (val >> (bitsLength - ll & 0x3f)); words[nextIndex] |= mask; @@ -145,8 +143,8 @@ public class NumberCompressor { int nextIndex = ll >> 6; if (nextIndex != index) { pos = ll & 0x3f; - if (pos != 0) // Number of bits pending for current key is zero, no spill over - { + // Number of bits pending for current key is zero, no spill over + if (pos != 0) { mask = (LONG_MAX >>> (MAX_LENGTH - pos)); val = words[nextIndex]; value = value | ((val & mask) << (bitsLength - pos)); diff --git a/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/DictionaryBasedVectorResultCollector.java b/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/DictionaryBasedVectorResultCollector.java index 727e969..b307825 100644 --- a/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/DictionaryBasedVectorResultCollector.java +++ b/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/DictionaryBasedVectorResultCollector.java @@ -206,11 +206,10 @@ public class DictionaryBasedVectorResultCollector extends AbstractScannedResultC columnarBatch.setRowCounter(columnarBatch.getRowCounter() + requiredRows); } - void fillColumnVectorDetails(CarbonColumnarBatch columnarBatch, int rowCounter, int requiredRows) - { + void fillColumnVectorDetails(CarbonColumnarBatch columnarBatch, int rowCount, int requiredRows) { for (int i = 0; i < allColumnInfo.length; i++) { allColumnInfo[i].size = requiredRows; - allColumnInfo[i].offset = rowCounter; + allColumnInfo[i].offset = rowCount; allColumnInfo[i].vectorOffset = columnarBatch.getRowCounter(); allColumnInfo[i].vector = columnarBatch.columnVectors[i]; if (null != allColumnInfo[i].dimension) { diff --git a/core/src/main/java/org/apache/carbondata/core/scan/executor/infos/BlockExecutionInfo.java b/core/src/main/java/org/apache/carbondata/core/scan/executor/infos/BlockExecutionInfo.java index f19b96b..68acbba 100644 --- a/core/src/main/java/org/apache/carbondata/core/scan/executor/infos/BlockExecutionInfo.java +++ b/core/src/main/java/org/apache/carbondata/core/scan/executor/infos/BlockExecutionInfo.java @@ -313,9 +313,8 @@ public class BlockExecutionInfo { /** * @param allSelectedDimensionColumnIndexRange the allSelectedDimensionColumnIndexRange to set */ - public void setAllSelectedDimensionColumnIndexRange(int[][] allSelectedDimensionColumnIndexRange) - { - this.allSelectedDimensionColumnIndexRange = allSelectedDimensionColumnIndexRange; + public void setAllSelectedDimensionColumnIndexRange(int[][] selectedDimensionColumnIndexRange) { + this.allSelectedDimensionColumnIndexRange = selectedDimensionColumnIndexRange; } /** diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelFilterExecuterImpl.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelFilterExecuterImpl.java index 9f1090e..ac0319e 100644 --- a/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelFilterExecuterImpl.java +++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelFilterExecuterImpl.java @@ -621,8 +621,7 @@ public class RowLevelFilterExecuterImpl implements FilterExecuter { for (int i = 0; i < dimColEvaluatorInfoList.size(); i++) { DimColumnResolvedFilterInfo dimColumnEvaluatorInfo = dimColEvaluatorInfoList.get(i); if (!dimColumnEvaluatorInfo.getDimension().getDataType().isComplexType()) { - if (null == rawBlockletColumnChunks.getDimensionRawColumnChunks()[dimensionChunkIndex[i]]) - { + if (null == rawBlockletColumnChunks.getDimensionRawColumnChunks()[dimensionChunkIndex[i]]) { rawBlockletColumnChunks.getDimensionRawColumnChunks()[dimensionChunkIndex[i]] = rawBlockletColumnChunks.getDataBlock().readDimensionChunk( rawBlockletColumnChunks.getFileReader(), dimensionChunkIndex[i]); diff --git a/core/src/main/java/org/apache/carbondata/core/scan/result/vector/impl/CarbonColumnVectorImpl.java b/core/src/main/java/org/apache/carbondata/core/scan/result/vector/impl/CarbonColumnVectorImpl.java index 494ac8f..094da65 100644 --- a/core/src/main/java/org/apache/carbondata/core/scan/result/vector/impl/CarbonColumnVectorImpl.java +++ b/core/src/main/java/org/apache/carbondata/core/scan/result/vector/impl/CarbonColumnVectorImpl.java @@ -368,7 +368,9 @@ public class CarbonColumnVectorImpl implements CarbonColumnVector { * Returns true if any of the nulls indicator are set for this column. This can be used * as an optimization to prevent setting nulls. */ - public final boolean anyNullsSet() { return anyNullsSet; } + public final boolean anyNullsSet() { + return anyNullsSet; + } @Override public void putFloats(int rowId, int count, float[] src, int srcIndex) { diff --git a/core/src/main/java/org/apache/carbondata/events/Event.java b/core/src/main/java/org/apache/carbondata/events/Event.java index 4de6632..671b1f3 100644 --- a/core/src/main/java/org/apache/carbondata/events/Event.java +++ b/core/src/main/java/org/apache/carbondata/events/Event.java @@ -27,5 +27,7 @@ public abstract class Event { * * @return */ - String getEventType() { return this.getClass().getName(); } + String getEventType() { + return this.getClass().getName(); + } } diff --git a/core/src/main/java/org/apache/carbondata/hadoop/CarbonInputSplit.java b/core/src/main/java/org/apache/carbondata/hadoop/CarbonInputSplit.java index 9838d85..d346347 100644 --- a/core/src/main/java/org/apache/carbondata/hadoop/CarbonInputSplit.java +++ b/core/src/main/java/org/apache/carbondata/hadoop/CarbonInputSplit.java @@ -485,7 +485,9 @@ public class CarbonInputSplit extends FileSplit return bucketId; } - public String getBlockletId() { return blockletId; } + public String getBlockletId() { + return blockletId; + } @Override public int compareTo(Distributable o) { @@ -766,7 +768,9 @@ public class CarbonInputSplit extends FileSplit } /** The position of the first byte in the file to process. */ - public long getStart() { return start; } + public long getStart() { + return start; + } /** * In case of index server detail info won't be present @@ -800,7 +804,9 @@ public class CarbonInputSplit extends FileSplit } @Override - public String toString() { return filePath + ":" + start + "+" + length; } + public String toString() { + return filePath + ":" + start + "+" + length; + } @Override public String[] getLocations() throws IOException { diff --git a/dev/javastyle-config.xml b/dev/javastyle-config.xml index 6d007e9..fea3124 100644 --- a/dev/javastyle-config.xml +++ b/dev/javastyle-config.xml @@ -180,7 +180,7 @@ <!-- Checks for redundant imports. --> <module name="RedundantImport"> - <property name="severity" value="info"/> + <property name="severity" value="error"/> <message key="import.redundancy" value="Redundant import {0}."/> </module> @@ -191,7 +191,7 @@ <!-- Checks for placement of the left curly brace ('{'). --> <module name="LeftCurly"> - <property name="severity" value="info"/> + <property name="severity" value="error"/> </module> <!-- Checks for complicated boolean expressions. --> @@ -201,7 +201,7 @@ <!-- Checks for empty statements. --> <module name="EmptyStatement"> - <property name="severity" value="info"/> + <property name="severity" value="error"/> </module> <!-- Checks for consecutive semicolons. --> diff --git a/integration/presto/src/main/java/org/apache/carbondata/presto/impl/CarbonTableConfig.java b/integration/presto/src/main/java/org/apache/carbondata/presto/impl/CarbonTableConfig.java index 7474da8..45fa5dd 100755 --- a/integration/presto/src/main/java/org/apache/carbondata/presto/impl/CarbonTableConfig.java +++ b/integration/presto/src/main/java/org/apache/carbondata/presto/impl/CarbonTableConfig.java @@ -61,7 +61,9 @@ public class CarbonTableConfig { return this; } - public String getEnableUnsafeColumnPage() { return enableUnsafeColumnPage; } + public String getEnableUnsafeColumnPage() { + return enableUnsafeColumnPage; + } @Config("enable.unsafe.columnpage") public CarbonTableConfig setEnableUnsafeColumnPage(String enableUnsafeColumnPage) { @@ -69,7 +71,9 @@ public class CarbonTableConfig { return this; } - public String getEnableUnsafeSort() { return enableUnsafeSort; } + public String getEnableUnsafeSort() { + return enableUnsafeSort; + } @Config("enable.unsafe.sort") public CarbonTableConfig setEnableUnsafeSort(String enableUnsafeSort) { @@ -77,7 +81,9 @@ public class CarbonTableConfig { return this; } - public String getEnableQueryStatistics() { return enableQueryStatistics; } + public String getEnableQueryStatistics() { + return enableQueryStatistics; + } @Config("enable.query.statistics") public CarbonTableConfig setEnableQueryStatistics(String enableQueryStatistics) { @@ -85,7 +91,9 @@ public class CarbonTableConfig { return this; } - public String getBatchSize() { return batchSize; } + public String getBatchSize() { + return batchSize; + } @Config("query.vector.batchSize") public CarbonTableConfig setBatchSize(String batchSize) { diff --git a/processing/src/main/java/org/apache/carbondata/processing/loading/csvinput/BlockDetails.java b/processing/src/main/java/org/apache/carbondata/processing/loading/csvinput/BlockDetails.java index d0c8a73..15cabcf 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/loading/csvinput/BlockDetails.java +++ b/processing/src/main/java/org/apache/carbondata/processing/loading/csvinput/BlockDetails.java @@ -72,13 +72,19 @@ public class BlockDetails extends FileSplit implements Serializable { /** The file containing this split's data. */ @Override - public Path getPath() { return new Path(filePath); } + public Path getPath() { + return new Path(filePath); + } /** The position of the first byte in the file to process. */ @Override - public long getStart() { return blockOffset; } + public long getStart() { + return blockOffset; + } /** The number of bytes in the file to process. */ @Override - public long getLength() { return blockLength; } + public long getLength() { + return blockLength; + } } diff --git a/processing/src/main/java/org/apache/carbondata/processing/merger/CarbonCompactionUtil.java b/processing/src/main/java/org/apache/carbondata/processing/merger/CarbonCompactionUtil.java index 10c4bcb..98024e8 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/merger/CarbonCompactionUtil.java +++ b/processing/src/main/java/org/apache/carbondata/processing/merger/CarbonCompactionUtil.java @@ -112,8 +112,7 @@ public class CarbonCompactionUtil { groupCorrespodingInfoBasedOnTask(info, taskBlockInfoMapping, taskNo); // put the taskBlockInfo with respective segment id segmentBlockInfoMapping.put(segId, taskBlockInfoMapping); - } else - { + } else { groupCorrespodingInfoBasedOnTask(info, taskBlockInfoMapping, taskNo); } } diff --git a/processing/src/main/java/org/apache/carbondata/processing/merger/RowResultMergerProcessor.java b/processing/src/main/java/org/apache/carbondata/processing/merger/RowResultMergerProcessor.java index 64630a7..8516cf0 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/merger/RowResultMergerProcessor.java +++ b/processing/src/main/java/org/apache/carbondata/processing/merger/RowResultMergerProcessor.java @@ -170,8 +170,7 @@ public class RowResultMergerProcessor extends AbstractResultProcessor { } } } - if (isDataPresent) - { + if (isDataPresent) { this.dataHandler.finish(); } mergeStatus = true; diff --git a/processing/src/main/java/org/apache/carbondata/processing/partition/spliter/RowResultProcessor.java b/processing/src/main/java/org/apache/carbondata/processing/partition/spliter/RowResultProcessor.java index 75aadd1..4dae21f 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/partition/spliter/RowResultProcessor.java +++ b/processing/src/main/java/org/apache/carbondata/processing/partition/spliter/RowResultProcessor.java @@ -80,8 +80,7 @@ public class RowResultProcessor { for (Object[] row: resultList) { addRow(row); } - if (isDataPresent) - { + if (isDataPresent) { this.dataHandler.finish(); } processStatus = true; diff --git a/processing/src/main/java/org/apache/carbondata/processing/store/CarbonFactDataHandlerModel.java b/processing/src/main/java/org/apache/carbondata/processing/store/CarbonFactDataHandlerModel.java index 28c5fac..0283e12 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/store/CarbonFactDataHandlerModel.java +++ b/processing/src/main/java/org/apache/carbondata/processing/store/CarbonFactDataHandlerModel.java @@ -659,7 +659,9 @@ public class CarbonFactDataHandlerModel { return bucketId; } - public void setBucketId(Integer bucketId) { this.bucketId = bucketId; } + public void setBucketId(Integer bucketId) { + this.bucketId = bucketId; + } public long getSchemaUpdatedTimeStamp() { return schemaUpdatedTimeStamp;