You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by su...@apache.org on 2019/06/24 15:31:59 UTC
[incubator-iotdb] 03/03: fix bug of query on value columns
This is an automated email from the ASF dual-hosted git repository.
suyue pushed a commit to branch qovc
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit bb1c101e97b3919577a12650ce6413583c613a9e
Author: suyue <23...@qq.com>
AuthorDate: Mon Jun 24 23:31:03 2019 +0800
fix bug of query on value columns
---
.../apache/iotdb/db/query/factory/SeriesReaderFactoryImpl.java | 8 +-------
.../main/java/org/apache/iotdb/db/query/reader/AllDataReader.java | 2 +-
.../java/org/apache/iotdb/db/integration/IoTDBCompleteIT.java | 2 ++
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/factory/SeriesReaderFactoryImpl.java b/iotdb/src/main/java/org/apache/iotdb/db/query/factory/SeriesReaderFactoryImpl.java
index 2b45073..cc4b91a 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/query/factory/SeriesReaderFactoryImpl.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/query/factory/SeriesReaderFactoryImpl.java
@@ -276,13 +276,7 @@ public class SeriesReaderFactoryImpl implements ISeriesReaderFactory {
IPointReader unSeqMergeReader;
unSeqMergeReader = createUnSeqReader(path, queryDataSource.getUnseqResources(), context, null);
- if (!tsFilesReader.hasNext()) {
- //only have unsequence data.
- return unSeqMergeReader;
- } else {
- //merge sequence data with unsequence data.
- return new AllDataReaderWithValueFilter(tsFilesReader, unSeqMergeReader, filter);
- }
+ return new AllDataReaderWithValueFilter(tsFilesReader, unSeqMergeReader, filter);
}
private static class SeriesReaderFactoryHelper {
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/AllDataReader.java b/iotdb/src/main/java/org/apache/iotdb/db/query/reader/AllDataReader.java
index b50f2a0..b7151b5 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/query/reader/AllDataReader.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/query/reader/AllDataReader.java
@@ -109,7 +109,7 @@ public class AllDataReader implements IPointReader {
}
// has value in batchReader
- while (batchReader.hasNext()) {
+ while (batchReader != null && batchReader.hasNext()) {
batchData = batchReader.nextBatch();
if (batchData.hasNext()) {
hasCachedBatchData = true;
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBCompleteIT.java b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBCompleteIT.java
index 167ee79..95e6385 100644
--- a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBCompleteIT.java
+++ b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBCompleteIT.java
@@ -64,6 +64,8 @@ public class IoTDBCompleteIT {
insertTest();
selectTest();
deleteTest();
+ groupByTest();
+ funcTest();
funcTestWithOutTimeGenerator();
}