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 2022/04/12 04:48:47 UTC
[iotdb] branch double_live updated (04b36aa128 -> 20829ccddc)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a change to branch double_live
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from 04b36aa128 [To double_live] DoubleWrite for 0.13 (#5311)
add f8d97a887e [IOTDB-2787] Fix aligned mem chunk concurrent problem (#5324)
add e10325f04e [IOTDB-2773] fix overlapped data should be consumed first bug (#5328)
add 294d729358 [IOTDB-2775] Fix throwing exception when query non-exist device in TsFileSequenceReader
add fcb3781290 [IOTDB-2610] Add metrics for compation module (#5332)
add b558beb565 [To rel/0.13][IOTDB-2820]Update Userguide SQL about Trigger (#5373)
add 67a7cf8e5a [To rel/0.13][IOTDB-2824] fix stop-server.sh that wrongly kill process (#5381)
add 6ec9bf6aa4 [To rel/0.13] Update python client doc and code for NumpyTablet (#5389)
add ca5fb172c3 [IOTDB-2671][IOTDB-2672][IOTDB-2777] Modify the name of dropwizard, update the implementation of IoTDBReporter and fix NPE error. (#5358)
add 5bcdd4d4f8 [IOTDB-2855] Fix DeletionFileNodeTest error (#5435) (#5439)
add 1c6b6922c6 [To rel/0.13][IOTDB-2826]Unmark storage group among templates when deleted (#5431)
add a26f9234b7 [IOTDB-2839] Add Python client CI (#5407)
add 5b6485f00b [IoTDB-2837] Add check and sort for NumpyTablet to make sure timestamps are ordered (#5434)
add 79b03bdc5a Fix sonar-coveralls aways be cancelled (#5283)
add 9b1d0822ef [IOTDB-2859] Fix python tablet with None value is incorrect (#5441)
add 5ff8133586 [IOTDB-2862] Fix SQL injection risks of grafana-connector (#5450) (#5452)
add 344605cbbc [To rel/0.13][IOTDB-2864] Fix Read-only occurred when insert Text values to aligned timeseries (#5461)
add 4445d453b6 [IOTDB-2838] Check and auto correct endian type for NumpyTablet (#5448) (#5468)
add 72e21c9ffb Cherry pick compaction from master to rel/0.13 (#5480)
new 20829ccddc Merge remote-tracking branch 'origin/rel/0.13' into double_live
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/{client.yml => client-cpp.yml} | 2 +-
.../workflows/{client-go.yml => client-python.yml} | 23 +-
.github/workflows/sonar-coveralls.yml | 7 -
client-cpp/pom.xml | 4 +-
client-py/README.md | 290 ++++++++++--
client-py/SessionAlignedTimeseriesExample.py | 16 +-
client-py/SessionAlignedTimeseriesTest.py | 280 -----------
client-py/SessionExample.py | 50 +-
client-py/SessionTest.py | 336 -------------
client-py/iotdb/Session.py | 104 ++++-
client-py/iotdb/utils/IoTDBConstants.py | 11 +
client-py/iotdb/utils/IoTDBRpcDataSet.py | 2 +-
client-py/iotdb/utils/NumpyTablet.py | 32 +-
client-py/iotdb/utils/Tablet.py | 31 +-
client-py/requirements_dev.txt | 2 +-
client-py/tests/tablet_performance_comparison.py | 8 +-
client-py/tests/test_aligned_timeseries.py | 294 ++++++++++++
client-py/tests/test_dataframe.py | 6 +-
client-py/tests/test_numpy_tablet.py | 147 ++++++
client-py/tests/test_session.py | 362 ++++++++++++++
client-py/tests/test_tablet.py | 109 +++++
client-py/tests/test_todf.py | 16 +-
.../apache/iotdb/cluster/RemoteTsFileResource.java | 5 +-
compile-tools/pom.xml | 6 +-
distribution/pom.xml | 2 +-
.../UserGuide/API/Programming-Python-Native-API.md | 52 +--
docs/UserGuide/Maintenance-Tools/Metric-Tool.md | 27 +-
docs/UserGuide/Process-Data/Alerting.md | 2 +-
.../UserGuide/API/Programming-Python-Native-API.md | 49 +-
docs/zh/UserGuide/Maintenance-Tools/Metric-Tool.md | 69 +--
docs/zh/UserGuide/Process-Data/Alerting.md | 2 +-
example/client-cpp-example/pom.xml | 2 +-
example/trigger/pom.xml | 2 +-
example/udf/pom.xml | 2 +-
grafana-connector/pom.xml | 2 +-
.../controller/DatabaseConnectController.java | 3 +-
.../iotdb/web/grafana/dao/impl/BasicDaoImpl.java | 43 +-
integration/pom.xml | 6 +-
...thDeletion2IT.java => IoTDBMaxTimeQueryIT.java} | 99 +++-
.../integration/IoTDBSizeTieredCompactionIT.java | 2 +-
...luesIT.java => IoTDBInsertAlignedValuesIT.java} | 21 +-
jdbc/pom.xml | 2 +-
metrics/dropwizard-metrics/pom.xml | 1 -
.../iotdb/metrics/dropwizard/MetricName.java | 60 ++-
.../reporter/DropwizardIoTDBReporter.java | 5 +-
.../reporter/DropwizardMetricsExporter.java | 169 +++----
.../metrics/dropwizard/reporter/IoTDBReporter.java | 204 ++++----
.../org.apache.iotdb.metrics.reporter.Reporter | 3 +-
metrics/interface/pom.xml | 5 +
.../main/assembly/resources/conf/iotdb-metric.yml | 14 +-
.../org/apache/iotdb/metrics/MetricService.java | 22 +-
.../apache/iotdb/metrics/config/MetricConfig.java | 133 +++++-
.../iotdb/metrics/reporter/CompositeReporter.java | 14 +-
.../apache/iotdb/metrics/utils/MetricsUtils.java | 33 +-
.../interface/src/test/resources/iotdb-metric.yml | 14 +-
.../micrometer/reporter}/IoTDBMeterRegistry.java | 114 ++---
.../micrometer/reporter}/IoTDBRegistryConfig.java | 23 +-
.../{IoTDBJmxConfig.java => JmxConfig.java} | 6 +-
.../reporter/MicrometerIoTDBReporter.java | 4 +-
.../micrometer/reporter/MicrometerJmxReporter.java | 2 +-
.../org.apache.iotdb.metrics.reporter.Reporter | 3 +-
pom.xml | 8 +-
.../resources/conf/iotdb-engine.properties | 6 +
server/src/assembly/resources/sbin/stop-server.sh | 13 +-
.../org/apache/iotdb/db/concurrent/ThreadName.java | 1 +
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 16 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 9 +-
.../db/engine/cache/TimeSeriesMetadataCache.java | 13 +-
.../compaction/CompactionMetricsManager.java | 173 +++++++
.../compaction/CompactionTaskComparator.java | 1 +
.../engine/compaction/CompactionTaskManager.java | 90 ++--
.../db/engine/compaction/CompactionUtils.java | 117 +++--
.../{ => constant}/CompactionPriority.java | 2 +-
.../compaction/constant/CompactionTaskStatus.java | 11 +-
.../engine/compaction/constant/CompactionType.java | 10 +-
.../compaction/constant/ProcessChunkType.java | 9 +-
.../cross/AbstractCrossSpaceCompactionTask.java | 29 +-
.../compaction/cross/CrossCompactionStrategy.java | 21 -
.../selector/RewriteCompactionFileSelector.java | 8 +-
.../task/RewriteCrossCompactionRecoverTask.java | 5 +-
.../task/RewriteCrossSpaceCompactionTask.java | 26 +-
.../cross/rewrite/task/SubCompactionTask.java | 101 ++++
.../inner/AbstractInnerSpaceCompactionTask.java | 21 +-
.../compaction/inner/InnerCompactionStrategy.java | 25 -
.../SizeTieredCompactionRecoverTask.java | 5 +-
.../sizetiered/SizeTieredCompactionSelector.java | 4 +-
.../inner/sizetiered/SizeTieredCompactionTask.java | 51 +-
.../utils/AlignedSeriesCompactionExecutor.java | 27 +-
.../inner/utils/InnerSpaceCompactionUtils.java | 14 +-
.../utils/SingleSeriesCompactionExecutor.java | 32 +-
.../compaction/task/AbstractCompactionTask.java | 39 +-
.../CompactionExceptionHandler.java} | 124 ++---
...overTask.java => CompactionRecoverManager.java} | 92 ++--
.../compaction/task/CompactionRecoverTask.java | 519 ++++++++++++++++++---
.../compaction/utils/log/CompactionLogger.java | 7 +-
.../writer/AbstractCompactionWriter.java | 75 +--
.../writer/CrossSpaceCompactionWriter.java | 80 ++--
.../writer/InnerSpaceCompactionWriter.java | 27 +-
.../engine/memtable/AlignedWritableMemChunk.java | 6 +-
.../db/engine/memtable/IWritableMemChunk.java | 6 +
.../db/engine/storagegroup/TsFileResource.java | 89 ++--
.../engine/storagegroup/TsFileResourceStatus.java | 12 +-
.../storagegroup/VirtualStorageGroupProcessor.java | 101 +---
.../org/apache/iotdb/db/metadata/MManager.java | 5 +
.../iotdb/db/metadata/template/Template.java | 4 +
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 3 +-
.../iotdb/db/query/reader/series/SeriesReader.java | 56 ++-
.../java/org/apache/iotdb/db/service/IoTDB.java | 3 +
.../apache/iotdb/db/service/metrics/Metric.java | 3 +
.../iotdb/db/service/metrics/MetricsService.java | 4 +-
.../apache/iotdb/db/tools/TsFileRewriteTool.java | 3 +-
.../org/apache/iotdb/db/tools/TsFileSplitTool.java | 3 +-
.../db/tools/settle/TsFileAndModSettleTool.java | 9 +-
.../apache/iotdb/db/utils/EnvironmentUtils.java | 2 +
.../org/apache/iotdb/db/utils/FileLoaderUtils.java | 16 +-
.../org/apache/iotdb/db/utils/UpgradeUtils.java | 3 +-
.../db/utils/datastructure/AlignedTVList.java | 12 +-
.../org.apache.iotdb.metrics.reporter.Reporter | 19 -
.../iotdb/db/engine/cache/ChunkCacheTest.java | 5 +-
.../engine/compaction/AbstractCompactionTest.java | 3 +-
.../engine/compaction/CompactionSchedulerTest.java | 1 +
.../compaction/CompactionTaskComparatorTest.java | 39 +-
.../compaction/CompactionTaskManagerTest.java | 1 +
.../db/engine/compaction/CompactionUtilsTest.java | 321 ++++++++++++-
.../cross/CrossSpaceCompactionExceptionTest.java | 31 +-
.../compaction/cross/CrossSpaceCompactionTest.java | 10 +-
.../db/engine/compaction/cross/MergeTest.java | 7 +-
.../cross/RewriteCompactionFileSelectorTest.java | 46 +-
.../RewriteCrossSpaceCompactionRecoverTest.java | 74 +--
.../cross/RewriteCrossSpaceCompactionTest.java | 2 +
.../inner/AbstractInnerSpaceCompactionTest.java | 5 +-
.../inner/InnerCompactionMoreDataTest.java | 7 +-
.../inner/InnerCompactionSchedulerTest.java | 4 +-
.../compaction/inner/InnerCompactionTest.java | 11 +-
.../inner/InnerSpaceCompactionExceptionTest.java | 64 ++-
.../SizeTieredCompactionRecoverTest.java | 121 +----
.../inner/sizetiered/SizeTieredCompactionTest.java | 11 +-
...eCrossSpaceCompactionRecoverCompatibleTest.java | 19 +-
.../SizeTieredCompactionRecoverCompatibleTest.java | 59 +--
.../recover/SizeTieredCompactionRecoverTest.java | 117 ++---
.../compaction/utils/CompactionConfigRestorer.java | 2 +-
.../engine/modification/DeletionFileNodeTest.java | 6 +-
.../engine/storagegroup/FakedTsFileResource.java | 20 +-
.../org/apache/iotdb/db/metadata/TemplateTest.java | 18 +
.../query/reader/series/SeriesReaderTestUtil.java | 7 +-
.../iotdb/db/rescon/ResourceManagerTest.java | 15 +-
testcontainer/src/tool/parser.py | 4 +-
.../read/TsFileAlignedSeriesReaderIterator.java | 10 +-
.../iotdb/tsfile/write/writer/TsFileIOWriter.java | 8 +-
149 files changed, 4190 insertions(+), 2387 deletions(-)
rename .github/workflows/{client.yml => client-cpp.yml} (98%)
copy .github/workflows/{client-go.yml => client-python.yml} (65%)
delete mode 100644 client-py/SessionAlignedTimeseriesTest.py
delete mode 100644 client-py/SessionTest.py
create mode 100644 client-py/tests/test_aligned_timeseries.py
create mode 100644 client-py/tests/test_numpy_tablet.py
create mode 100644 client-py/tests/test_session.py
create mode 100644 client-py/tests/test_tablet.py
copy integration/src/test/java/org/apache/iotdb/db/integration/{aligned/IoTDBLastQueryWithoutLastCacheWithDeletion2IT.java => IoTDBMaxTimeQueryIT.java} (56%)
rename integration/src/test/java/org/apache/iotdb/db/integration/aligned/{IOTDBInsertAlignedValuesIT.java => IoTDBInsertAlignedValuesIT.java} (92%)
rename {server/src/main/java/org/apache/iotdb/db => metrics/dropwizard-metrics/src/main/java/org/apache/iotdb}/metrics/dropwizard/reporter/DropwizardIoTDBReporter.java (92%)
rename {server/src/main/java/org/apache/iotdb/db => metrics/dropwizard-metrics/src/main/java/org/apache/iotdb}/metrics/dropwizard/reporter/IoTDBReporter.java (53%)
rename server/src/main/java/org/apache/iotdb/db/metrics/metricsUtils.java => metrics/interface/src/main/java/org/apache/iotdb/metrics/utils/MetricsUtils.java (69%)
rename {server/src/main/java/org/apache/iotdb/db/metrics/micrometer/registry => metrics/micrometer-metrics/src/main/java/org/apache/iotdb/metrics/micrometer/reporter}/IoTDBMeterRegistry.java (60%)
rename {server/src/main/java/org/apache/iotdb/db/metrics/micrometer/registry => metrics/micrometer-metrics/src/main/java/org/apache/iotdb/metrics/micrometer/reporter}/IoTDBRegistryConfig.java (63%)
rename metrics/micrometer-metrics/src/main/java/org/apache/iotdb/metrics/micrometer/reporter/{IoTDBJmxConfig.java => JmxConfig.java} (88%)
rename {server/src/main/java/org/apache/iotdb/db => metrics/micrometer-metrics/src/main/java/org/apache/iotdb}/metrics/micrometer/reporter/MicrometerIoTDBReporter.java (93%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/engine/compaction/CompactionMetricsManager.java
rename server/src/main/java/org/apache/iotdb/db/engine/compaction/{ => constant}/CompactionPriority.java (94%)
copy cluster/src/main/java/org/apache/iotdb/cluster/server/member/DataGroupMemberMBean.java => server/src/main/java/org/apache/iotdb/db/engine/compaction/constant/CompactionTaskStatus.java (83%)
copy cluster/src/main/java/org/apache/iotdb/cluster/server/member/DataGroupMemberMBean.java => server/src/main/java/org/apache/iotdb/db/engine/compaction/constant/CompactionType.java (84%)
copy cluster/src/test/java/org/apache/iotdb/cluster/utils/Constants.java => server/src/main/java/org/apache/iotdb/db/engine/compaction/constant/ProcessChunkType.java (85%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/rewrite/task/SubCompactionTask.java
rename server/src/main/java/org/apache/iotdb/db/engine/compaction/{cross/CrossSpaceCompactionExceptionHandler.java => task/CompactionExceptionHandler.java} (62%)
copy server/src/main/java/org/apache/iotdb/db/engine/compaction/task/{CompactionRecoverTask.java => CompactionRecoverManager.java} (52%)
copy cluster/src/main/java/org/apache/iotdb/cluster/server/member/DataGroupMemberMBean.java => server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResourceStatus.java (84%)
delete mode 100644 server/src/main/resources/META-INF/services/org.apache.iotdb.metrics.reporter.Reporter
[iotdb] 01/01: Merge remote-tracking branch 'origin/rel/0.13' into double_live
Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch double_live
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 20829ccddc9344b390c3d2753afdc813079f9527
Merge: 04b36aa128 72e21c9ffb
Author: qiaojialin <64...@qq.com>
AuthorDate: Tue Apr 12 12:48:23 2022 +0800
Merge remote-tracking branch 'origin/rel/0.13' into double_live
.github/workflows/{client.yml => client-cpp.yml} | 2 +-
.github/workflows/client-python.yml | 63 +++
.github/workflows/sonar-coveralls.yml | 7 -
client-cpp/pom.xml | 4 +-
client-py/README.md | 290 ++++++++++--
client-py/SessionAlignedTimeseriesExample.py | 16 +-
client-py/SessionAlignedTimeseriesTest.py | 280 -----------
client-py/SessionExample.py | 50 +-
client-py/SessionTest.py | 336 -------------
client-py/iotdb/Session.py | 104 ++++-
client-py/iotdb/utils/IoTDBConstants.py | 11 +
client-py/iotdb/utils/IoTDBRpcDataSet.py | 2 +-
client-py/iotdb/utils/NumpyTablet.py | 32 +-
client-py/iotdb/utils/Tablet.py | 31 +-
client-py/requirements_dev.txt | 2 +-
client-py/tests/tablet_performance_comparison.py | 8 +-
client-py/tests/test_aligned_timeseries.py | 294 ++++++++++++
client-py/tests/test_dataframe.py | 6 +-
client-py/tests/test_numpy_tablet.py | 147 ++++++
client-py/tests/test_session.py | 362 ++++++++++++++
client-py/tests/test_tablet.py | 109 +++++
client-py/tests/test_todf.py | 16 +-
.../apache/iotdb/cluster/RemoteTsFileResource.java | 5 +-
compile-tools/pom.xml | 6 +-
distribution/pom.xml | 2 +-
.../UserGuide/API/Programming-Python-Native-API.md | 52 +--
docs/UserGuide/Maintenance-Tools/Metric-Tool.md | 27 +-
docs/UserGuide/Process-Data/Alerting.md | 2 +-
.../UserGuide/API/Programming-Python-Native-API.md | 49 +-
docs/zh/UserGuide/Maintenance-Tools/Metric-Tool.md | 69 +--
docs/zh/UserGuide/Process-Data/Alerting.md | 2 +-
example/client-cpp-example/pom.xml | 2 +-
example/trigger/pom.xml | 2 +-
example/udf/pom.xml | 2 +-
grafana-connector/pom.xml | 2 +-
.../controller/DatabaseConnectController.java | 3 +-
.../iotdb/web/grafana/dao/impl/BasicDaoImpl.java | 43 +-
integration/pom.xml | 6 +-
.../iotdb/db/integration/IoTDBMaxTimeQueryIT.java | 134 ++++++
.../integration/IoTDBSizeTieredCompactionIT.java | 2 +-
...luesIT.java => IoTDBInsertAlignedValuesIT.java} | 21 +-
jdbc/pom.xml | 2 +-
metrics/dropwizard-metrics/pom.xml | 1 -
.../iotdb/metrics/dropwizard/MetricName.java | 60 ++-
.../reporter/DropwizardIoTDBReporter.java | 5 +-
.../reporter/DropwizardMetricsExporter.java | 169 +++----
.../metrics/dropwizard/reporter/IoTDBReporter.java | 204 ++++----
.../org.apache.iotdb.metrics.reporter.Reporter | 3 +-
metrics/interface/pom.xml | 5 +
.../main/assembly/resources/conf/iotdb-metric.yml | 14 +-
.../org/apache/iotdb/metrics/MetricService.java | 22 +-
.../apache/iotdb/metrics/config/MetricConfig.java | 133 +++++-
.../iotdb/metrics/reporter/CompositeReporter.java | 14 +-
.../apache/iotdb/metrics/utils/MetricsUtils.java | 33 +-
.../interface/src/test/resources/iotdb-metric.yml | 14 +-
.../micrometer/reporter}/IoTDBMeterRegistry.java | 114 ++---
.../micrometer/reporter}/IoTDBRegistryConfig.java | 23 +-
.../{IoTDBJmxConfig.java => JmxConfig.java} | 6 +-
.../reporter/MicrometerIoTDBReporter.java | 4 +-
.../micrometer/reporter/MicrometerJmxReporter.java | 2 +-
.../org.apache.iotdb.metrics.reporter.Reporter | 3 +-
pom.xml | 8 +-
.../resources/conf/iotdb-engine.properties | 6 +
server/src/assembly/resources/sbin/stop-server.sh | 13 +-
.../org/apache/iotdb/db/concurrent/ThreadName.java | 1 +
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 16 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 9 +-
.../db/engine/cache/TimeSeriesMetadataCache.java | 13 +-
.../compaction/CompactionMetricsManager.java | 173 +++++++
.../compaction/CompactionTaskComparator.java | 1 +
.../engine/compaction/CompactionTaskManager.java | 90 ++--
.../db/engine/compaction/CompactionUtils.java | 117 +++--
.../{ => constant}/CompactionPriority.java | 2 +-
.../compaction/constant/CompactionTaskStatus.java} | 19 +-
.../CompactionType.java} | 11 +-
.../ProcessChunkType.java} | 11 +-
.../cross/AbstractCrossSpaceCompactionTask.java | 29 +-
.../compaction/cross/CrossCompactionStrategy.java | 21 -
.../selector/RewriteCompactionFileSelector.java | 8 +-
.../task/RewriteCrossCompactionRecoverTask.java | 5 +-
.../task/RewriteCrossSpaceCompactionTask.java | 26 +-
.../cross/rewrite/task/SubCompactionTask.java | 101 ++++
.../inner/AbstractInnerSpaceCompactionTask.java | 21 +-
.../compaction/inner/InnerCompactionStrategy.java | 25 -
.../SizeTieredCompactionRecoverTask.java | 5 +-
.../sizetiered/SizeTieredCompactionSelector.java | 4 +-
.../inner/sizetiered/SizeTieredCompactionTask.java | 51 +-
.../utils/AlignedSeriesCompactionExecutor.java | 27 +-
.../inner/utils/InnerSpaceCompactionUtils.java | 14 +-
.../utils/SingleSeriesCompactionExecutor.java | 32 +-
.../compaction/task/AbstractCompactionTask.java | 39 +-
.../CompactionExceptionHandler.java} | 124 ++---
...overTask.java => CompactionRecoverManager.java} | 92 ++--
.../compaction/task/CompactionRecoverTask.java | 519 ++++++++++++++++++---
.../compaction/utils/log/CompactionLogger.java | 7 +-
.../writer/AbstractCompactionWriter.java | 75 +--
.../writer/CrossSpaceCompactionWriter.java | 80 ++--
.../writer/InnerSpaceCompactionWriter.java | 27 +-
.../engine/memtable/AlignedWritableMemChunk.java | 6 +-
.../db/engine/memtable/IWritableMemChunk.java | 6 +
.../db/engine/storagegroup/TsFileResource.java | 89 ++--
.../TsFileResourceStatus.java} | 13 +-
.../storagegroup/VirtualStorageGroupProcessor.java | 101 +---
.../org/apache/iotdb/db/metadata/MManager.java | 5 +
.../iotdb/db/metadata/template/Template.java | 4 +
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 3 +-
.../iotdb/db/query/reader/series/SeriesReader.java | 56 ++-
.../java/org/apache/iotdb/db/service/IoTDB.java | 3 +
.../apache/iotdb/db/service/metrics/Metric.java | 3 +
.../iotdb/db/service/metrics/MetricsService.java | 4 +-
.../apache/iotdb/db/tools/TsFileRewriteTool.java | 3 +-
.../org/apache/iotdb/db/tools/TsFileSplitTool.java | 3 +-
.../db/tools/settle/TsFileAndModSettleTool.java | 9 +-
.../apache/iotdb/db/utils/EnvironmentUtils.java | 2 +
.../org/apache/iotdb/db/utils/FileLoaderUtils.java | 16 +-
.../org/apache/iotdb/db/utils/UpgradeUtils.java | 3 +-
.../db/utils/datastructure/AlignedTVList.java | 12 +-
.../org.apache.iotdb.metrics.reporter.Reporter | 19 -
.../iotdb/db/engine/cache/ChunkCacheTest.java | 5 +-
.../engine/compaction/AbstractCompactionTest.java | 3 +-
.../engine/compaction/CompactionSchedulerTest.java | 1 +
.../compaction/CompactionTaskComparatorTest.java | 39 +-
.../compaction/CompactionTaskManagerTest.java | 1 +
.../db/engine/compaction/CompactionUtilsTest.java | 321 ++++++++++++-
.../cross/CrossSpaceCompactionExceptionTest.java | 31 +-
.../compaction/cross/CrossSpaceCompactionTest.java | 10 +-
.../db/engine/compaction/cross/MergeTest.java | 7 +-
.../cross/RewriteCompactionFileSelectorTest.java | 46 +-
.../RewriteCrossSpaceCompactionRecoverTest.java | 74 +--
.../cross/RewriteCrossSpaceCompactionTest.java | 2 +
.../inner/AbstractInnerSpaceCompactionTest.java | 5 +-
.../inner/InnerCompactionMoreDataTest.java | 7 +-
.../inner/InnerCompactionSchedulerTest.java | 4 +-
.../compaction/inner/InnerCompactionTest.java | 11 +-
.../inner/InnerSpaceCompactionExceptionTest.java | 64 ++-
.../SizeTieredCompactionRecoverTest.java | 121 +----
.../inner/sizetiered/SizeTieredCompactionTest.java | 11 +-
...eCrossSpaceCompactionRecoverCompatibleTest.java | 19 +-
.../SizeTieredCompactionRecoverCompatibleTest.java | 59 +--
.../recover/SizeTieredCompactionRecoverTest.java | 117 ++---
.../compaction/utils/CompactionConfigRestorer.java | 2 +-
.../engine/modification/DeletionFileNodeTest.java | 6 +-
.../engine/storagegroup/FakedTsFileResource.java | 20 +-
.../org/apache/iotdb/db/metadata/TemplateTest.java | 18 +
.../query/reader/series/SeriesReaderTestUtil.java | 7 +-
.../iotdb/db/rescon/ResourceManagerTest.java | 15 +-
testcontainer/src/tool/parser.py | 4 +-
.../read/TsFileAlignedSeriesReaderIterator.java | 10 +-
.../iotdb/tsfile/write/writer/TsFileIOWriter.java | 8 +-
149 files changed, 4299 insertions(+), 2365 deletions(-)