| commit | 0126e9de3862f30f1b3bd4776af5ce072d9586c9 | [log] [tgz] |
|---|---|---|
| author | lamber-ken <lamberken@163.com> | Sat Nov 30 15:21:08 2019 +0800 |
| committer | Zhang Zhichao <441586683@qq.com> | Sat Nov 30 21:47:48 2019 +0800 |
| tree | 3e0d409618efa9414e30062925ba71553ded225d | |
| parent | 70ab62fcccdf8f840d8a70d2820ec347dfc29781 [diff] |
[checkstyle] optimize java code checkstyle for SimplifyBooleanExpression rule optimize java code checkstyle for SimplifyBooleanExpression rule This closes #3489
diff --git a/core/src/main/java/org/apache/carbondata/core/mutate/CarbonUpdateUtil.java b/core/src/main/java/org/apache/carbondata/core/mutate/CarbonUpdateUtil.java index 90c3e39..2b3096e 100644 --- a/core/src/main/java/org/apache/carbondata/core/mutate/CarbonUpdateUtil.java +++ b/core/src/main/java/org/apache/carbondata/core/mutate/CarbonUpdateUtil.java
@@ -138,7 +138,7 @@ if (index != -1) { // update the element in existing list. SegmentUpdateDetails blockDetail = oldList.get(index); - if (blockDetail.getDeleteDeltaStartTimestamp().isEmpty() || (isCompaction == true)) { + if (blockDetail.getDeleteDeltaStartTimestamp().isEmpty() || (isCompaction)) { blockDetail .setDeleteDeltaStartTimestamp(newBlockEntry.getDeleteDeltaStartTimestamp()); }
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelRangeGrtrThanEquaToFilterExecuterImpl.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelRangeGrtrThanEquaToFilterExecuterImpl.java index ecf78f8..c358620 100644 --- a/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelRangeGrtrThanEquaToFilterExecuterImpl.java +++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelRangeGrtrThanEquaToFilterExecuterImpl.java
@@ -71,7 +71,7 @@ CarbonMeasure measure = this.msrColEvalutorInfoList.get(0).getMeasure(); comparator = Comparator.getComparatorByDataTypeForMeasure(measure.getDataType()); } - if (isDimensionPresentInCurrentBlock[0] == true) { + if (isDimensionPresentInCurrentBlock[0]) { isNaturalSorted = dimColEvaluatorInfoList.get(0).getDimension().isUseInvertedIndex() && dimColEvaluatorInfoList.get(0).getDimension().isSortColumn(); }
diff --git a/dev/javastyle-config.xml b/dev/javastyle-config.xml index b477bd3..bab54af 100644 --- a/dev/javastyle-config.xml +++ b/dev/javastyle-config.xml
@@ -184,9 +184,7 @@ <module name="LeftCurly"/> <!-- Checks for complicated boolean expressions. --> - <module name="SimplifyBooleanExpression"> - <property name="severity" value="info"/> - </module> + <module name="SimplifyBooleanExpression"/> <!-- Checks for empty statements. --> <module name="EmptyStatement"/>
diff --git a/processing/src/main/java/org/apache/carbondata/processing/datatypes/PrimitiveDataType.java b/processing/src/main/java/org/apache/carbondata/processing/datatypes/PrimitiveDataType.java index b216684..557c490 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/datatypes/PrimitiveDataType.java +++ b/processing/src/main/java/org/apache/carbondata/processing/datatypes/PrimitiveDataType.java
@@ -285,7 +285,7 @@ public void setSurrogateIndex(int surrIndex) { if (this.carbonDimension != null && !this.carbonDimension.hasEncoding(Encoding.DICTIONARY)) { index = 0; - } else if (this.carbonDimension == null && isDictionary == false) { + } else if (this.carbonDimension == null && !isDictionary) { index = 0; } else { index = surrIndex;