This is an automated email from the ASF dual-hosted git repository.
spricoder pushed a commit to branch feature/leader-write
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/feature/leader-write by this
push:
new 71c36cac7a0 add
71c36cac7a0 is described below
commit 71c36cac7a03161263250f208b20a59c0a83459c
Author: spricoder <[email protected]>
AuthorDate: Mon Apr 15 09:45:46 2024 +0800
add
---
.../execution/load/LoadTsFileManager.java | 1 +
.../plan/scheduler/load/LoadTsFileScheduler.java | 56 +++++++------
.../dataregion/memtable/AbstractMemTable.java | 96 ++++++++++++----------
3 files changed, 82 insertions(+), 71 deletions(-)
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/load/LoadTsFileManager.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/load/LoadTsFileManager.java
index b1c48f6e21b..5888a0ff134 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/load/LoadTsFileManager.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/load/LoadTsFileManager.java
@@ -328,6 +328,7 @@ public class LoadTsFileManager {
MemTableFlushTask.recordFlushPointsMetricInternal(
writePointCount, databaseName,
dataRegion.getDataRegionId());
+ // TODO @SpriCoder
MetricService.getInstance()
.count(
writePointCount,
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/load/LoadTsFileScheduler.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/load/LoadTsFileScheduler.java
index 429c0e9a22d..fba61fc2860 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/load/LoadTsFileScheduler.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/scheduler/load/LoadTsFileScheduler.java
@@ -394,33 +394,35 @@ public class LoadTsFileScheduler implements IScheduler {
}
// add metrics
- DataRegion dataRegion =
- StorageEngine.getInstance()
- .getDataRegion(
- (DataRegionId)
- ConsensusGroupId.Factory.createFromTConsensusGroupId(
- node.getLocalRegionReplicaSet().getRegionId()));
-
- dataRegion
- .getNonSystemDatabaseName()
- .ifPresent(
- databaseName -> {
- // Report load tsFile points to IoTDB flush metrics
- MemTableFlushTask.recordFlushPointsMetricInternal(
- node.getWritePointCount(), databaseName,
dataRegion.getDataRegionId());
-
- MetricService.getInstance()
- .count(
- node.getWritePointCount(),
- Metric.QUANTITY.toString(),
- MetricLevel.CORE,
- Tag.NAME.toString(),
- Metric.POINTS_IN.toString(),
- Tag.DATABASE.toString(),
- databaseName,
- Tag.REGION.toString(),
- dataRegion.getDataRegionId());
- });
+ if (!node.isGeneratedByConsensus()) {
+ DataRegion dataRegion =
+ StorageEngine.getInstance()
+ .getDataRegion(
+ (DataRegionId)
+ ConsensusGroupId.Factory.createFromTConsensusGroupId(
+ node.getLocalRegionReplicaSet().getRegionId()));
+
+ dataRegion
+ .getNonSystemDatabaseName()
+ .ifPresent(
+ databaseName -> {
+ // Report load tsFile points to IoTDB flush metrics
+ MemTableFlushTask.recordFlushPointsMetricInternal(
+ node.getWritePointCount(), databaseName,
dataRegion.getDataRegionId());
+
+ MetricService.getInstance()
+ .count(
+ node.getWritePointCount(),
+ Metric.QUANTITY.toString(),
+ MetricLevel.CORE,
+ Tag.NAME.toString(),
+ Metric.POINTS_IN.toString(),
+ Tag.DATABASE.toString(),
+ databaseName,
+ Tag.REGION.toString(),
+ dataRegion.getDataRegionId());
+ });
+ }
return true;
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AbstractMemTable.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AbstractMemTable.java
index f8d7f6a53d7..9d0b7134fa4 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AbstractMemTable.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AbstractMemTable.java
@@ -205,17 +205,19 @@ public abstract class AbstractMemTable implements
IMemTable {
totalPointsNum += pointsInserted;
- MetricService.getInstance()
- .count(
- pointsInserted,
- Metric.QUANTITY.toString(),
- MetricLevel.CORE,
- Tag.NAME.toString(),
- METRIC_POINT_IN,
- Tag.DATABASE.toString(),
- database,
- Tag.REGION.toString(),
- dataRegionId);
+ if (!insertRowNode.isGeneratedByConsensus()) {
+ MetricService.getInstance()
+ .count(
+ pointsInserted,
+ Metric.QUANTITY.toString(),
+ MetricLevel.CORE,
+ Tag.NAME.toString(),
+ METRIC_POINT_IN,
+ Tag.DATABASE.toString(),
+ database,
+ Tag.REGION.toString(),
+ dataRegionId);
+ }
}
@Override
@@ -244,17 +246,19 @@ public abstract class AbstractMemTable implements
IMemTable {
insertRowNode.getMeasurements().length -
insertRowNode.getFailedMeasurementNumber();
totalPointsNum += pointsInserted;
- MetricService.getInstance()
- .count(
- pointsInserted,
- Metric.QUANTITY.toString(),
- MetricLevel.CORE,
- Tag.NAME.toString(),
- METRIC_POINT_IN,
- Tag.DATABASE.toString(),
- database,
- Tag.REGION.toString(),
- dataRegionId);
+ if (!insertRowNode.isGeneratedByConsensus()) {
+ MetricService.getInstance()
+ .count(
+ pointsInserted,
+ Metric.QUANTITY.toString(),
+ MetricLevel.CORE,
+ Tag.NAME.toString(),
+ METRIC_POINT_IN,
+ Tag.DATABASE.toString(),
+ database,
+ Tag.REGION.toString(),
+ dataRegionId);
+ }
}
@Override
@@ -267,17 +271,19 @@ public abstract class AbstractMemTable implements
IMemTable {
(insertTabletNode.getDataTypes().length -
insertTabletNode.getFailedMeasurementNumber())
* (end - start);
totalPointsNum += pointsInserted;
- MetricService.getInstance()
- .count(
- pointsInserted,
- Metric.QUANTITY.toString(),
- MetricLevel.CORE,
- Tag.NAME.toString(),
- METRIC_POINT_IN,
- Tag.DATABASE.toString(),
- database,
- Tag.REGION.toString(),
- dataRegionId);
+ if (!insertTabletNode.isGeneratedByConsensus()) {
+ MetricService.getInstance()
+ .count(
+ pointsInserted,
+ Metric.QUANTITY.toString(),
+ MetricLevel.CORE,
+ Tag.NAME.toString(),
+ METRIC_POINT_IN,
+ Tag.DATABASE.toString(),
+ database,
+ Tag.REGION.toString(),
+ dataRegionId);
+ }
} catch (RuntimeException e) {
throw new WriteProcessException(e);
}
@@ -293,17 +299,19 @@ public abstract class AbstractMemTable implements
IMemTable {
(insertTabletNode.getDataTypes().length -
insertTabletNode.getFailedMeasurementNumber())
* (end - start);
totalPointsNum += pointsInserted;
- MetricService.getInstance()
- .count(
- pointsInserted,
- Metric.QUANTITY.toString(),
- MetricLevel.CORE,
- Tag.NAME.toString(),
- METRIC_POINT_IN,
- Tag.DATABASE.toString(),
- database,
- Tag.REGION.toString(),
- dataRegionId);
+ if (!insertTabletNode.isGeneratedByConsensus()) {
+ MetricService.getInstance()
+ .count(
+ pointsInserted,
+ Metric.QUANTITY.toString(),
+ MetricLevel.CORE,
+ Tag.NAME.toString(),
+ METRIC_POINT_IN,
+ Tag.DATABASE.toString(),
+ database,
+ Tag.REGION.toString(),
+ dataRegionId);
+ }
} catch (RuntimeException e) {
throw new WriteProcessException(e);
}
