This is an automated email from the ASF dual-hosted git repository.
hui pushed a change to branch lmh/refactorFilter
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from 58d01deef33 Merge remote-tracking branch 'origin/master' into
lmh/refactorFilter
add 5396fdddc27 make filter serializable
add 80312a70a81 revert modify about IExpression
No new revisions were added by this update.
Summary of changes:
.../iotdb/tsfile/read/expression/IExpression.java | 9 +-
.../tsfile/read/expression/QueryExpression.java | 17 ++-
.../read/expression/impl/BinaryExpression.java | 159 +++++++++++++++------
.../read/expression/impl/GlobalTimeExpression.java | 27 +++-
.../expression/impl/SingleSeriesExpression.java | 24 +++-
.../iotdb/tsfile/read/filter/basic/Filter.java | 86 +++++++++++
.../basic/{IValueFilter.java => OperatorType.java} | 48 +++++--
.../tsfile/read/filter/factory/TimeFilter.java | 4 +-
.../iotdb/tsfile/read/filter/operator/And.java | 13 +-
.../tsfile/read/filter/operator/GroupByFilter.java | 38 ++++-
.../read/filter/operator/GroupByMonthFilter.java | 43 +++++-
.../iotdb/tsfile/read/filter/operator/Not.java | 20 +++
.../iotdb/tsfile/read/filter/operator/Or.java | 13 +-
.../read/filter/operator/TimeFilterOperators.java | 114 +++++++++++++++
.../read/filter/operator/ValueFilterOperators.java | 153 ++++++++++++++++++++
.../filter/operator/base/BinaryLogicalFilter.java | 11 +-
.../iotdb/tsfile/utils/ReadWriteIOUtils.java | 51 ++++++-
.../apache/iotdb/tsfile/read/ExpressionTest.java | 61 ++++++++
.../tsfile/read/filter/FilterSerializeTest.java | 145 +++++++++++++++++++
19 files changed, 951 insertions(+), 85 deletions(-)
copy
iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/{IValueFilter.java
=> OperatorType.java} (63%)
create mode 100644
iotdb-core/tsfile/src/test/java/org/apache/iotdb/tsfile/read/ExpressionTest.java
create mode 100644
iotdb-core/tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/FilterSerializeTest.java
