This is an automated email from the ASF dual-hosted git repository. hui pushed a commit to branch lmh/refactorFilter in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 2b0a84ee8db6e3436cba9c1ae796be1f94fa9c6d Author: Minghui Liu <[email protected]> AuthorDate: Sun Nov 19 23:35:22 2023 +0800 refactor --- .../java/org/apache/iotdb/tsfile/read/filter/operator/And.java | 4 ++-- .../java/org/apache/iotdb/tsfile/read/filter/operator/Or.java | 4 ++-- .../iotdb/tsfile/read/filter/operator/TimeFilterOperators.java | 6 +++--- .../iotdb/tsfile/read/filter/operator/ValueFilterOperators.java | 8 ++++---- .../read/filter/{basic => operator/base}/BinaryLogicalFilter.java | 6 ++++-- .../read/filter/{basic => operator/base}/ColumnCompareFilter.java | 4 ++-- .../filter/{basic => operator/base}/ColumnPatternMatchFilter.java | 4 ++-- .../read/filter/{basic => operator/base}/ColumnRangeFilter.java | 4 ++-- .../read/filter/{basic => operator/base}/ColumnSetFilter.java | 4 ++-- 9 files changed, 23 insertions(+), 21 deletions(-) diff --git a/iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/And.java b/iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/And.java index ce5708ecf48..4fb536661e9 100644 --- a/iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/And.java +++ b/iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/And.java @@ -21,13 +21,13 @@ package org.apache.iotdb.tsfile.read.filter.operator; import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics; import org.apache.iotdb.tsfile.read.common.TimeRange; -import org.apache.iotdb.tsfile.read.filter.basic.BinaryLogicalFilter; import org.apache.iotdb.tsfile.read.filter.basic.Filter; +import org.apache.iotdb.tsfile.read.filter.operator.base.BinaryLogicalFilter; import java.util.ArrayList; import java.util.List; -public class And extends BinaryLogicalFilter { +public class And extends BinaryLogicalFilter implements Filter { public And(Filter left, Filter right) { super(left, right); diff --git a/iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/Or.java b/iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/Or.java index 3f3e299147a..c2290c1ad29 100644 --- a/iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/Or.java +++ b/iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/Or.java @@ -21,14 +21,14 @@ package org.apache.iotdb.tsfile.read.filter.operator; import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics; import org.apache.iotdb.tsfile.read.common.TimeRange; -import org.apache.iotdb.tsfile.read.filter.basic.BinaryLogicalFilter; import org.apache.iotdb.tsfile.read.filter.basic.Filter; +import org.apache.iotdb.tsfile.read.filter.operator.base.BinaryLogicalFilter; import java.util.ArrayList; import java.util.Collections; import java.util.List; -public class Or extends BinaryLogicalFilter { +public class Or extends BinaryLogicalFilter implements Filter { public Or(Filter left, Filter right) { super(left, right); 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 8e6bc533903..b8db1dd2769 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 @@ -20,12 +20,12 @@ package org.apache.iotdb.tsfile.read.filter.operator; import org.apache.iotdb.tsfile.read.common.TimeRange; -import org.apache.iotdb.tsfile.read.filter.basic.ColumnCompareFilter; -import org.apache.iotdb.tsfile.read.filter.basic.ColumnRangeFilter; -import org.apache.iotdb.tsfile.read.filter.basic.ColumnSetFilter; import org.apache.iotdb.tsfile.read.filter.basic.Filter; import org.apache.iotdb.tsfile.read.filter.basic.IDisableStatisticsTimeFilter; import org.apache.iotdb.tsfile.read.filter.basic.ITimeFilter; +import org.apache.iotdb.tsfile.read.filter.operator.base.ColumnCompareFilter; +import org.apache.iotdb.tsfile.read.filter.operator.base.ColumnRangeFilter; +import org.apache.iotdb.tsfile.read.filter.operator.base.ColumnSetFilter; import java.util.ArrayList; import java.util.Arrays; 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 bf0f93bb790..2129b4ad80b 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 @@ -22,13 +22,13 @@ package org.apache.iotdb.tsfile.read.filter.operator; import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics; -import org.apache.iotdb.tsfile.read.filter.basic.ColumnCompareFilter; -import org.apache.iotdb.tsfile.read.filter.basic.ColumnPatternMatchFilter; -import org.apache.iotdb.tsfile.read.filter.basic.ColumnRangeFilter; -import org.apache.iotdb.tsfile.read.filter.basic.ColumnSetFilter; import org.apache.iotdb.tsfile.read.filter.basic.Filter; import org.apache.iotdb.tsfile.read.filter.basic.IDisableStatisticsValueFilter; import org.apache.iotdb.tsfile.read.filter.basic.IValueFilter; +import org.apache.iotdb.tsfile.read.filter.operator.base.ColumnCompareFilter; +import org.apache.iotdb.tsfile.read.filter.operator.base.ColumnPatternMatchFilter; +import org.apache.iotdb.tsfile.read.filter.operator.base.ColumnRangeFilter; +import org.apache.iotdb.tsfile.read.filter.operator.base.ColumnSetFilter; import java.util.Locale; import java.util.Objects; diff --git a/iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/BinaryLogicalFilter.java b/iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/base/BinaryLogicalFilter.java similarity index 90% rename from iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/BinaryLogicalFilter.java rename to iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/base/BinaryLogicalFilter.java index c4bd9548ab1..e61d3eba148 100644 --- a/iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/BinaryLogicalFilter.java +++ b/iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/base/BinaryLogicalFilter.java @@ -17,13 +17,15 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.filter.basic; +package org.apache.iotdb.tsfile.read.filter.operator.base; + +import org.apache.iotdb.tsfile.read.filter.basic.Filter; import java.util.Locale; import java.util.Objects; /* base class for And, Or */ -public abstract class BinaryLogicalFilter implements Filter { +public abstract class BinaryLogicalFilter { protected final Filter left; protected final Filter right; diff --git a/iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/ColumnCompareFilter.java b/iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/base/ColumnCompareFilter.java similarity index 94% rename from iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/ColumnCompareFilter.java rename to iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/base/ColumnCompareFilter.java index 3d303d0d433..2f13e09bd83 100644 --- a/iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/ColumnCompareFilter.java +++ b/iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/base/ColumnCompareFilter.java @@ -17,10 +17,10 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.filter.basic; +package org.apache.iotdb.tsfile.read.filter.operator.base; /* base class for Eq, NotEq, Lt, Gt, LtEq, GtEq */ -public abstract class ColumnCompareFilter<T extends Comparable<T>> implements Filter { +public abstract class ColumnCompareFilter<T extends Comparable<T>> { protected final T constant; diff --git a/iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/ColumnPatternMatchFilter.java b/iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/base/ColumnPatternMatchFilter.java similarity index 90% rename from iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/ColumnPatternMatchFilter.java rename to iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/base/ColumnPatternMatchFilter.java index 41eb97ae650..3c578d97206 100644 --- a/iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/ColumnPatternMatchFilter.java +++ b/iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/base/ColumnPatternMatchFilter.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.filter.basic; +package org.apache.iotdb.tsfile.read.filter.operator.base; import java.util.Objects; import java.util.regex.Pattern; /* base class for Regex, NotRegex */ -public abstract class ColumnPatternMatchFilter implements Filter { +public abstract class ColumnPatternMatchFilter { protected final Pattern pattern; diff --git a/iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/ColumnRangeFilter.java b/iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/base/ColumnRangeFilter.java similarity index 94% rename from iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/ColumnRangeFilter.java rename to iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/base/ColumnRangeFilter.java index dc04fb3a6fe..2d166ae4b8f 100644 --- a/iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/ColumnRangeFilter.java +++ b/iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/base/ColumnRangeFilter.java @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.filter.basic; +package org.apache.iotdb.tsfile.read.filter.operator.base; import java.util.Objects; /* base class for BetweenAnd, NotBetweenAnd */ -public abstract class ColumnRangeFilter<T extends Comparable<T>> implements Filter { +public abstract class ColumnRangeFilter<T extends Comparable<T>> { protected final T min; protected final T max; diff --git a/iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/ColumnSetFilter.java b/iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/base/ColumnSetFilter.java similarity index 88% rename from iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/ColumnSetFilter.java rename to iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/base/ColumnSetFilter.java index 5382a405f72..d6e217cfaaa 100644 --- a/iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/ColumnSetFilter.java +++ b/iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/base/ColumnSetFilter.java @@ -17,13 +17,13 @@ * under the License. */ -package org.apache.iotdb.tsfile.read.filter.basic; +package org.apache.iotdb.tsfile.read.filter.operator.base; import java.util.Objects; import java.util.Set; /* base class for In, NotIn */ -public abstract class ColumnSetFilter<T extends Comparable<T>> implements Filter { +public abstract class ColumnSetFilter<T extends Comparable<T>> { protected final Set<T> candidates;
