This is an automated email from the ASF dual-hosted git repository. hui pushed a commit to branch lmh/extendFilter in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 545362d313b0f59e5cf24e8789529c25ef4223f3 Author: Minghui Liu <[email protected]> AuthorDate: Wed Dec 6 00:04:29 2023 +0800 fix sonar code smell --- .../tsfile/read/filter/operator/TimeFilterOperators.java | 8 ++++++-- .../tsfile/read/filter/operator/ValueFilterOperators.java | 8 ++++---- .../iotdb/tsfile/read/filter/StatisticsFilterTest.java | 12 ++++++------ 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/TimeFilterOperators.java b/iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/TimeFilterOperators.java index 21f1f12491d..47f853362ac 100644 --- a/iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/TimeFilterOperators.java +++ b/iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/TimeFilterOperators.java @@ -381,8 +381,12 @@ public final class TimeFilterOperators { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } TimeColumnRangeFilter that = (TimeColumnRangeFilter) o; return min == that.min && max == that.max; } diff --git a/iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/ValueFilterOperators.java b/iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/ValueFilterOperators.java index 0ce07ead494..e2d6d40fe30 100644 --- a/iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/ValueFilterOperators.java +++ b/iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/ValueFilterOperators.java @@ -666,10 +666,6 @@ public final class ValueFilterOperators { return isAllNulls(statistics.get()); } - private boolean isAllNulls(Statistics<? extends Serializable> statistics) { - return statistics.getCount() == 0; - } - @Override public boolean canSkip(Statistics<? extends Serializable> statistics) { throw new NotImplementedException(); @@ -702,6 +698,10 @@ public final class ValueFilterOperators { public OperatorType getOperatorType() { return OperatorType.VALUE_IS_NOT_NULL; } + + private boolean isAllNulls(Statistics<? extends Serializable> statistics) { + return statistics.getCount() == 0; + } } // base class for ValueIn, ValueNotIn diff --git a/iotdb-core/tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/StatisticsFilterTest.java b/iotdb-core/tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/StatisticsFilterTest.java index b334497af7b..06051ad2ebf 100644 --- a/iotdb-core/tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/StatisticsFilterTest.java +++ b/iotdb-core/tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/StatisticsFilterTest.java @@ -49,23 +49,23 @@ public class StatisticsFilterTest { @Before public void before() { LongStatistics statistic1 = new LongStatistics(); - LongStatistics statistic2 = new LongStatistics(); - LongStatistics statistic3 = new LongStatistics(); - - TimeStatistics timeStatistics1 = new TimeStatistics(); - TimeStatistics timeStatistics2 = new TimeStatistics(); - statistic1.update(1L, 1L); statistic1.update(100L, 100L); + + TimeStatistics timeStatistics1 = new TimeStatistics(); timeStatistics1.update(1L); timeStatistics1.update(100L); + LongStatistics statistic2 = new LongStatistics(); statistic2.update(101L, 101L); statistic2.update(200L, 200L); + + TimeStatistics timeStatistics2 = new TimeStatistics(); timeStatistics2.update(101L); timeStatistics2.update(200L); timeStatistics2.update(201L); + LongStatistics statistic3 = new LongStatistics(); statistic3.update(10L, 10L); metadata1 = newMetadata(statistic1);
