This is an automated email from the ASF dual-hosted git repository. shuwenwei pushed a commit to branch skipNotSatisfiedTimeRange in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 5e173caf2a5e7ca75f19087fabfefbd4276072d7 Author: shuwenwei <[email protected]> AuthorDate: Sat Oct 11 18:01:44 2025 +0800 skip not statisfied time range in MemPointIterator --- .../execution/operator/source/SeriesScanUtil.java | 27 ++++++++-- .../read/reader/common/NoDataPointReader.java | 59 ++++++++++++++++++++++ 2 files changed, 83 insertions(+), 3 deletions(-) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesScanUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesScanUtil.java index e5a1ac4b94e..5cc201626d1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesScanUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesScanUtil.java @@ -35,6 +35,7 @@ import org.apache.iotdb.db.storageengine.dataregion.read.reader.chunk.MemChunkLo import org.apache.iotdb.db.storageengine.dataregion.read.reader.chunk.MemPageReader; import org.apache.iotdb.db.storageengine.dataregion.read.reader.common.DescPriorityMergeReader; import org.apache.iotdb.db.storageengine.dataregion.read.reader.common.MergeReaderPriority; +import org.apache.iotdb.db.storageengine.dataregion.read.reader.common.NoDataPointReader; import org.apache.iotdb.db.storageengine.dataregion.read.reader.common.PriorityMergeReader; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; import org.apache.iotdb.db.utils.datastructure.MemPointIterator; @@ -1495,6 +1496,7 @@ public class SeriesScanUtil implements Accountable { protected final boolean isSeq; protected final boolean isAligned; private boolean inited = false; + private boolean hasData = true; LazyMemVersionPageReader( QueryContext context, @@ -1514,11 +1516,14 @@ public class SeriesScanUtil implements Accountable { } public IPointReader getPointReader() { + if (!hasData) { + return NoDataPointReader.getInstance(); + } return memPointIterator; } public boolean hasNextBatch() { - return memPointIterator.hasNextBatch(); + return hasData && memPointIterator.hasNextBatch(); } public void setCurrentPageTimeRangeToMemPointIterator() { @@ -1529,8 +1534,24 @@ public class SeriesScanUtil implements Accountable { // empty return; } - this.memPointIterator.setCurrentPageTimeRange( - new TimeRange(statistics.getStartTime(), statistics.getEndTime())); + Filter globalTimeFilter = ((FragmentInstanceContext) context).getGlobalTimeFilter(); + long startTime = statistics.getStartTime(); + long endTime = statistics.getEndTime(); + long minStart = Long.MAX_VALUE; + long maxEnd = Long.MIN_VALUE; + for (TimeRange timeRange : globalTimeFilter.getTimeRanges()) { + if (timeRange.overlaps(new TimeRange(startTime, endTime))) { + minStart = Math.min(minStart, Math.max(timeRange.getMin(), startTime)); + maxEnd = Math.max(maxEnd, Math.min(timeRange.getMax(), endTime)); + } + } + + if (minStart > maxEnd) { + hasData = false; + return; + } + + this.memPointIterator.setCurrentPageTimeRange(new TimeRange(minStart, maxEnd)); } public TsBlock nextBatch() { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/common/NoDataPointReader.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/common/NoDataPointReader.java new file mode 100644 index 00000000000..945318f6d22 --- /dev/null +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/common/NoDataPointReader.java @@ -0,0 +1,59 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.iotdb.db.storageengine.dataregion.read.reader.common; + +import org.apache.tsfile.read.TimeValuePair; +import org.apache.tsfile.read.reader.IPointReader; + +import java.io.IOException; + +public class NoDataPointReader implements IPointReader { + + private NoDataPointReader() {} + + private static final IPointReader instance = new NoDataPointReader(); + + public static IPointReader getInstance() { + return instance; + } + + @Override + public boolean hasNextTimeValuePair() throws IOException { + return false; + } + + @Override + public TimeValuePair nextTimeValuePair() throws IOException { + return null; + } + + @Override + public TimeValuePair currentTimeValuePair() throws IOException { + return null; + } + + @Override + public long getUsedMemorySize() { + return 0; + } + + @Override + public void close() throws IOException {} +}
