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/11/22 10:15:23 UTC
[iotdb] 12/21: Merge remote-tracking branch 'origin/master'

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

qiaojialin pushed a commit to branch fix_doc_sg
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 1877b29783e8785de15fcd31c75bc73eedd984ec
Merge: 751aaa4 420bdc3
Author: qiaojialin <64...@qq.com>
AuthorDate: Thu Nov 12 21:46:38 2020 +0800

    Merge remote-tracking branch 'origin/master'

 docs/SystemDesign/TsFile/Format.md                 |   6 +
 docs/zh/SystemDesign/TsFile/Format.md              |   6 +
 .../org/apache/iotdb/db/engine/StorageEngine.java  |  42 ++++++-
 .../db/engine/compaction/TsFileManagement.java     |  19 +--
 .../iotdb/db/engine/merge/task/MergeFileTask.java  | 128 ++-------------------
 .../engine/storagegroup/StorageGroupProcessor.java |  39 +++----
 .../org/apache/iotdb/db/metadata/MManager.java     |  27 +++--
 .../query/dataset/groupby/GroupByFillDataSet.java  |  12 +-
 .../groupby/GroupByWithValueFilterDataSet.java     |  19 ++-
 .../groupby/GroupByWithoutValueFilterDataSet.java  |  37 +++---
 .../db/query/executor/AggregationExecutor.java     |  31 +++--
 .../iotdb/db/query/executor/FillQueryExecutor.java |  61 +++++-----
 .../iotdb/db/query/executor/LastQueryExecutor.java |  47 ++++----
 .../db/query/executor/RawDataQueryExecutor.java    |  56 +++++----
 .../iotdb/db/query/reader/series/SeriesReader.java |   6 +
 .../query/timegenerator/ServerTimeGenerator.java   |  28 ++++-
 .../db/sync/receiver/load/FileLoaderManager.java   |   4 +-
 .../apache/iotdb/db/engine/merge/MergeLogTest.java |   2 +-
 .../iotdb/db/engine/merge/MergePerfTest.java       |   4 +-
 .../iotdb/db/engine/merge/MergeTaskTest.java       |   6 +-
 .../apache/iotdb/db/engine/merge/MergeTest.java    |   1 +
 .../engine/modification/DeletionFileNodeTest.java  | 106 +++++++++++------
 .../db/integration/IoTDBOverlappedPageIT.java      |  14 ++-
 .../main/java/org/apache/iotdb/session/Config.java |   4 +-
 site/src/main/.vuepress/config.js                  |   3 +-
 .../iotdb/tsfile/read/TsFileSequenceReader.java    |   1 +
 .../read/query/timegenerator/TimeGenerator.java    |   4 +-
 .../tsfile/v1/file/metadata/TsFileMetadataV1.java  |  13 +--
 28 files changed, 390 insertions(+), 336 deletions(-)