This is an automated email from the ASF dual-hosted git repository. jt2594838 pushed a commit to branch optimize_prometheus_report in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 4b89921604eb7efe32b46e306c1115d3e83d1938 Merge: 650e9ae9492 8df29019a69 Author: Tian Jiang <[email protected]> AuthorDate: Tue Sep 1 18:01:36 2026 +0800 Merge branch 'master' into optimize_prometheus_report .github/scripts/test-edge-ops.py | 466 ++++++++++++ .github/scripts/test-edge-windows.ps1 | 222 ++++++ .github/workflows/daily-it.yml | 359 --------- .github/workflows/edge-it.yml | 98 +++ .github/workflows/pipe-it.yml | 350 --------- CLAUDE.md | 13 + CONTRIBUTING.md | 22 +- LICENSE-binary | 24 +- README.md | 12 + README_ZH.md | 13 + distribution/pom.xml | 2 + distribution/src/assembly/all.xml | 8 + distribution/src/assembly/confignode.xml | 3 + distribution/src/assembly/datanode.xml | 4 + distribution/src/assembly/{all.xml => edge.xml} | 67 +- .../assembly/resources/conf-edge/logback-edge.xml | 244 +++++++ integration-test/pom.xml | 20 + integration-test/src/assembly/mpp-test.xml | 3 + .../it/env/cluster/config/MppCommonConfig.java | 6 - .../env/cluster/config/MppSharedCommonConfig.java | 7 - .../it/env/remote/config/RemoteCommonConfig.java | 5 - .../org/apache/iotdb/itbase/category/EdgeIT.java | 13 +- .../org/apache/iotdb/itbase/env/CommonConfig.java | 2 - .../commit/IoTDBRegionReconstructForIoTV1IT.java | 108 ++- .../apache/iotdb/db/it/IoTDBLoadTsFileAuthIT.java | 29 + .../org/apache/iotdb/db/it/utils/TestUtils.java | 54 +- .../org/apache/iotdb/edge/it/IoTDBEdgeBasicIT.java | 396 ++++++++++ .../auto/enhanced/IoTDBPipeAutoDropIT.java | 81 +++ .../pipe/it/single/IoTDBPipePermissionIT.java | 66 ++ .../it/db/it/IoTDBFFTTableFunctionIT.java | 293 ++++++++ .../it/query/recent/IoTDBTableAggregationIT.java | 20 + .../iotdb/session/it/IoTDBSessionSimpleIT.java | 5 +- .../IoTDBSubscriptionTopicOwnerPartitionIT.java | 1 - ...ConsensusSubscriptionColumnFilterClusterIT.java | 1 - .../it/local/AbstractSubscriptionLocalIT.java | 2 - .../it/local/IoTDBSubscriptionTopicOwnerIT.java | 1 - iotdb-client/client-cpp/src/include/Common.h | 1 + iotdb-client/client-cpp/src/include/Session.h | 50 +- iotdb-client/client-cpp/src/rpc/SessionImpl.h | 4 +- iotdb-client/client-cpp/src/session/Common.cpp | 38 +- iotdb-client/client-cpp/src/session/Session.cpp | 181 ++++- iotdb-client/client-cpp/test/CMakeLists.txt | 7 +- .../client-cpp/test/cpp/sessionUtilsTest.cpp | 145 ++++ .../client-cpp/test/main_utils.cpp | 16 +- iotdb-client/client-py/iotdb/Session.py | 102 ++- iotdb-client/client-py/iotdb/utils/BitMap.py | 39 + iotdb-client/client-py/iotdb/utils/SessionUtils.py | 128 ++++ iotdb-client/client-py/iotdb/utils/Tablet.py | 6 + .../client-py/tests/unit/test_session_utils.py | 160 ++++ iotdb-client/jdbc/src/main/feature/feature.xml | 2 +- .../org/apache/iotdb/jdbc/IoTDBConnection.java | 10 +- .../iotdb/rpc/DeepCopyRpcTransportFactory.java | 25 +- .../iotdb/rpc/DeepCopyRpcTransportFactoryTest.java | 62 ++ .../java/org/apache/iotdb/session/Session.java | 114 ++- .../apache/iotdb/session/SessionConnection.java | 9 +- .../org/apache/iotdb/session/ThriftConnection.java | 8 +- .../apache/iotdb/session/util/SessionUtils.java | 86 +++ .../iotdb/session/util/SessionUtilsTest.java | 83 +++ .../iotdb/confignode/i18n/ConfigNodeMessages.java | 9 + .../iotdb/confignode/i18n/ConfigNodeMessages.java | 9 + .../runtime/heartbeat/PipeHeartbeatParser.java | 62 +- .../iotdb/confignode/service/ConfigNode.java | 2 +- .../main/java/org/apache/iotdb/edge/EdgeNode.java | 122 ++++ .../runtime/heartbeat/PipeHeartbeatParserTest.java | 118 ++- .../consensus/iot/logdispatcher/LogDispatcher.java | 24 +- .../iot/logdispatcher/LogDispatcherTest.java | 64 ++ iotdb-core/datanode/src/assembly/server.xml | 1 + .../apache/iotdb/db/i18n/DataNodeMiscMessages.java | 2 - .../apache/iotdb/db/i18n/DataNodePipeMessages.java | 4 + .../apache/iotdb/db/i18n/DataNodeMiscMessages.java | 2 - .../apache/iotdb/db/i18n/DataNodePipeMessages.java | 3 + .../apache/iotdb/db/conf/DataNodeMemoryConfig.java | 5 +- .../agent/runtime/PipeDataNodeRuntimeAgent.java | 17 +- .../db/pipe/agent/task/PipeDataNodeTaskAgent.java | 9 + .../pipe/agent/task/stage/PipeTaskSinkStage.java | 7 +- .../agent/task/subtask/sink/PipeSinkSubtask.java | 46 ++ .../task/subtask/sink/PipeSinkSubtaskManager.java | 219 ++++-- .../metric/schema/PipeSchemaRegionSinkMetrics.java | 69 +- .../metric/sink/PipeDataRegionSinkMetrics.java | 271 +++---- .../resource/tsfile/PipeTsFileResourceManager.java | 57 +- ...istoricalDataRegionTsFileAndDeletionSource.java | 2 +- .../execution/exchange/sink/ShuffleSinkHandle.java | 63 +- .../process/copyto/TableCopyToOperator.java | 2 + .../execution/operator/source/FileLoaderUtils.java | 4 + .../relational/analyzer/StatementAnalyzer.java | 65 +- .../read_tsfile/ExternalTsFileQueryResource.java | 3 + .../plan/relational/planner/RelationPlanner.java | 3 + .../distribute/TableDistributedPlanGenerator.java | 23 +- .../plan/scheduler/load/LoadTsFileScheduler.java | 27 +- .../plan/statement/crud/LoadTsFileStatement.java | 2 +- .../schemaregion/impl/SchemaRegionMemoryImpl.java | 2 + .../schemaregion/impl/SchemaRegionPBTreeImpl.java | 17 +- .../impl/mem/snapshot/MemMTreeSnapshotUtil.java | 2 + .../impl/pbtree/flush/PBTreeFlushExecutor.java | 2 + .../mtree/impl/pbtree/schemafile/SchemaFile.java | 2 + .../service/metrics/DataNodeExceptionMetrics.java | 72 ++ .../db/service/metrics/DataNodeMetricsHelper.java | 2 + .../db/storageengine/dataregion/DataRegion.java | 2 + .../execute/task/AbstractCompactionTask.java | 2 + .../compaction/schedule/CompactionScheduler.java | 2 + .../dataregion/flush/MemTableFlushTask.java | 3 + .../dataregion/memtable/TsFileProcessor.java | 10 + .../utils/TableDiskUsageStatisticUtil.java | 2 + .../tableDiskUsageIndex/TableDiskUsageIndex.java | 2 + .../tsfile/TsFileTableDiskUsageIndexWriter.java | 4 + .../tsfile/TsFileTableSizeIndexFileWriter.java | 4 +- .../tsfile/TsFileTableSizeIndexReader.java | 2 + .../dataregion/wal/buffer/WALBuffer.java | 5 + .../wal/checkpoint/CheckpointManager.java | 6 + .../dataregion/wal/recover/WALNodeRecoverTask.java | 2 + .../recover/file/SealedTsFileRecoverPerformer.java | 2 + .../file/UnsealedTsFileRecoverPerformer.java | 3 + .../db/storageengine/load/LoadTsFileManager.java | 4 + .../iotdb/db/storageengine/load/util/LoadUtil.java | 38 + .../db/storageengine/rescon/disk/TierManager.java | 4 + .../agent/SubscriptionReceiverAgent.java | 16 +- .../iotdb/db/conf/DataNodeMemoryConfigTest.java | 57 +- .../pipe/agent/task/PipeDataNodeTaskAgentTest.java | 207 ++++++ .../subtask/sink/PipeSinkSubtaskManagerTest.java | 89 +++ .../schema/PipeSchemaRegionSinkMetricsTest.java | 77 ++ .../resource/PipeTsFileResourceManagerTest.java | 87 +++ ...ricalDataRegionTsFileAndDeletionSourceTest.java | 26 + ...rnalRPCServiceImplSubscriptionDisabledTest.java | 34 +- .../execution/exchange/ShuffleSinkHandleTest.java | 134 +++- .../relational/analyzer/TableFunctionTest.java | 174 +++++ .../scheduler/load/LoadTsFileSchedulerTest.java | 43 ++ .../db/storageengine/load/util/LoadUtilTest.java | 59 ++ .../agent/SubscriptionReceiverAgentTest.java | 39 +- .../ConsensusSubscriptionSetupHandlerTest.java | 13 +- .../metrics/config/MetricConfigDescriptor.java | 73 +- .../org/apache/iotdb/metrics/utils/NodeType.java | 3 +- iotdb-core/node-commons/pom.xml | 8 + .../resources/conf/edge/iotdb-system.properties | 125 ++++ .../apache/iotdb/commons/i18n/QueryMessages.java | 39 + .../apache/iotdb/commons/i18n/ServiceMessages.java | 4 + .../apache/iotdb/commons/i18n/QueryMessages.java | 36 + .../apache/iotdb/commons/i18n/ServiceMessages.java | 4 + .../apache/iotdb/commons/conf/CommonConfig.java | 9 +- .../iotdb/commons/conf/CommonDescriptor.java | 4 - .../commons/pipe/agent/task/PipeTaskAgent.java | 246 +++++-- .../pipe/agent/task/meta/PipeRuntimeMeta.java | 4 +- .../commons/pipe/agent/task/meta/PipeTaskMeta.java | 4 +- .../function/TableBuiltinTableFunction.java | 4 + .../commons/service/metric}/ProcessMetrics.java | 8 +- .../iotdb/commons/service/metric/enums/Metric.java | 1 + .../iotdb/commons/service/metric/enums/Tag.java | 1 + .../builtin/relational/tvf/FFTTableFunction.java | 804 +++++++++++++++++++++ .../builtin/relational/tvf/fft/DoubleFFT_1D.java | 159 ++++ .../builtin/relational/tvf/fft/FloatFFT_1D.java | 160 ++++ .../iotdb/commons/conf/CommonConfigTest.java | 16 + .../relational/tvf/FFTTableFunctionTest.java | 518 +++++++++++++ .../udf/builtin/relational/tvf/fft/FFT1DTest.java | 109 +++ pom.xml | 12 +- scripts/conf/edge-env.sh | 69 ++ scripts/conf/windows/edge-env.bat | 48 ++ scripts/sbin/start-edge.sh | 96 +++ scripts/sbin/stop-edge.sh | 114 +++ scripts/sbin/windows/check-edge.ps1 | 66 ++ scripts/sbin/windows/start-edge.bat | 109 +++ scripts/sbin/windows/stop-edge.bat | 29 + scripts/tools/ops/daemon-edge.sh | 114 +++ scripts/tools/ops/destroy-edge.sh | 161 +++++ scripts/tools/windows/ops/destroy-edge.bat | 96 +++ 163 files changed, 8594 insertions(+), 1522 deletions(-) diff --cc iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/config/MetricConfigDescriptor.java index 50dd0127ddf,0d83d387409..d7a08a09a54 --- a/iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/config/MetricConfigDescriptor.java +++ b/iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/config/MetricConfigDescriptor.java @@@ -110,13 -127,8 +127,13 @@@ public class MetricConfigDescriptor "metric_prometheus_reporter_port", String.valueOf(loadConfig.getPrometheusReporterPort()), properties, - isConfigNode))); + prefix))); + loadConfig.setPrometheusReporterAsyncUpdate( + Boolean.parseBoolean( + getPrometheusReporterAsyncUpdateProperty( + properties, isConfigNode, loadConfig.isPrometheusReporterAsyncUpdate()))); + loadConfig.setPrometheusReporterUsername( getPropertyWithoutPrefix( "metric_prometheus_reporter_username",
