You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2024/05/30 13:21:30 UTC
(iotdb) branch ty/FilterTimeseriesMetadata created (now f8a33171a13)
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch ty/FilterTimeseriesMetadata
in repository https://gitbox.apache.org/repos/asf/iotdb.git
at f8a33171a13 Filter those time series metadata whose endTime is less than startTime
This branch includes the following new commits:
new f8a33171a13 Filter those time series metadata whose endTime is less than startTime
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(iotdb) 01/01: Filter those time series metadata whose endTime is less than startTime
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch ty/FilterTimeseriesMetadata
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit f8a33171a13d385381e0aef246fdbb57aaecf0dd
Author: JackieTien97 <ja...@gmail.com>
AuthorDate: Thu May 30 21:21:16 2024 +0800
Filter those time series metadata whose endTime is less than startTime
---
.../execution/operator/source/FileLoaderUtils.java | 4 +--
.../buffer/TimeSeriesMetadataCache.java | 35 ++++++++++++++++++----
2 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/FileLoaderUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/FileLoaderUtils.java
index b45990a7f21..239f7e6dc82 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/FileLoaderUtils.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/FileLoaderUtils.java
@@ -192,8 +192,8 @@ public class FileLoaderUtils {
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)) {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/buffer/TimeSeriesMetadataCache.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/buffer/TimeSeriesMetadataCache.java
index bf308993e6a..757609dea5d 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/buffer/TimeSeriesMetadataCache.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/buffer/TimeSeriesMetadataCache.java
@@ -129,9 +129,20 @@ public class TimeSeriesMetadataCache {
}
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);
@@ -185,11 +196,25 @@ public class TimeSeriesMetadataCache {
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;
}
}
}