You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by zh...@apache.org on 2019/11/21 01:03:19 UTC
[carbondata] branch master updated: [CARBONDATA-3591] optimize java
code checkstyle for NoWhitespaceAfter rule
This is an automated email from the ASF dual-hosted git repository.
zhangzc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/carbondata.git
View the commit online:
https://github.com/apache/carbondata/commit/cf86972d97ef64eee5a563cf825e0d6a59923ce7
The following commit(s) were added to refs/heads/master by this push:
new cf86972 [CARBONDATA-3591] optimize java code checkstyle for NoWhitespaceAfter rule
cf86972 is described below
commit cf86972d97ef64eee5a563cf825e0d6a59923ce7
Author: lamber-ken <22...@qq.com>
AuthorDate: Thu Nov 21 00:11:40 2019 +0800
[CARBONDATA-3591] optimize java code checkstyle for NoWhitespaceAfter rule
optimize java code checkstyle for NoWhitespaceAfter rule
This closes #3471
---
.../core/datastore/page/encoding/DefaultEncodingFactory.java | 2 +-
.../core/datastore/page/encoding/rle/RLECodec.java | 2 +-
.../apache/carbondata/core/mutate/data/BlockMappingVO.java | 4 ++--
.../org/apache/carbondata/core/preagg/DaysOfWeekEnum.java | 1 +
.../core/scan/expression/RangeExpressionEvaluator.java | 2 +-
.../core/scan/filter/FilterExpressionProcessor.java | 6 +++---
.../scan/filter/resolver/ConditionalFilterResolverImpl.java | 2 +-
.../core/scan/result/vector/impl/CarbonColumnVectorImpl.java | 12 ++++++------
.../carbondata/core/util/CarbonLoadStatisticsImpl.java | 2 +-
dev/javastyle-config.xml | 10 +---------
.../processing/loading/converter/impl/RowConverterImpl.java | 2 +-
.../processing/loading/sort/SortStepRowHandler.java | 2 +-
.../carbondata/processing/sort/sortdata/SortParameters.java | 2 +-
.../carbondata/processing/util/CarbonDataProcessorUtil.java | 2 +-
14 files changed, 22 insertions(+), 29 deletions(-)
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/DefaultEncodingFactory.java b/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/DefaultEncodingFactory.java
index f2eb92f..eb3a1f8 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/DefaultEncodingFactory.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/DefaultEncodingFactory.java
@@ -45,7 +45,7 @@ import org.apache.carbondata.core.util.DataTypeUtil;
public class DefaultEncodingFactory extends EncodingFactory {
private static final int THREE_BYTES_MAX = (int) Math.pow(2, 23) - 1;
- private static final int THREE_BYTES_MIN = - THREE_BYTES_MAX - 1;
+ private static final int THREE_BYTES_MIN = -THREE_BYTES_MAX - 1;
private static final boolean newWay = false;
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/rle/RLECodec.java b/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/rle/RLECodec.java
index 24d35ac..0e6d976 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/rle/RLECodec.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/rle/RLECodec.java
@@ -74,7 +74,7 @@ public class RLECodec implements ColumnPageCodec {
// This codec supports integral type only
private void validateDataType(DataType dataType) {
- if (! (dataType == DataTypes.BOOLEAN || dataType == DataTypes.BYTE ||
+ if (!(dataType == DataTypes.BOOLEAN || dataType == DataTypes.BYTE ||
dataType == DataTypes.SHORT || dataType == DataTypes.INT ||
dataType == DataTypes.LONG)) {
throw new UnsupportedOperationException(dataType + " is not supported for RLE");
diff --git a/core/src/main/java/org/apache/carbondata/core/mutate/data/BlockMappingVO.java b/core/src/main/java/org/apache/carbondata/core/mutate/data/BlockMappingVO.java
index e9ce73f..847ebeb 100644
--- a/core/src/main/java/org/apache/carbondata/core/mutate/data/BlockMappingVO.java
+++ b/core/src/main/java/org/apache/carbondata/core/mutate/data/BlockMappingVO.java
@@ -24,9 +24,9 @@ import java.util.Map;
*/
public class BlockMappingVO {
- private Map<String, Long> blockRowCountMapping ;
+ private Map<String, Long> blockRowCountMapping;
- private Map<String, Long> segmentNumberOfBlockMapping ;
+ private Map<String, Long> segmentNumberOfBlockMapping;
private Map<String, RowCountDetailsVO> completeBlockRowDetailVO;
diff --git a/core/src/main/java/org/apache/carbondata/core/preagg/DaysOfWeekEnum.java b/core/src/main/java/org/apache/carbondata/core/preagg/DaysOfWeekEnum.java
index e73b595..df413d5 100644
--- a/core/src/main/java/org/apache/carbondata/core/preagg/DaysOfWeekEnum.java
+++ b/core/src/main/java/org/apache/carbondata/core/preagg/DaysOfWeekEnum.java
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.carbondata.core.preagg;
/**
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/expression/RangeExpressionEvaluator.java b/core/src/main/java/org/apache/carbondata/core/scan/expression/RangeExpressionEvaluator.java
index e14b57c..88667eb 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/expression/RangeExpressionEvaluator.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/expression/RangeExpressionEvaluator.java
@@ -286,7 +286,7 @@ public class RangeExpressionEvaluator {
for (Expression exp : expChild.getChildren()) {
if (exp instanceof ColumnExpression) {
return ((ColumnExpression) exp).isDimension() &&
- ! (((ColumnExpression) exp).getDimension().getDataType().isComplexType());
+ !(((ColumnExpression) exp).getDimension().getDataType().isComplexType());
}
}
return false;
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/FilterExpressionProcessor.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/FilterExpressionProcessor.java
index 9baf232..1c2f51c 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/filter/FilterExpressionProcessor.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/FilterExpressionProcessor.java
@@ -356,7 +356,7 @@ public class FilterExpressionProcessor implements FilterProcessor {
}
CarbonColumn column = currentCondExpression.getColumnList().get(0).getCarbonColumn();
- if (currentCondExpression.isSingleColumn() && ! column.getDataType().isComplexType()) {
+ if (currentCondExpression.isSingleColumn() && !column.getDataType().isComplexType()) {
if (column.isMeasure()) {
if (FilterUtil.checkIfExpressionContainsColumn(currentCondExpression.getLeft())
&& FilterUtil.checkIfExpressionContainsColumn(currentCondExpression.getRight()) || (
@@ -413,7 +413,7 @@ public class FilterExpressionProcessor implements FilterProcessor {
case NOT_EQUALS:
currentCondExpression = (BinaryConditionalExpression) expression;
column = currentCondExpression.getColumnList().get(0).getCarbonColumn();
- if (currentCondExpression.isSingleColumn() && ! column.getDataType().isComplexType()) {
+ if (currentCondExpression.isSingleColumn() && !column.getDataType().isComplexType()) {
if (column.isMeasure()) {
if (FilterUtil.checkIfExpressionContainsColumn(currentCondExpression.getLeft())
&& FilterUtil.checkIfExpressionContainsColumn(currentCondExpression.getRight()) || (
@@ -465,7 +465,7 @@ public class FilterExpressionProcessor implements FilterProcessor {
if (expression instanceof ConditionalExpression) {
condExpression = (ConditionalExpression) expression;
column = condExpression.getColumnList().get(0).getCarbonColumn();
- if (condExpression.isSingleColumn() && ! column.isComplex()) {
+ if (condExpression.isSingleColumn() && !column.isComplex()) {
condExpression = (ConditionalExpression) expression;
if ((condExpression.getColumnList().get(0).getCarbonColumn()
.hasEncoding(Encoding.DICTIONARY) && !condExpression.getColumnList().get(0)
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/ConditionalFilterResolverImpl.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/ConditionalFilterResolverImpl.java
index 0c3c51f..77b575d 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/ConditionalFilterResolverImpl.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/ConditionalFilterResolverImpl.java
@@ -161,7 +161,7 @@ public class ConditionalFilterResolverImpl implements FilterResolverIntf {
} else if ((null != columnList.get(0).getDimension()) && (
columnList.get(0).getDimension().hasEncoding(Encoding.DICTIONARY) &&
- ! columnList.get(0).getDimension().getDataType().isComplexType())) {
+ !columnList.get(0).getDimension().getDataType().isComplexType())) {
dimColResolvedFilterInfo.setFilterValues(FilterUtil
.getFilterListForAllValues(absoluteTableIdentifier, exp, columnList.get(0),
isIncludeFilter, isExpressionResolve));
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 5d25f95..8231d86 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
@@ -375,42 +375,42 @@ public class CarbonColumnVectorImpl implements CarbonColumnVector {
@Override
public void putFloats(int rowId, int count, float[] src, int srcIndex) {
for (int i = srcIndex; i < count; i++) {
- floats[rowId ++] = src[i];
+ floats[rowId++] = src[i];
}
}
@Override
public void putShorts(int rowId, int count, short[] src, int srcIndex) {
for (int i = srcIndex; i < count; i++) {
- shorts[rowId ++] = src[i];
+ shorts[rowId++] = src[i];
}
}
@Override
public void putInts(int rowId, int count, int[] src, int srcIndex) {
for (int i = srcIndex; i < count; i++) {
- ints[rowId ++] = src[i];
+ ints[rowId++] = src[i];
}
}
@Override
public void putLongs(int rowId, int count, long[] src, int srcIndex) {
for (int i = srcIndex; i < count; i++) {
- longs[rowId ++] = src[i];
+ longs[rowId++] = src[i];
}
}
@Override
public void putDoubles(int rowId, int count, double[] src, int srcIndex) {
for (int i = srcIndex; i < count; i++) {
- doubles[rowId ++] = src[i];
+ doubles[rowId++] = src[i];
}
}
@Override
public void putBytes(int rowId, int count, byte[] src, int srcIndex) {
for (int i = srcIndex; i < count; i++) {
- byteArr[rowId ++] = src[i];
+ byteArr[rowId++] = src[i];
}
}
diff --git a/core/src/main/java/org/apache/carbondata/core/util/CarbonLoadStatisticsImpl.java b/core/src/main/java/org/apache/carbondata/core/util/CarbonLoadStatisticsImpl.java
index 618f4d1..b1d9332 100644
--- a/core/src/main/java/org/apache/carbondata/core/util/CarbonLoadStatisticsImpl.java
+++ b/core/src/main/java/org/apache/carbondata/core/util/CarbonLoadStatisticsImpl.java
@@ -316,7 +316,7 @@ public class CarbonLoadStatisticsImpl implements LoadStatistics {
" block distinct values: " + loadCsvfilesToDfTime + "(s)");
double dicShuffleAndWriteFileTotalTime = getDicShuffleAndWriteFileTotalTime();
LOGGER.info("STAGE 2 ->Global dict shuffle and write dict file: " +
- + dicShuffleAndWriteFileTotalTime + "(s)");
+ dicShuffleAndWriteFileTotalTime + "(s)");
}
private void printLruCacheLoadTimeInfo() {
diff --git a/dev/javastyle-config.xml b/dev/javastyle-config.xml
index 9f12dc9..cfee020 100644
--- a/dev/javastyle-config.xml
+++ b/dev/javastyle-config.xml
@@ -196,14 +196,6 @@
<property name="severity" value="error"/>
</module>
- <!-- Checks for consecutive semicolons. -->
- <module name="RegexpSinglelineJava">
- <property name="severity" value="info"/>
- <property name="format" value=";{2,}"/>
- <property name="message" value="Please use one semicolon"/>
- <property name="ignoreComments" value="true"/>
- </module>
-
<!-- Checks for empty line separator between tokens. -->
<module name="EmptyLineSeparator">
<property name="severity" value="error"/>
@@ -220,7 +212,7 @@
<!-- Checks for there is no whitespace after unary operators. -->
<module name="NoWhitespaceAfter">
- <property name="severity" value="info"/>
+ <property name="severity" value="error"/>
<property name="tokens" value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS"/>
<property name="allowLineBreaks" value="true"/>
</module>
diff --git a/processing/src/main/java/org/apache/carbondata/processing/loading/converter/impl/RowConverterImpl.java b/processing/src/main/java/org/apache/carbondata/processing/loading/converter/impl/RowConverterImpl.java
index c8b16ef..c1ed95d 100644
--- a/processing/src/main/java/org/apache/carbondata/processing/loading/converter/impl/RowConverterImpl.java
+++ b/processing/src/main/java/org/apache/carbondata/processing/loading/converter/impl/RowConverterImpl.java
@@ -192,7 +192,7 @@ public class RowConverterImpl implements RowConverter {
@Override
public void finish() {
// Clear up dictionary cache access count.
- for (int i = 0; i < fieldConverters.length; i ++) {
+ for (int i = 0; i < fieldConverters.length; i++) {
fieldConverters[i].clear();
}
// close dictionary client when finish write
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 f19fe1e..e3015c9 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
@@ -357,7 +357,7 @@ public class SortStepRowHandler implements Serializable {
// read measure
int measureCnt = measures.length;
Object tmpContent;
- for (short idx = 0 ; idx < measureCnt; idx++) {
+ for (short idx = 0; idx < measureCnt; idx++) {
tmpContent = getDataFromRowBuffer(dataTypes[idx], rowBuffer);
measures[idx] = tmpContent;
}
diff --git a/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/SortParameters.java b/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/SortParameters.java
index 864bc3b..025fb1c 100644
--- a/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/SortParameters.java
+++ b/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/SortParameters.java
@@ -573,7 +573,7 @@ public class SortParameters implements Serializable {
+ " will be used for writing the sort temp File");
}
- parameters.setPrefetch(CarbonCommonConstants. CARBON_PREFETCH_IN_MERGE_VALUE);
+ parameters.setPrefetch(CarbonCommonConstants.CARBON_PREFETCH_IN_MERGE_VALUE);
parameters.setBufferSize(Integer.parseInt(carbonProperties.getProperty(
CarbonCommonConstants.CARBON_PREFETCH_BUFFERSIZE,
CarbonCommonConstants.CARBON_PREFETCH_BUFFERSIZE_DEFAULT)));
diff --git a/processing/src/main/java/org/apache/carbondata/processing/util/CarbonDataProcessorUtil.java b/processing/src/main/java/org/apache/carbondata/processing/util/CarbonDataProcessorUtil.java
index ace909a..1cdcad5 100644
--- a/processing/src/main/java/org/apache/carbondata/processing/util/CarbonDataProcessorUtil.java
+++ b/processing/src/main/java/org/apache/carbondata/processing/util/CarbonDataProcessorUtil.java
@@ -132,7 +132,7 @@ public final class CarbonDataProcessorUtil {
String[] baseTmpStorePathArray = StringUtils.split(baseTempStorePath, File.pathSeparator);
String[] localDataFolderLocArray = new String[baseTmpStorePathArray.length];
- for (int i = 0 ; i < baseTmpStorePathArray.length; i++) {
+ for (int i = 0; i < baseTmpStorePathArray.length; i++) {
String tmpStore = baseTmpStorePathArray[i];
String carbonDataDirectoryPath = CarbonTablePath.getSegmentPath(tmpStore, segmentId);