This is an automated email from the ASF dual-hosted git repository.
hui pushed a change to branch lmh/extendFilter
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from 72a2b5dda1c fix sonar
new 9e6f3b297df fix canSkipOffsetByStatistics()
new 520afe0f259 rename "==" to "="
new c995ff624e5 tmp save
new fdba22f3b32 finish IMetadata interface
new a1d371a7c14 update Filter interface
new b2141492e9d add comments
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/iotdb/tsfile/TsFileRead.java | 16 +-
.../iotdb/spark/tsfile/NarrowConverter.scala | 56 +--
.../apache/iotdb/spark/tsfile/WideConverter.scala | 56 +--
.../tsfile/TsFileInsertionDataContainer.java | 6 +-
.../protocol/thrift/impl/ClientRPCServiceImpl.java | 4 +-
.../operator/source/AlignedSeriesScanUtil.java | 93 ++--
.../execution/operator/source/SeriesScanUtil.java | 26 +-
.../ConvertPredicateToTimeFilterVisitor.java | 30 +-
.../planner/plan/node/write/DeleteDataNode.java | 4 +-
.../planner/plan/parameter/SeriesScanOptions.java | 7 +-
.../read/reader/chunk/MemAlignedPageReader.java | 45 +-
.../read/reader/chunk/MemPageReader.java | 29 +-
.../AlignedSeriesAggregationScanOperatorTest.java | 12 +-
.../operator/RawDataAggregationOperatorTest.java | 4 +-
.../SeriesAggregationScanOperatorTest.java | 12 +-
.../operator/UpdateLastCacheOperatorTest.java | 6 +-
.../ConvertPredicateToTimeFilterTest.java | 46 +-
.../plan/analyze/QueryTimePartitionTest.java | 108 ++--
.../plan/plan/QueryLogicalPlanUtil.java | 8 +-
.../reader/chunk/MemAlignedChunkLoaderTest.java | 8 +-
.../iotdb/tsfile/file/header/PageHeader.java | 26 +-
.../tsfile/file/metadata/AlignedChunkMetadata.java | 49 +-
.../file/metadata/AlignedTimeSeriesMetadata.java | 48 +-
.../iotdb/tsfile/file/metadata/ChunkMetadata.java | 27 +
.../iotdb/tsfile/file/metadata/IChunkMetadata.java | 6 +-
.../metadata/IMetadata.java} | 19 +-
.../tsfile/file/metadata/IStatisticsProvider.java | 18 +-
.../tsfile/file/metadata/ITimeSeriesMetadata.java | 5 +-
.../tsfile/file/metadata/TimeseriesMetadata.java | 27 +
.../apache/iotdb/tsfile/read/common/TimeRange.java | 10 +-
.../tsfile/read/common/block/TsBlockBuilder.java | 7 +-
.../base => basic}/BinaryLogicalFilter.java | 5 +-
...ilter.java => DisableStatisticsTimeFilter.java} | 8 +-
...lter.java => DisableStatisticsValueFilter.java} | 17 +-
.../iotdb/tsfile/read/filter/basic/Filter.java | 77 +--
.../tsfile/read/filter/basic/IStatefulFilter.java | 32 --
.../tsfile/read/filter/basic/ITimeFilter.java | 49 --
.../tsfile/read/filter/basic/IValueFilter.java | 60 ---
.../tsfile/read/filter/basic/OperatorType.java | 4 +-
.../iotdb/tsfile/read/filter/basic/TimeFilter.java | 56 +++
.../tsfile/read/filter/basic/ValueFilter.java | 120 +++++
.../{TimeFilter.java => TimeFilterApi.java} | 4 +-
.../{ValueFilter.java => ValueFilterApi.java} | 20 +-
.../iotdb/tsfile/read/filter/operator/And.java | 24 +-
.../tsfile/read/filter/operator/GroupByFilter.java | 8 +-
.../read/filter/operator/GroupByMonthFilter.java | 7 +-
.../iotdb/tsfile/read/filter/operator/Not.java | 26 +-
.../iotdb/tsfile/read/filter/operator/Or.java | 24 +-
.../read/filter/operator/TimeFilterOperators.java | 204 ++++----
.../read/filter/operator/ValueFilterOperators.java | 555 +++++++++------------
.../filter/operator/base/ColumnCompareFilter.java | 51 --
.../operator/base/ColumnPatternMatchFilter.java | 50 --
.../filter/operator/base/ColumnRangeFilter.java | 51 --
.../read/filter/operator/base/ColumnSetFilter.java | 50 --
.../tsfile/read/reader/IAlignedPageReader.java | 29 --
.../iotdb/tsfile/read/reader/IPageReader.java | 7 +-
.../read/reader/chunk/AlignedChunkReader.java | 2 +-
.../tsfile/read/reader/chunk/ChunkReader.java | 2 +-
.../tsfile/read/reader/page/AlignedPageReader.java | 64 +--
.../iotdb/tsfile/read/reader/page/PageReader.java | 37 +-
.../read/reader/series/FileSeriesReader.java | 2 +-
.../apache/iotdb/tsfile/utils/Preconditions.java | 22 +-
.../apache/iotdb/tsfile/read/ExpressionTest.java | 36 +-
.../iotdb/tsfile/read/ReadInPartitionTest.java | 8 +-
.../org/apache/iotdb/tsfile/read/ReadTest.java | 60 +--
.../iotdb/tsfile/read/TimePlainEncodeReadTest.java | 64 +--
.../apache/iotdb/tsfile/read/TsFileReaderTest.java | 66 +--
.../tsfile/read/filter/FilterSerializeTest.java | 72 +--
.../iotdb/tsfile/read/filter/FilterTestUtil.java | 117 +++++
.../tsfile/read/filter/GroupByFilterTest.java | 33 +-
.../tsfile/read/filter/GroupByMonthFilterTest.java | 35 +-
.../read/filter/IExpressionOptimizerTest.java | 52 +-
.../read/filter/MinTimeMaxTimeFilterTest.java | 70 +--
.../iotdb/tsfile/read/filter/OperatorTest.java | 48 +-
.../filter/PredicateRemoveNotRewriterTest.java | 62 +--
.../tsfile/read/filter/StatisticsFilterTest.java | 313 ++++++------
.../read/query/executor/QueryExecutorTest.java | 11 +-
.../read/query/timegenerator/ReadWriteTest.java | 10 +-
.../timegenerator/TimeGeneratorReadEmptyTest.java | 10 +-
.../timegenerator/TimeGeneratorReadWriteTest.java | 10 +-
.../query/timegenerator/TimeGeneratorTest.java | 10 +-
.../iotdb/tsfile/read/reader/ReaderTest.java | 8 +-
82 files changed, 1767 insertions(+), 1813 deletions(-)
copy
iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/{read/filter/basic/IDisableStatisticsValueFilter.java
=> file/metadata/IMetadata.java} (69%)
rename
iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/{operator/base
=> basic}/BinaryLogicalFilter.java (91%)
rename
iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/{IDisableStatisticsTimeFilter.java
=> DisableStatisticsTimeFilter.java} (79%)
rename
iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/{IDisableStatisticsValueFilter.java
=> DisableStatisticsValueFilter.java} (68%)
delete mode 100644
iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/IStatefulFilter.java
delete mode 100644
iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/ITimeFilter.java
delete mode 100644
iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/IValueFilter.java
create mode 100644
iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/TimeFilter.java
create mode 100644
iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/basic/ValueFilter.java
rename
iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/factory/{TimeFilter.java
=> TimeFilterApi.java} (98%)
rename
iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/factory/{ValueFilter.java
=> ValueFilterApi.java} (92%)
delete mode 100644
iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/base/ColumnCompareFilter.java
delete mode 100644
iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/base/ColumnPatternMatchFilter.java
delete mode 100644
iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/base/ColumnRangeFilter.java
delete mode 100644
iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/operator/base/ColumnSetFilter.java
delete mode 100644
iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/IAlignedPageReader.java
copy example/rocketmq/src/main/java/org/apache/iotdb/rocketmq/Utils.java =>
iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/Preconditions.java
(66%)
create mode 100644
iotdb-core/tsfile/src/test/java/org/apache/iotdb/tsfile/read/filter/FilterTestUtil.java
