liutaohua commented on a change in pull request #1650:
URL: https://github.com/apache/incubator-iotdb/pull/1650#discussion_r489128003
##########
File path:
server/src/main/java/org/apache/iotdb/db/query/reader/chunk/MemChunkReader.java
##########
@@ -118,7 +104,8 @@ public void close() {
@Override
public List<IPageReader> loadPageReaderList() throws IOException {
// we treat one ReadOnlyMemChunk as one Page
- return Collections.singletonList(
- new MemPageReader(nextPageData(),
readOnlyMemChunk.getChunkMetaData().getStatistics()));
+// return Collections.singletonList(
+// new MemPageReader(nextPageData(),
readOnlyMemChunk.getChunkMetaData().getStatistics()));
Review comment:
fixed
##########
File path:
server/src/main/java/org/apache/iotdb/db/query/reader/series/SeriesReaderByTimestamp.java
##########
@@ -31,31 +31,37 @@
public class SeriesReaderByTimestamp implements IReaderByTimestamp {
- private SeriesReader seriesReader;
- private BatchData batchData;
+ protected SeriesReader seriesReader;
+ protected BatchData batchData;
- public SeriesReaderByTimestamp(PartialPath seriesPath, Set<String>
allSensors, TSDataType dataType, QueryContext context,
- QueryDataSource dataSource, TsFileFilter
fileFilter) {
- seriesReader = new SeriesReader(seriesPath, allSensors, dataType, context,
- dataSource, TimeFilter.gtEq(Long.MIN_VALUE), null, fileFilter);
+ public SeriesReaderByTimestamp() {
}
- public SeriesReaderByTimestamp(SeriesReader seriesReader) {
- this.seriesReader = seriesReader;
+ public SeriesReaderByTimestamp(PartialPath seriesPath, Set<String>
allSensors,
+ TSDataType dataType, QueryContext context, QueryDataSource dataSource,
+ TsFileFilter fileFilter) {
+ seriesReader = new SeriesReader(seriesPath, allSensors, dataType, context,
+ dataSource, TimeFilter.gtEq(Long.MIN_VALUE), null, fileFilter, true);
}
+
@Override
public Object getValueInTimestamp(long timestamp) throws IOException {
seriesReader.setTimeFilter(timestamp);
- if ((batchData == null || batchData.getTimeByIndex(batchData.length() - 1)
< timestamp)
+ if ((batchData == null || (batchData.getTimeByIndex(batchData.length() -
1) < timestamp))
&& !hasNext(timestamp)) {
return null;
}
return batchData.getValueInTimestamp(timestamp);
}
- private boolean hasNext(long timestamp) throws IOException {
+ @Override
+ public boolean readerIsEmpty() throws IOException {
+ return seriesReader.isEmpty()&& isEmpty(batchData);
Review comment:
fixed
##########
File path:
server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/LocalGroupByExecutor.java
##########
@@ -231,18 +302,19 @@ private boolean readAndCalcFromPage(long curStartTime,
long curEndTime)
continue;
}
// stop calc and cached current batchData
- if (batchData.currentTime() >= curEndTime) {
+ if (ascending && batchData.currentTime() >= curEndTime) {
preCachedData = batchData;
return true;
}
- // reset the last position to zero
- lastReadCurArrayIndex = 0;
- lastReadCurListIndex = 0;
+ // reset the last position to current Index
+ lastReadCurArrayIndex = batchData.getReadCurArrayIndex();
+ lastReadCurListIndex = batchData.getReadCurListIndex();
calcFromBatch(batchData, curStartTime, curEndTime);
// judge whether the calculation finished
- if (isEndCalc() || (batchData.hasCurrent() && batchData.currentTime() >=
curEndTime)) {
+ if (isEndCalc() || (batchData.hasCurrent() && (ascending ?
+ batchData.currentTime() >= curEndTime : batchData.currentTime() <=
curStartTime))) {
Review comment:
fixed
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
