You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hx...@apache.org on 2020/11/13 03:19:37 UTC
[iotdb] 02/02: Merge remote-tracking branch 'origin/cluster_new'
into comment_cluster_new
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch comment_cluster_new
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit c7175024be91b36f47cc8bd42fc8863e98300a43
Merge: 5da1b87 6273154
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Fri Nov 13 11:18:57 2020 +0800
Merge remote-tracking branch 'origin/cluster_new' into comment_cluster_new
.travis.yml | 12 +-
.../cluster/log/manage/CommittedEntryManager.java | 2 +-
.../apache/iotdb/cluster/metadata/CMManager.java | 45 ++++--
.../iotdb/cluster/query/ClusterPlanRouter.java | 11 +-
.../cluster/server/member/MetaGroupMember.java | 70 +++++----
.../iotdb/cluster/log/LogDispatcherTest.java | 9 +-
.../cluster/log/catchup/LogCatchUpTaskTest.java | 4 +-
docs/SystemDesign/Tools/Sync.md | 2 +-
docs/SystemDesign/TsFile/Format.md | 6 +
docs/UserGuide/Server/ServerFileList.md | 4 +-
docs/UserGuide/Server/Single Node Setup.md | 4 +-
docs/UserGuide/System Tools/JMX Tool.md | 2 +-
.../UserGuide/System Tools/Load External Tsfile.md | 4 +-
.../System Tools/Monitor and Log Tools.md | 31 ++--
.../Query History Visualization Tool.md | 6 +-
docs/UserGuide/System Tools/Sync Tool.md | 2 +-
docs/UserGuide/System Tools/Watermark Tool.md | 2 +-
docs/UserGuide/UserGuideReadme.md | 4 +-
docs/zh/SystemDesign/TsFile/Format.md | 6 +
.../file-changelists/TsFileResource-changelist.md | 16 +-
server/file-changelists/role-changelist.md | 14 ++
.../storage_group_version-changelist.md | 20 ---
server/file-changelists/user-changelist.md | 14 ++
server/src/assembly/resources/conf/iotdb-env.bat | 2 +-
.../org/apache/iotdb/db/engine/StorageEngine.java | 31 +++-
.../compaction/CompactionMergeTaskPoolManager.java | 12 +-
.../db/engine/compaction/TsFileManagement.java | 26 +---
.../level/LevelCompactionTsFileManagement.java | 98 +++++++++----
.../compaction/utils/CompactionLogAnalyzer.java | 12 +-
.../iotdb/db/engine/flush/MemTableFlushTask.java | 2 +-
.../iotdb/db/engine/merge/manage/MergeManager.java | 25 +++-
.../iotdb/db/engine/merge/task/MergeFileTask.java | 151 +------------------
.../db/engine/querycontext/ReadOnlyMemChunk.java | 1 +
.../engine/storagegroup/StorageGroupProcessor.java | 84 ++++++-----
.../db/exception/TsFileProcessorException.java | 2 +-
.../org/apache/iotdb/db/metadata/MManager.java | 30 +++-
.../iotdb/db/metrics/server/ServerArgument.java | 91 ++++++------
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 19 ++-
.../qp/physical/sys/CreateMultiTimeSeriesPlan.java | 9 +-
.../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 | 54 +++----
.../db/query/executor/RawDataQueryExecutor.java | 56 ++++---
.../iotdb/db/query/reader/series/SeriesReader.java | 6 +
.../query/timegenerator/ServerTimeGenerator.java | 28 +++-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 163 +++++++++++----------
.../db/sync/receiver/load/FileLoaderManager.java | 4 +-
.../org/apache/iotdb/db/utils/SerializeUtils.java | 1 +
.../org/apache/iotdb/db/writelog/io/LogWriter.java | 9 +-
.../db/writelog/node/ExclusiveWriteLogNode.java | 155 +++++++++++++++-----
.../writelog/recover/TsFileRecoverPerformer.java | 18 ++-
.../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 +++++++++-----
.../engine/storagegroup/TsFileProcessorTest.java | 14 +-
.../iotdb/db/integration/IoTDBAggregationIT.java | 36 ++++-
.../db/integration/IoTDBOverlappedPageIT.java | 14 +-
.../apache/iotdb/db/writelog/WriteLogNodeTest.java | 11 +-
.../recover/RecoverResourceFromReaderTest.java | 2 +-
.../db/writelog/recover/SeqTsFileRecoverTest.java | 4 +-
.../writelog/recover/UnseqTsFileRecoverTest.java | 2 +-
server/src/test/resources/logback.xml | 2 +-
.../main/java/org/apache/iotdb/session/Config.java | 4 +-
.../java/org/apache/iotdb/session/Session.java | 9 +-
.../apache/iotdb/session/SessionConnection.java | 66 +++++----
site/pom.xml | 12 +-
site/src/main/.vuepress/config.js | 3 +-
.../iotdb/tsfile/read/TsFileSequenceReader.java | 1 +
.../read/query/timegenerator/TimeGenerator.java | 4 +-
.../iotdb/tsfile/utils/ReadWriteIOUtils.java | 6 +-
.../tsfile/v1/file/metadata/TsFileMetadataV1.java | 13 +-
76 files changed, 1095 insertions(+), 766 deletions(-)