Skip to content
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

The time range of device in resource file may be larger than the actual time range in tsfile #14712

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

The time range of device in resource file may be larger than the actual time range in tsfile #14712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c192326
The time range of device in resource file may be larger than the actu…
shuwenwei Jan 16, 2025
d9eacb7
spotless
shuwenwei Jan 17, 2025
16bc649
fix ut
shuwenwei Jan 17, 2025
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
30 changes: 23 additions & 7 deletions ...rg/apache/iotdb/db/storageengine/dataregion/compaction/repair/RepairDataFileScanUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,9 +187,8 @@ private void checkAlignedDeviceSeries(
new TimeRange(
timeseriesMetadata.getStatistics().getStartTime(),
timeseriesMetadata.getStatistics().getEndTime());
if (checkTsFileResource && !timeseriesTimeRange.equals(deviceTimeRangeInResource)) {
throw new CompactionStatisticsCheckFailedException(
device, deviceTimeRangeInResource, timeseriesTimeRange);
if (checkTsFileResource) {
compareDeviceTimeRange(device, deviceTimeRangeInResource, timeseriesTimeRange);
}

long actualTimeseriesStartTime = Long.MAX_VALUE;
Expand Down Expand Up @@ -283,10 +282,27 @@ private void checkNonAlignedDeviceSeries(
if (!checkTsFileResource || actualDeviceStartTime > actualDeviceEndTime) {
return;
}
TimeRange actualDeviceTimeRange = new TimeRange(actualDeviceStartTime, actualDeviceEndTime);
if (!actualDeviceTimeRange.equals(deviceTimeRangeInResource)) {
throw new CompactionStatisticsCheckFailedException(
device, deviceTimeRangeInResource, actualDeviceTimeRange);
compareDeviceTimeRange(
device,
deviceTimeRangeInResource,
new TimeRange(actualDeviceStartTime, actualDeviceEndTime));
}

private void compareDeviceTimeRange(
IDeviceID device, TimeRange deviceTimeRangeInResource, TimeRange actualDeviceTimeRange) {
long innerCompactionCount = resource.getTsFileID().getInnerCompactionCount();
if (innerCompactionCount == 0) {
// for the files generate by flush with deletions, the statistics may be larger than the
// actual
if (!deviceTimeRangeInResource.contains(actualDeviceTimeRange)) {
throw new CompactionStatisticsCheckFailedException(
device, deviceTimeRangeInResource, actualDeviceTimeRange);
}
} else {
if (!actualDeviceTimeRange.equals(deviceTimeRangeInResource)) {
throw new CompactionStatisticsCheckFailedException(
device, deviceTimeRangeInResource, actualDeviceTimeRange);
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion ...pache/iotdb/db/storageengine/dataregion/compaction/repair/RepairDataFileScanUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ public void testWrongChunkStatisticsWithAlignedSeries() throws IOException {

@Test
public void testWrongResourceStatistics() throws IOException {
TsFileResource resource = createEmptyFileAndResource(true);
TsFileResource resource = createEmptyFileAndResourceWithName("1-1-1-0", 0, true);
try (CompactionTestFileWriter writer = new CompactionTestFileWriter(resource)) {
writer.startChunkGroup("d1");
writer.generateSimpleAlignedSeriesToCurrentDeviceWithNullValue(
Expand Down
Loading