Skip to content

[To dev/1.3] Fixed the updateAndGet side effect in DeviceCacheEntry and PipeRemainingOperator (#17584)#17602

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JackieTien97 merged 2 commits into from
May 6, 2026
Merged

[To dev/1.3] Fixed the updateAndGet side effect in DeviceCacheEntry and PipeRemainingOperator (#17584) #17602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ce3872
Fixed the updateAndGet side effect in TableDeviceCacheEntry and PipeR…
Caideyipi Apr 30, 2026
72b3155
Update DeviceCacheEntry.java
Caideyipi May 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 9 additions & 15 deletions ...he/iotdb/confignode/manager/pipe/metric/overview/PipeConfigNodeRemainingTimeOperator.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,14 +66,11 @@ class PipeConfigNodeRemainingTimeOperator extends PipeRemainingOperator {
.reduce(Long::sum)
.orElse(0L);

configRegionCommitMeter.updateAndGet(
meter -> {
if (Objects.nonNull(meter)) {
lastConfigRegionCommitSmoothingValue =
pipeRemainingTimeCommitRateAverageTime.getMeterRate(meter);
}
return meter;
});
final Meter configRegionMeter = configRegionCommitMeter.get();
if (Objects.nonNull(configRegionMeter)) {
lastConfigRegionCommitSmoothingValue =
pipeRemainingTimeCommitRateAverageTime.getMeterRate(configRegionMeter);
}

final double configRegionRemainingTime;
if (totalConfigRegionWriteEventCount <= 0) {
Expand DownExpand Up@@ -101,13 +98,10 @@ void register(final IoTDBConfigRegionSource extractor) {
//////////////////////////// Rate ////////////////////////////

void markConfigRegionCommit() {
configRegionCommitMeter.updateAndGet(
meter -> {
if (Objects.nonNull(meter)) {
meter.mark();
}
return meter;
});
final Meter meter = configRegionCommitMeter.get();
if (Objects.nonNull(meter)) {
meter.mark();
}
}

//////////////////////////// Switch ////////////////////////////
Expand Down
48 changes: 18 additions & 30 deletions ...a/org/apache/iotdb/db/pipe/metric/overview/PipeDataNodeRemainingEventAndTimeOperator.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -138,14 +138,11 @@ public double getRemainingTime() {
+ rawTabletEventCount.get()
+ insertNodeEventCount.get();

dataRegionCommitMeter.updateAndGet(
meter -> {
if (Objects.nonNull(meter)) {
lastDataRegionCommitSmoothingValue =
pipeRemainingTimeCommitRateAverageTime.getMeterRate(meter);
}
return meter;
});
final Meter dataRegionMeter = dataRegionCommitMeter.get();
if (Objects.nonNull(dataRegionMeter)) {
lastDataRegionCommitSmoothingValue =
pipeRemainingTimeCommitRateAverageTime.getMeterRate(dataRegionMeter);
}
final double dataRegionRemainingTime;
if (totalDataRegionWriteEventCount <= 0) {
dataRegionRemainingTime = 0;
Expand All@@ -162,14 +159,11 @@ public double getRemainingTime() {
.reduce(Long::sum)
.orElse(0L);

schemaRegionCommitMeter.updateAndGet(
meter -> {
if (Objects.nonNull(meter)) {
lastSchemaRegionCommitSmoothingValue =
pipeRemainingTimeCommitRateAverageTime.getMeterRate(meter);
}
return meter;
});
final Meter schemaRegionMeter = schemaRegionCommitMeter.get();
if (Objects.nonNull(schemaRegionMeter)) {
lastSchemaRegionCommitSmoothingValue =
pipeRemainingTimeCommitRateAverageTime.getMeterRate(schemaRegionMeter);
}
final double schemaRegionRemainingTime;
if (totalSchemaRegionWriteEventCount <= 0) {
schemaRegionRemainingTime = 0;
Expand DownExpand Up@@ -199,23 +193,17 @@ void register(final IoTDBSchemaRegionSource source) {
//////////////////////////// Rate ////////////////////////////

void markDataRegionCommit() {
dataRegionCommitMeter.updateAndGet(
meter -> {
if (Objects.nonNull(meter)) {
meter.mark();
}
return meter;
});
final Meter meter = dataRegionCommitMeter.get();
if (Objects.nonNull(meter)) {
meter.mark();
}
}

void markSchemaRegionCommit() {
schemaRegionCommitMeter.updateAndGet(
meter -> {
if (Objects.nonNull(meter)) {
meter.mark();
}
return meter;
});
final Meter meter = schemaRegionCommitMeter.get();
if (Objects.nonNull(meter)) {
meter.mark();
}
}

void markTsFileCollectInvocationCount(final long collectInvocationCount) {
Expand Down
35 changes: 16 additions & 19 deletions ...main/java/org/apache/iotdb/db/queryengine/plan/analyze/cache/schema/DeviceCacheEntry.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,6 @@

import java.util.Map;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;

import static org.apache.iotdb.commons.schema.SchemaConstant.NON_TEMPLATE;
Expand DownExpand Up@@ -94,15 +93,14 @@ IDeviceSchema getDeviceSchema() {
}

int invalidateSchema() {
final AtomicInteger size = new AtomicInteger(0);
deviceSchema.updateAndGet(
schema -> {
if (Objects.nonNull(schema)) {
size.set(schema.estimateSize());
}
return null;
});
return size.get();
IDeviceSchema schema;
do {
schema = deviceSchema.get();
if (Objects.isNull(schema)) {
return 0;
}
} while (!deviceSchema.compareAndSet(schema, null));
return schema.estimateSize();
}

/////////////////////////////// Last Cache ///////////////////////////////
Expand DownExpand Up@@ -150,15 +148,14 @@ boolean updateInputMap(final @Nonnull Map<String, TimeValuePair> updateMap) {
}

int invalidateLastCache() {
final AtomicInteger size = new AtomicInteger(0);
lastCache.updateAndGet(
cacheEntry -> {
if (Objects.nonNull(cacheEntry)) {
size.set(cacheEntry.estimateSize());
}
return null;
});
return size.get();
DeviceLastCache cacheEntry;
do {
cacheEntry = lastCache.get();
if (Objects.isNull(cacheEntry)) {
return 0;
}
} while (!lastCache.compareAndSet(cacheEntry, null));
return cacheEntry.estimateSize();
}

/////////////////////////////// Management ///////////////////////////////
Expand Down
Loading