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

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

commit 1510ae47fc9abc42efa5ded6f8f188625934c49d
Merge: 710f7d5 12abbe9
Author: 151250176 <[email protected]>
AuthorDate: Thu Dec 17 11:07:31 2020 +0800

    Merge branch 'master' of https://github.com/apache/iotdb into 
virtual_partition_2_merge

 .github/workflows/sonar_and_coverall.yml           |    2 +-
 .../antlr4/org/apache/iotdb/db/qp/sql/SqlBase.g4   |    4 -
 docs/SystemDesign/SchemaManager/SchemaManager.md   |   20 +-
 .../DML Data Manipulation Language.md              |   94 +-
 docs/UserGuide/Operation Manual/SQL Reference.md   |    7 +-
 .../UserGuide/System Tools/MLogParser Tool.md      |   21 +-
 .../zh/SystemDesign/SchemaManager/SchemaManager.md |   20 +-
 docs/zh/SystemDesign/StorageEngine/Compaction.md   |   10 +-
 docs/zh/UserGuide/Concept/SDT.md                   |   22 +-
 .../DML Data Manipulation Language.md              |   98 +-
 .../zh/UserGuide/Operation Manual/SQL Reference.md |    7 +-
 .../zh/UserGuide/System Tools/MLogParser Tool.md   |   21 +-
 server/file-changelists/mlog-changelist.md         |    4 +
 .../resources/conf/iotdb-engine.properties         |   11 +-
 .../assembly/resources/tools/mlog/mLogParser.bat   |   62 +
 .../assembly/resources/tools/mlog/mLogParser.sh    |   48 +
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java |   16 +-
 .../org/apache/iotdb/db/conf/IoTDBConfigCheck.java |   35 +-
 .../org/apache/iotdb/db/conf/IoTDBDescriptor.java  |    6 +
 .../db/engine/cache/TimeSeriesMetadataCache.java   |    7 +-
 .../level/LevelCompactionTsFileManagement.java     |  152 +--
 .../no/NoCompactionTsFileManagement.java           |   10 +-
 .../compaction/utils/CompactionLogAnalyzer.java    |   19 +-
 .../engine/compaction/utils/CompactionLogger.java  |   16 +-
 .../engine/compaction/utils/CompactionUtils.java   |   84 +-
 .../iotdb/db/engine/flush/MemTableFlushTask.java   |    1 +
 .../db/engine/storagegroup/TsFileResource.java     |   14 +-
 .../{MLogWriter.java => MLogTxtWriter.java}        |   72 +-
 .../org/apache/iotdb/db/metadata/MManager.java     |  236 ++--
 .../java/org/apache/iotdb/db/metadata/MTree.java   |  127 ++-
 .../apache/iotdb/db/metadata/MetadataConstant.java |   10 +-
 .../iotdb/db/metadata/logfile/MLogReader.java      |   74 ++
 .../iotdb/db/metadata/logfile/MLogTxtReader.java   |   79 ++
 .../iotdb/db/metadata/logfile/MLogWriter.java      |  454 ++++++++
 .../org/apache/iotdb/db/metadata/mnode/MNode.java  |   25 +-
 .../iotdb/db/metadata/mnode/MeasurementMNode.java  |   37 +-
 .../iotdb/db/metadata/mnode/StorageGroupMNode.java |   22 +-
 .../org/apache/iotdb/db/qp/logical/Operator.java   |    5 +-
 .../iotdb/db/qp/logical/crud/QueryOperator.java    |   18 +
 .../apache/iotdb/db/qp/physical/PhysicalPlan.java  |   28 +-
 .../iotdb/db/qp/physical/crud/GroupByTimePlan.java |   19 +
 ...tStorageGroupPlan.java => ChangeAliasPlan.java} |   74 +-
 ...rageGroupPlan.java => ChangeTagOffsetPlan.java} |   76 +-
 .../qp/physical/sys/CreateMultiTimeSeriesPlan.java |    4 +-
 .../db/qp/physical/sys/CreateTimeSeriesPlan.java   |   66 +-
 .../db/qp/physical/sys/DeleteTimeSeriesPlan.java   |    4 +
 .../{SetStorageGroupPlan.java => MNodePlan.java}   |   88 +-
 .../db/qp/physical/sys/MeasurementMNodePlan.java   |  143 +++
 .../db/qp/physical/sys/SetStorageGroupPlan.java    |   18 +-
 .../iotdb/db/qp/physical/sys/SetTTLPlan.java       |    1 -
 ...geGroupPlan.java => StorageGroupMNodePlan.java} |   79 +-
 .../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java    |   13 +
 .../iotdb/db/qp/strategy/PhysicalGenerator.java    |    2 +
 .../dataset/groupby/GroupByEngineDataSet.java      |   70 +-
 .../org/apache/iotdb/db/service/TSServiceImpl.java |    5 +-
 .../db/sync/receiver/transfer/SyncServiceImpl.java |   37 +-
 .../org/apache/iotdb/db/tools/mlog/MLogParser.java |  194 ++++
 .../db/tools/upgrade/TsFileOnlineUpgradeTool.java  |    1 +
 .../java/org/apache/iotdb/db/utils/QueryUtils.java |    1 -
 .../iotdb/db/utils/datastructure/TVList.java       |    6 +-
 .../org/apache/iotdb/db/writelog/io/LogWriter.java |   56 +-
 .../db/writelog/node/ExclusiveWriteLogNode.java    |   13 +-
 .../engine/compaction/LevelCompactionLogTest.java  |   82 ++
 .../compaction/LevelCompactionMergeTest.java       |  142 +++
 .../compaction/LevelCompactionRecoverTest.java     |  507 +++++++++
 .../compaction/LevelCompactionSelectorTest.java    |   73 ++
 .../db/engine/compaction/LevelCompactionTest.java  |  208 ++++
 .../LevelCompactionTsFileManagementTest.java       |  120 ++
 .../NoCompactionTsFileManagementTest.java          |  127 +++
 .../iotdb/db/integration/IOTDBGroupByIT.java       |  101 ++
 .../iotdb/db/integration/IoTDBCompactionIT.java    |  154 ---
 .../db/integration/IoTDBCreateSnapshotIT.java      |   74 +-
 .../db/integration/IoTDBLevelCompactionIT.java     | 1180 ++++++++++++++++++++
 .../iotdb/db/integration/IoTDBRestartIT.java       |    2 -
 .../apache/iotdb/db/qp/plan/PhysicalPlanTest.java  |    9 +-
 .../query/executor/GroupByEngineDataSetTest.java   |  269 ++++-
 .../org/apache/iotdb/db/tools/MLogParserTest.java  |  150 +++
 .../org/apache/iotdb/db/tools/WalCheckerTest.java  |    5 +-
 .../iotdb/db/writelog/io/LogWriterReaderTest.java  |    4 +-
 .../db/writelog/io/MultiFileLogReaderTest.java     |    4 +-
 tsfile/format-changelist.md                        |    2 +-
 .../org/apache/iotdb/tsfile/file/MetaMarker.java   |    4 +
 .../iotdb/tsfile/file/footer/ChunkGroupFooter.java |   31 +-
 .../file/metadata/MetadataIndexConstructor.java    |    9 +-
 .../tsfile/file/metadata/MetadataIndexNode.java    |    7 +-
 .../file/metadata/enums/CompressionType.java       |  118 +-
 .../iotdb/tsfile/read/TsFileSequenceReader.java    |   20 +-
 .../iotdb/tsfile/write/writer/TsFileIOWriter.java  |   10 +-
 .../tsfile/read/TsFileSequenceReaderTest.java      |    2 +-
 .../iotdb/tsfile/write/TsFileIOWriterTest.java     |    8 +
 90 files changed, 5453 insertions(+), 937 deletions(-)


Reply via email to