[carbondata] branch master updated: [checkstyle] optimize java code checkstyle for SimplifyBooleanExpression rule

[zhangzc]

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


The following commit(s) were added to refs/heads/master by this push:
     new 0126e9d  [checkstyle] optimize java code checkstyle for 
SimplifyBooleanExpression rule
0126e9d is described below

commit 0126e9de3862f30f1b3bd4776af5ce072d9586c9
Author: lamber-ken <lamber...@163.com>
AuthorDate: Sat Nov 30 15:21:08 2019 +0800

    [checkstyle] optimize java code checkstyle for SimplifyBooleanExpression 
rule
    
    optimize java code checkstyle for SimplifyBooleanExpression rule
    
    This closes #3489
---
 .../main/java/org/apache/carbondata/core/mutate/CarbonUpdateUtil.java | 2 +-
 .../executer/RowLevelRangeGrtrThanEquaToFilterExecuterImpl.java       | 2 +-
 dev/javastyle-config.xml                                              | 4 +---
 .../org/apache/carbondata/processing/datatypes/PrimitiveDataType.java | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

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 @@ public class CarbonUpdateUtil {
           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 @@ public class RowLevelRangeGrtrThanEquaToFilterExecuterImpl 
extends RowLevelFilte
       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 class PrimitiveDataType implements 
GenericDataType<Object> {
   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;