Skip to content

Filter those time series metadata whose endTime is less than startTime #12624

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

Closed
JackieTien97 wants to merge 1 commit into from
Closed

Filter those time series metadata whose endTime is less than startTime #12624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions .../main/java/org/apache/iotdb/db/queryengine/execution/operator/source/FileLoaderUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,8 @@ public static AlignedTimeSeriesMetadata loadAlignedTimeSeriesMetadata(
if (alignedTimeSeriesMetadata != null) {
final long t2 = System.nanoTime();
try {
if (alignedTimeSeriesMetadata.getTimeseriesMetadata().getStatistics().getStartTime()
> alignedTimeSeriesMetadata.getTimeseriesMetadata().getStatistics().getEndTime()) {
if (alignedTimeSeriesMetadata.getStatistics().getStartTime()
> alignedTimeSeriesMetadata.getStatistics().getEndTime()) {
return null;
}
if (globalTimeFilter != null && globalTimeFilter.canSkip(alignedTimeSeriesMetadata)) {
Expand Down
35 changes: 30 additions & 5 deletions ...anode/src/main/java/org/apache/iotdb/db/storageengine/buffer/TimeSeriesMetadataCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,20 @@ public TimeseriesMetadata get(
}
TimeseriesMetadata timeseriesMetadata =
reader.readTimeseriesMetadata(key.device, key.measurement, ignoreNotExists);
return (timeseriesMetadata == null || timeseriesMetadata.getStatistics().getCount() == 0)
? null
: timeseriesMetadata;
if (timeseriesMetadata == null || timeseriesMetadata.getStatistics().getCount() == 0) {
return null;
} else if (timeseriesMetadata.getStatistics().getEndTime()
< timeseriesMetadata.getStatistics().getStartTime()) {
logger.warn(
"Found endTime({}) of timeseries metadata statistics{} less than startTime({}), file is {}",
timeseriesMetadata.getStatistics().getEndTime(),
timeseriesMetadata.getStatistics(),
timeseriesMetadata.getStatistics().getStartTime(),
key);
return null;
} else {
return timeseriesMetadata;
}
}

TimeseriesMetadata timeseriesMetadata = lruCache.getIfPresent(key);
Expand Down Expand Up @@ -185,11 +196,25 @@ public TimeseriesMetadata get(
key.compactionVersion,
key.device,
metadata.getMeasurementId());
long startTime1 = metadata.getStatistics().getStartTime();
long endTime1 = metadata.getStatistics().getEndTime();
if (metadata.getStatistics().getCount() != 0) {
lruCache.put(k, metadata);
if (endTime1 < startTime1) {
logger.warn(
"Found endTime({}) of timeseries metadata statistics{} less than startTime({}), file is {}",
endTime1,
metadata.getStatistics(),
startTime1,
key);
} else {
lruCache.put(k, metadata);
}
}
if (metadata.getMeasurementId().equals(key.measurement)) {
timeseriesMetadata = metadata.getStatistics().getCount() == 0 ? null : metadata;
timeseriesMetadata =
(metadata.getStatistics().getCount() == 0 || endTime1 < startTime1)
? null
: metadata;
}
}
}
Expand Down