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/07/22 02:07:57 UTC
[incubator-iotdb] 01/03: Merge remote-tracking branch
'origin/master'
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch add_tablet_doc
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit bf8037ed23327c2b9f19ecbb5af1e11f0ee67843
Merge: 870f92b f1adbb4
Author: qiaojialin <64...@qq.com>
AuthorDate: Mon Jul 20 10:12:15 2020 +0800
Merge remote-tracking branch 'origin/master'
docs/UserGuide/System Tools/Log Visualizer.md | 160 -----
docs/zh/UserGuide/System Tools/Log Visualizer.md | 146 -----
server/pom.xml | 5 -
.../resources/conf/iotdb-engine.properties | 11 +
.../resources/tools/logVisualize/config.properties | 22 -
.../tools/logVisualize/default.log.pattern | 45 --
.../tools/logVisualize/log-visualizer-cmd.bat | 65 --
.../tools/logVisualize/log-visualizer-cmd.sh | 47 --
.../tools/logVisualize/log-visualizer-gui.bat | 65 --
.../tools/logVisualize/log-visualizer-gui.sh | 47 --
.../plans/closeMetadataConsumption.plan | 6 -
.../tools/logVisualize/plans/compressionRatio.plan | 6 -
.../logVisualize/plans/dynamicParameters.plan | 6 -
.../tools/logVisualize/plans/flushSubmits.plan | 7 -
.../plans/flushTimeConsumption.plan.example | 56 --
.../tools/logVisualize/plans/memTableWait.plan | 6 -
.../tools/logVisualize/plans/mergeFileNum.plan | 7 -
.../tools/logVisualize/plans/mergeRate.plan | 10 -
.../logVisualize/plans/mergeSeriesProgress.plan | 7 -
.../org/apache/iotdb/db/concurrent/ThreadName.java | 1 +
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 57 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 16 +
.../org/apache/iotdb/db/engine/StorageEngine.java | 2 +-
.../iotdb/db/engine/cache/ChunkMetadataCache.java | 2 +-
.../apache/iotdb/db/engine/flush/FlushManager.java | 14 +-
.../iotdb/db/engine/flush/FlushManagerMBean.java | 1 -
.../iotdb/db/engine/flush/MemTableFlushTask.java | 56 +-
.../iotdb/db/engine/flush/TsFileFlushPolicy.java | 4 +-
.../iotdb/db/engine/flush/VmLogAnalyzer.java | 95 +++
.../org/apache/iotdb/db/engine/flush/VmLogger.java | 76 +++
.../apache/iotdb/db/engine/flush/VmMergeUtils.java | 225 +++++++
.../db/engine/flush/pool/AbstractPoolManager.java | 7 +-
.../engine/flush/pool/FlushSubTaskPoolManager.java | 5 +-
.../db/engine/flush/pool/FlushTaskPoolManager.java | 5 +-
...oolManager.java => VmMergeTaskPoolManager.java} | 27 +-
.../db/engine/merge/manage/MergeResource.java | 4 +-
.../iotdb/db/engine/merge/recover/LogAnalyzer.java | 8 +-
.../iotdb/db/engine/merge/recover/MergeLogger.java | 4 +-
.../merge/selector/MaxFileMergeFileSelector.java | 6 +-
.../iotdb/db/engine/merge/task/MergeFileTask.java | 30 +-
.../iotdb/db/engine/merge/task/MergeTask.java | 2 +-
.../db/engine/merge/task/RecoverMergeTask.java | 8 +-
.../engine/storagegroup/StorageGroupProcessor.java | 509 ++++++++-------
.../iotdb/db/engine/storagegroup/TsFileLock.java | 4 +-
.../db/engine/storagegroup/TsFileProcessor.java | 683 +++++++++++++++++----
.../db/engine/storagegroup/TsFileResource.java | 102 +--
.../iotdb/db/engine/upgrade/UpgradeTask.java | 14 +-
.../iotdb/db/query/control/FileReaderManager.java | 16 +-
.../iotdb/db/query/control/QueryFileManager.java | 3 +-
.../dataset/groupby/LocalGroupByExecutor.java | 19 +-
.../db/query/reader/chunk/DiskChunkLoader.java | 2 +-
.../chunk/metadata/DiskChunkMetadataLoader.java | 2 +-
.../db/sync/receiver/load/FileLoaderManager.java | 2 +-
.../db/sync/sender/manage/SyncFileManager.java | 2 +-
.../apache/iotdb/db/tools/logvisual/LogEntry.java | 146 -----
.../apache/iotdb/db/tools/logvisual/LogFilter.java | 220 -------
.../apache/iotdb/db/tools/logvisual/LogParser.java | 46 --
.../iotdb/db/tools/logvisual/LogVisualizer.java | 437 -------------
.../iotdb/db/tools/logvisual/PatternLogParser.java | 197 ------
.../db/tools/logvisual/TimeSeriesStatistics.java | 113 ----
.../iotdb/db/tools/logvisual/VisualUtils.java | 69 ---
.../db/tools/logvisual/VisualizationPlan.java | 259 --------
.../db/tools/logvisual/conf/GuiPropertyKeys.java | 48 --
.../exceptions/NoLogFileLoadedException.java | 28 -
.../logvisual/exceptions/NoSuchPlanException.java | 28 -
.../exceptions/UnmatchedContentException.java | 28 -
.../exceptions/VisualizationException.java | 39 --
.../db/tools/logvisual/gui/ClosableComboTab.java | 42 --
.../iotdb/db/tools/logvisual/gui/ClosableTab.java | 55 --
.../db/tools/logvisual/gui/FileSelectionBox.java | 109 ----
.../db/tools/logvisual/gui/LabeledComboBox.java | 63 --
.../iotdb/db/tools/logvisual/gui/LoadLogBox.java | 62 --
.../tools/logvisual/gui/LogVisualizationGui.java | 182 ------
.../iotdb/db/tools/logvisual/gui/MainPanel.java | 107 ----
.../iotdb/db/tools/logvisual/gui/PlanBox.java | 301 ---------
.../db/tools/logvisual/gui/PlanDetailPanel.java | 242 --------
.../db/tools/logvisual/gui/ResultPlotTab.java | 49 --
.../db/tools/logvisual/gui/ResultStatisticTab.java | 74 ---
.../org/apache/iotdb/db/utils/FileLoaderUtils.java | 6 +-
.../org/apache/iotdb/db/utils/FilePathUtils.java | 2 +-
.../java/org/apache/iotdb/db/utils/MergeUtils.java | 37 +-
.../org/apache/iotdb/db/utils/UpgradeUtils.java | 8 +-
.../iotdb/db/writelog/recover/LogReplayer.java | 10 +-
.../writelog/recover/TsFileRecoverPerformer.java | 248 ++++++--
.../db/engine/cache/ChunkMetadataCacheTest.java | 12 +-
.../db/engine/memtable/MemTableFlushTaskTest.java | 10 +-
.../iotdb/db/engine/merge/MergeOverLapTest.java | 2 +-
.../apache/iotdb/db/engine/merge/MergeTest.java | 2 +-
.../iotdb/db/engine/merge/MergeUpgradeTest.java | 6 +-
.../storagegroup/StorageGroupProcessorTest.java | 37 +-
.../storagegroup/TsFileProcessorEnableVmTest.java | 194 ++++++
.../engine/storagegroup/TsFileProcessorTest.java | 152 +++--
.../iotdb/db/integration/IoTDBLargeDataIT.java | 2 +-
.../db/integration/IoTDBLoadExternalTsfileIT.java | 40 +-
.../iotdb/db/integration/IoTDBRecoverIT.java | 72 ++-
.../db/query/control/FileReaderManagerTest.java | 4 +-
.../query/reader/series/SeriesReaderTestUtil.java | 2 +-
.../db/sync/receiver/load/FileLoaderTest.java | 6 +-
.../apache/iotdb/db/utils/EnvironmentUtils.java | 19 +-
.../iotdb/db/writelog/recover/LogReplayerTest.java | 32 +-
.../recover/RecoverResourceFromReaderTest.java | 6 +-
.../db/writelog/recover/SeqTsFileRecoverTest.java | 8 +-
.../writelog/recover/UnseqTsFileRecoverTest.java | 4 +-
site/src/main/.vuepress/config.js | 6 -
.../tsfile/common/constant/TsFileConstant.java | 5 +-
.../iotdb/tsfile/file/header/ChunkHeader.java | 32 +-
.../iotdb/tsfile/file/metadata/ChunkMetadata.java | 16 +-
.../apache/iotdb/tsfile/read/common/BatchData.java | 13 +
.../org/apache/iotdb/tsfile/read/common/Chunk.java | 9 +
.../iotdb/tsfile/write/chunk/ChunkWriterImpl.java | 1 +
.../iotdb/tsfile/write/chunk/IChunkWriter.java | 6 +
.../write/writer/RestorableTsFileIOWriter.java | 12 +-
.../iotdb/tsfile/write/writer/TsFileIOWriter.java | 5 +
113 files changed, 2298 insertions(+), 4409 deletions(-)