You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2020/02/18 09:46:54 UTC

[incubator-iotdb] branch new_series_reader updated (6658a0a -> 7a161ed)

This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a change to branch new_series_reader
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.


    from 6658a0a  [IOTDB-496]An extra line in CLI when the result is empty (#819)
     add 7a161ed  [IOTDB-482] Vectorized TimeGenerator (#818)

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 +++++----
 .../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} |  64 +++++-----
 .../db/integration/IoTDBEngineTimeGeneratorIT.java |  10 +-
 .../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    |  53 ++++-----
 .../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 +-
 32 files changed, 549 insertions(+), 561 deletions(-)
 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