This is an automated email from the ASF dual-hosted git repository. hui pushed a commit to branch lmh/addMetricDoc in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 5860769fdd33d6dd0c8b0191edd5018b1d3b3bec Merge: 88f17c6a3b 4a73e612d3 Author: Minghui Liu <[email protected]> AuthorDate: Thu Jan 12 16:22:33 2023 +0800 Merge remote-tracking branch 'origin/master' into lmh/addMetricDoc .../consensus/iot/IoTConsensusServerImpl.java | 54 +- .../apache/iotdb/consensus/iot/StabilityTest.java | 55 +- docs/UserGuide/API/Programming-MQTT.md | 6 +- .../Apache-IoTDB-DataNode-Dashboard.json | 15015 +++++++++++++++---- docs/UserGuide/Monitor-Alert/Metric-Tool.md | 31 + docs/zh/UserGuide/API/Programming-MQTT.md | 6 +- docs/zh/UserGuide/Monitor-Alert/Metric-Tool.md | 31 + .../it/partition/IoTDBPartitionGetterIT.java | 94 +- .../iotdb/metrics/AbstractMetricService.java | 3 +- .../resources/conf/iotdb-common.properties | 2 +- .../commons/schema/tree/AbstractTreeVisitor.java | 2 +- .../schemaregion/rocksdb/RSchemaRegion.java | 62 +- .../metadata/tagSchemaRegion/TagSchemaRegion.java | 48 +- .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 11 +- .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 4 + .../org/apache/iotdb/db/conf/IoTDBStartCheck.java | 6 + .../execute/task/CrossSpaceCompactionTask.java | 27 +- .../execute/task/InnerSpaceCompactionTask.java | 29 +- .../execute/utils/reader/PointPriorityReader.java | 14 +- .../iotdb/db/metadata/mtree/IMTreeBelowSG.java | 4 - .../db/metadata/mtree/MTreeBelowSGCachedImpl.java | 221 +- .../db/metadata/mtree/MTreeBelowSGMemoryImpl.java | 182 +- .../mtree/store/disk/schemafile/SchemaFile.java | 21 +- .../disk/schemafile/pagemgr/BTreePageManager.java | 5 +- .../store/disk/schemafile/pagemgr/PageManager.java | 17 +- .../traverser/TraverserWithLimitOffsetWrapper.java | 10 + .../schemaregion/result/ShowTimeSeriesResult.java | 10 +- .../metadata/query/info/ITimeSeriesSchemaInfo.java | 5 +- .../db/metadata/query/reader/ISchemaReader.java | 16 +- .../db/metadata/schemaregion/ISchemaRegion.java | 65 +- .../schemaregion/SchemaRegionMemoryImpl.java | 104 +- .../schemaregion/SchemaRegionSchemaFileImpl.java | 113 +- .../apache/iotdb/db/metadata/tag/TagManager.java | 3 +- .../iotdb/db/mpp/aggregation/AvgAccumulator.java | 8 +- .../iotdb/db/mpp/aggregation/CountAccumulator.java | 4 +- .../db/mpp/aggregation/ExtremeAccumulator.java | 8 +- .../db/mpp/aggregation/FirstValueAccumulator.java | 12 +- .../mpp/aggregation/FirstValueDescAccumulator.java | 12 +- .../db/mpp/aggregation/LastValueAccumulator.java | 12 +- .../mpp/aggregation/LastValueDescAccumulator.java | 12 +- .../db/mpp/aggregation/MaxTimeAccumulator.java | 2 +- .../db/mpp/aggregation/MaxTimeDescAccumulator.java | 2 +- .../db/mpp/aggregation/MaxValueAccumulator.java | 8 +- .../db/mpp/aggregation/MinTimeAccumulator.java | 2 +- .../db/mpp/aggregation/MinTimeDescAccumulator.java | 2 +- .../db/mpp/aggregation/MinValueAccumulator.java | 8 +- .../iotdb/db/mpp/aggregation/SumAccumulator.java | 8 +- .../process/RawDataAggregationOperator.java | 51 +- .../process/SingleInputAggregationOperator.java | 12 +- .../process/SlidingWindowAggregationOperator.java | 11 + .../schema/CountGroupByLevelScanOperator.java | 3 + .../operator/schema/SchemaCountOperator.java | 3 + .../operator/schema/SchemaQueryScanOperator.java | 3 + .../schema/source/PathsUsingTemplateSource.java | 26 + .../schema/source/TimeSeriesSchemaSource.java | 5 +- .../AbstractSeriesAggregationScanOperator.java | 8 +- .../operator/window/EqualEventBooleanWindow.java} | 25 +- .../window/EqualEventBooleanWindowManager.java | 64 + .../operator/window/EqualEventDoubleWindow.java} | 25 +- .../window/EqualEventDoubleWindowManager.java | 64 + .../operator/window/EqualEventFloatWindow.java} | 25 +- .../window/EqualEventFloatWindowManager.java | 64 + .../operator/window/EqualEventIntWindow.java} | 25 +- .../window/EqualEventIntWindowManager.java | 63 + .../operator/window/EqualEventLongWindow.java} | 25 +- .../window/EqualEventLongWindowManager.java | 63 + .../operator/window/EqualEventTextWindow.java} | 25 +- .../window/EqualEventTextWindowManager.java | 64 + .../operator/window/EventBooleanWindow.java | 66 + .../operator/window/EventBooleanWindowManager.java | 46 + .../operator/window/EventDoubleWindow.java | 66 + .../operator/window/EventDoubleWindowManager.java | 46 + .../operator/window/EventFloatWindow.java | 66 + .../operator/window/EventFloatWindowManager.java | 46 + .../execution/operator/window/EventIntWindow.java | 66 + .../operator/window/EventIntWindowManager.java | 46 + .../execution/operator/window/EventLongWindow.java | 66 + .../operator/window/EventLongWindowManager.java | 46 + .../execution/operator/window/EventTextWindow.java | 67 + .../operator/window/EventTextWindowManager.java | 46 + .../window/{TimeWindow.java => EventWindow.java} | 61 +- .../operator/window/EventWindowManager.java | 138 + .../operator/window/EventWindowParameter.java | 61 + .../db/mpp/execution/operator/window/IWindow.java | 2 +- .../execution/operator/window/IWindowManager.java | 68 +- .../mpp/execution/operator/window/TimeWindow.java | 2 +- .../operator/window/TimeWindowManager.java | 73 +- .../operator/window/TimeWindowParameter.java} | 14 +- .../window/VariationEventDoubleWindow.java} | 25 +- .../window/VariationEventDoubleWindowManager.java | 66 + .../window/VariationEventFloatWindow.java} | 25 +- .../window/VariationEventFloatWindowManager.java | 66 + .../operator/window/VariationEventIntWindow.java} | 25 +- .../window/VariationEventIntWindowManager.java | 66 + .../operator/window/VariationEventLongWindow.java} | 25 +- .../window/VariationEventLongWindowManager.java | 66 + .../operator/window/WindowManagerFactory.java | 84 + .../operator/window/WindowParameter.java} | 23 +- .../execution/operator/window/WindowType.java} | 20 +- .../db/mpp/plan/planner/OperatorTreeGenerator.java | 7 +- .../compaction/FastAlignedCrossCompactionTest.java | 134 + .../FastNonAlignedCrossCompactionTest.java | 138 + .../schemaRegion/SchemaRegionAliasAndTagTest.java | 32 +- .../schemaRegion/SchemaRegionBasicTest.java | 45 +- .../schemaRegion/SchemaRegionManagementTest.java | 43 +- .../schemaRegion/SchemaRegionTemplateTest.java | 10 +- .../schemaRegion/SchemaRegionTestUtil.java | 36 +- .../mpp/execution/exchange/SourceHandleTest.java | 82 +- .../mpp/execution/operator/OperatorMemoryTest.java | 42 +- .../operator/RawDataAggregationOperatorTest.java | 527 +- .../schema/CountGroupByLevelMergeOperatorTest.java | 95 +- .../operator/schema/SchemaCountOperatorTest.java | 88 +- .../operator/schema/SchemaOperatorTestUtil.java | 66 + .../schema/SchemaQueryScanOperatorTest.java | 83 +- .../query/reader/series/SeriesReaderTestUtil.java | 18 + .../apache/iotdb/db/utils/EnvironmentUtils.java | 3 +- 116 files changed, 15980 insertions(+), 4082 deletions(-) diff --cc server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java index 647d6a126d,acafb58bb7..e5092a0b1f --- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java +++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java @@@ -1473,10 -1524,31 +1477,15 @@@ public class IoTDBConfig this.maxAllowedConcurrentQueries = maxAllowedConcurrentQueries; } - public int getSubRawQueryThreadCount() { - return subRawQueryThreadCount; - } - - void setSubRawQueryThreadCount(int subRawQueryThreadCount) { - this.subRawQueryThreadCount = subRawQueryThreadCount; - } - public long getMaxBytesPerFragmentInstance() { - return allocateMemoryForDataExchange / queryThreadCount; + return maxBytesPerFragmentInstance; + } + + @TestOnly + public void setMaxBytesPerFragmentInstance(long maxBytesPerFragmentInstance) { + this.maxBytesPerFragmentInstance = maxBytesPerFragmentInstance; } - public int getRawQueryBlockingQueueCapacity() { - return rawQueryBlockingQueueCapacity; - } - - public void setRawQueryBlockingQueueCapacity(int rawQueryBlockingQueueCapacity) { - this.rawQueryBlockingQueueCapacity = rawQueryBlockingQueueCapacity; - } - public int getWindowEvaluationThreadCount() { return windowEvaluationThreadCount; }
