You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xi...@apache.org on 2022/03/26 13:11:42 UTC
[iotdb] branch master updated (f36f29c -> ce4d28f)
This is an automated email from the ASF dual-hosted git repository.
xingtanzjr pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from f36f29c Ratis Consensus Impl Bug Fix (#5348)
add ce4d28f [IOTDB-2768] Simply Implement SeriesScanOperator and TimeJoinOperator (#5342)
No new revisions were added by this update.
Summary of changes:
.../apache/iotdb/db/mpp/buffer/ISinkHandle.java | 2 +-
.../apache/iotdb/db/mpp/buffer/ISourceHandle.java | 2 +-
.../apache/iotdb/db/mpp/buffer/SourceHandle.java | 2 +-
.../org/apache/iotdb/db/mpp/common/TsBlock.java | 73 ------
.../db/mpp/execution/FragmentInstanceContext.java | 7 +-
.../org/apache/iotdb/db/mpp/operator/Operator.java | 8 +-
.../iotdb/db/mpp/operator/OperatorContext.java | 13 +-
.../iotdb/db/mpp/operator/SeriesScanOperator.java | 39 ----
.../db/mpp/operator/process/AggregateOperator.java | 2 +-
.../mpp/operator/process/DeviceMergeOperator.java | 2 +-
.../db/mpp/operator/process/FillOperator.java | 2 +-
.../mpp/operator/process/FilterNullOperator.java | 2 +-
.../mpp/operator/process/GroupByLevelOperator.java | 2 +-
.../db/mpp/operator/process/LimitOperator.java | 10 +-
.../db/mpp/operator/process/OffsetOperator.java | 2 +-
.../db/mpp/operator/process/SortOperator.java | 2 +-
.../db/mpp/operator/process/TimeJoinOperator.java | 123 +++++++++-
.../db/mpp/operator/sink/FragmentSinkOperator.java | 2 +-
.../iotdb/db/mpp/operator/sink/SinkOperator.java | 2 +-
.../source/SeriesAggregateScanOperator.java | 2 +-
.../db/mpp/operator/source/SeriesScanOperator.java | 110 +++++++--
.../operator/source/SeriesScanUtil.java} | 250 ++++++---------------
.../query/reader/chunk/MemAlignedPageReader.java | 7 +
.../iotdb/db/query/reader/chunk/MemPageReader.java | 46 ++++
.../apache/iotdb/tsfile/read/common/Column.java | 4 +-
.../iotdb/tsfile/read/common/TimeColumn.java | 5 +-
.../apache/iotdb/tsfile/read/common/TsBlock.java | 175 +++++++++++++++
.../iotdb/tsfile/read}/common/TsBlockMetadata.java | 8 +-
.../iotdb/tsfile/read/reader/IPageReader.java | 3 +
.../tsfile/read/reader/page/AlignedPageReader.java | 7 +
.../iotdb/tsfile/read/reader/page/PageReader.java | 53 +++++
31 files changed, 619 insertions(+), 348 deletions(-)
delete mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/common/TsBlock.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/operator/SeriesScanOperator.java
copy server/src/main/java/org/apache/iotdb/db/{query/reader/series/SeriesReader.java => mpp/operator/source/SeriesScanUtil.java} (86%)
copy server/src/main/java/org/apache/iotdb/db/service/DataNodeMBean.java => tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/Column.java (91%)
copy cluster/src/main/java/org/apache/iotdb/cluster/server/raft/MetaRaftServiceMBean.java => tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/TimeColumn.java (90%)
create mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/TsBlock.java
rename {server/src/main/java/org/apache/iotdb/db/mpp => tsfile/src/main/java/org/apache/iotdb/tsfile/read}/common/TsBlockMetadata.java (85%)