You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by su...@apache.org on 2020/02/18 12:48:35 UTC
[incubator-iotdb] branch mmanager_refactor updated (00a4cad ->
2029fe5)
This is an automated email from the ASF dual-hosted git repository.
sunzesong pushed a change to branch mmanager_refactor
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 00a4cad Solve conflict
add 7a161ed [IOTDB-482] Vectorized TimeGenerator (#818)
add 38fa1e1 Merge remote-tracking branch 'upstream/new_series_reader' into mmanager
add 2029fe5 Solve conflict and fix some review suggestions
No new revisions were added by this update.
Summary of changes:
.../SystemDesign/1-TsFile/4-Read.md | 4 +-
docs/Documentation/SystemDesign/1-TsFile/4-Read.md | 4 +-
.../resources/conf/iotdb-engine.properties | 2 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 2 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 58 +++++----
...tException.java => IncorrectRootException.java} | 6 +-
.../org/apache/iotdb/db/metadata/MManager.java | 8 +-
.../java/org/apache/iotdb/db/metadata/MTree.java | 34 +++---
.../org/apache/iotdb/db/metadata/MetaUtils.java | 6 +-
.../iotdb/db/metadata/mnode/InternalMNode.java | 10 +-
.../apache/iotdb/db/metadata/mnode/LeafMNode.java | 8 +-
.../org/apache/iotdb/db/metadata/mnode/MNode.java | 4 +-
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 6 +-
.../dataset/RawQueryDataSetWithValueFilter.java | 20 +---
.../groupby/GroupByWithValueFilterDataSet.java | 4 +-
.../db/query/executor/AggregationExecutor.java | 6 +-
.../db/query/executor/RawDataQueryExecutor.java | 4 +-
.../reader/series/SeriesRawDataBatchReader.java | 6 +
.../timegenerator/AbstractNodeConstructor.java | 75 ------------
.../db/query/timegenerator/EngineLeafNode.java | 50 --------
.../query/timegenerator/EngineTimeGenerator.java | 67 -----------
...deConstructor.java => ServerTimeGenerator.java} | 67 ++++++-----
.../db/integration/IoTDBEngineTimeGeneratorIT.java | 10 +-
.../iotdb/db/metadata/MManagerImproveTest.java | 2 +-
.../iotdb/tsfile/common/conf/TSFileConfig.java | 11 ++
.../iotdb/tsfile/common/conf/TSFileDescriptor.java | 5 +-
.../apache/iotdb/tsfile/read/common/BatchData.java | 8 ++
.../iotdb/tsfile/read/common/TimeColumn.java | 78 +++++++++++++
.../query/executor/ExecutorWithTimeGenerator.java | 4 +-
.../read/query/timegenerator/TimeGenerator.java | 100 +++++++++++++++-
.../query/timegenerator/TimeGeneratorImpl.java | 130 ---------------------
.../query/timegenerator/TsFileTimeGenerator.java | 51 ++++++++
.../read/query/timegenerator/node/AndNode.java | 86 +++++++++-----
.../read/query/timegenerator/node/LeafNode.java | 54 ++++-----
.../tsfile/read/query/timegenerator/node/Node.java | 5 +-
.../read/query/timegenerator/node/OrNode.java | 121 +++++++++++--------
.../iotdb/tsfile/read/reader/page/PageReader.java | 23 ++--
.../reader/series/AbstractFileSeriesReader.java | 22 +---
.../read/reader/series/EmptyFileSeriesReader.java | 5 -
.../tsfile/read/query/timegenerator/NodeTest.java | 30 ++---
.../query/timegenerator/TimeGeneratorTest.java | 2 +-
41 files changed, 591 insertions(+), 607 deletions(-)
rename server/src/main/java/org/apache/iotdb/db/exception/metadata/{RootNotExistException.java => IncorrectRootException.java} (83%)
delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/timegenerator/AbstractNodeConstructor.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineLeafNode.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineTimeGenerator.java
rename server/src/main/java/org/apache/iotdb/db/query/timegenerator/{EngineNodeConstructor.java => ServerTimeGenerator.java} (50%)
create mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/TimeColumn.java
delete mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/TimeGeneratorImpl.java
create mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/TsFileTimeGenerator.java