You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xi...@apache.org on 2021/09/21 11:27:08 UTC
[iotdb] branch aggrVector2 updated (174b312 -> fa59d6d)
This is an automated email from the ASF dual-hosted git repository.
xiangweiwei pushed a change to branch aggrVector2
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from 174b312 Fix cursor bug
new a90e80f Fix cursor bug2
new fa59d6d ignore iotdbSessionVectorABDeviceIT
The 2 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.
Summary of changes:
.../iotdb/db/query/executor/AggregationExecutor.java | 16 ++++++++--------
.../reader/series/VectorSeriesAggregateReader.java | 20 +++++++++++---------
.../iotdb/session/IoTDBSessionVectorABDeviceIT.java | 2 ++
3 files changed, 21 insertions(+), 17 deletions(-)
[iotdb] 01/02: Fix cursor bug2
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiangweiwei pushed a commit to branch aggrVector2
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit a90e80f6f2e537ed29548b649fa6082814e54683
Author: Alima777 <wx...@gmail.com>
AuthorDate: Fri Sep 17 15:12:22 2021 +0800
Fix cursor bug2
---
.../iotdb/db/query/executor/AggregationExecutor.java | 16 ++++++++--------
.../reader/series/VectorSeriesAggregateReader.java | 20 +++++++++++---------
2 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/query/executor/AggregationExecutor.java b/server/src/main/java/org/apache/iotdb/db/query/executor/AggregationExecutor.java
index 608d294..486556c 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/executor/AggregationExecutor.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/executor/AggregationExecutor.java
@@ -393,7 +393,7 @@ public class AggregationExecutor {
while (seriesReader.hasNextFile()) {
// cal by file statistics
if (seriesReader.canUseCurrentFileStatistics()) {
- while (seriesReader.getCurIndex() < seriesReader.getSubSensorSize()) {
+ while (seriesReader.hasNextSubSeries()) {
Statistics fileStatistics = seriesReader.currentFileStatistics();
remainingToCalculate =
aggregateStatistics(
@@ -405,7 +405,7 @@ public class AggregationExecutor {
seriesReader.resetIndex();
return;
}
- seriesReader.nextIndex();
+ seriesReader.nextSeries();
}
seriesReader.skipCurrentFile();
continue;
@@ -414,7 +414,7 @@ public class AggregationExecutor {
while (seriesReader.hasNextChunk()) {
// cal by chunk statistics
if (seriesReader.canUseCurrentChunkStatistics()) {
- while (seriesReader.getCurIndex() < seriesReader.getSubSensorSize()) {
+ while (seriesReader.hasNextSubSeries()) {
Statistics chunkStatistics = seriesReader.currentChunkStatistics();
remainingToCalculate =
aggregateStatistics(
@@ -426,7 +426,7 @@ public class AggregationExecutor {
seriesReader.resetIndex();
return;
}
- seriesReader.nextIndex();
+ seriesReader.nextSeries();
}
seriesReader.skipCurrentChunk();
continue;
@@ -506,7 +506,7 @@ public class AggregationExecutor {
while (seriesReader.hasNextPage()) {
// cal by page statistics
if (seriesReader.canUseCurrentPageStatistics()) {
- while (seriesReader.getCurIndex() < seriesReader.getSubSensorSize()) {
+ while (seriesReader.hasNextSubSeries()) {
Statistics pageStatistic = seriesReader.currentPageStatistics();
remainingToCalculate =
aggregateStatistics(
@@ -518,7 +518,7 @@ public class AggregationExecutor {
seriesReader.resetIndex();
return 0;
}
- seriesReader.nextIndex();
+ seriesReader.nextSeries();
}
seriesReader.skipCurrentPage();
continue;
@@ -526,7 +526,7 @@ public class AggregationExecutor {
BatchData nextOverlappedPageData = seriesReader.nextPage();
BatchData[] subBatchData = nextOverlappedPageData.generateSubBatchData();
- while (seriesReader.getCurIndex() < seriesReader.getSubSensorSize()) {
+ while (seriesReader.hasNextSubSeries()) {
remainingToCalculate =
aggregateBatchData(
aggregateResultList.get(seriesReader.getCurIndex()),
@@ -537,7 +537,7 @@ public class AggregationExecutor {
seriesReader.resetIndex();
return 0;
}
- seriesReader.nextIndex();
+ seriesReader.nextSeries();
}
}
return remainingToCalculate;
diff --git a/server/src/main/java/org/apache/iotdb/db/query/reader/series/VectorSeriesAggregateReader.java b/server/src/main/java/org/apache/iotdb/db/query/reader/series/VectorSeriesAggregateReader.java
index b3fddca..4084da5 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/reader/series/VectorSeriesAggregateReader.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/reader/series/VectorSeriesAggregateReader.java
@@ -148,19 +148,21 @@ public class VectorSeriesAggregateReader implements IAggregateReader {
|| timeFilter.containStartEndTime(statistics.getStartTime(), statistics.getEndTime());
}
- public int getCurIndex() {
- return curIndex;
+ public boolean hasNextSubSeries() {
+ if (getCurIndex() < subSensorSize) {
+ return true;
+ } else {
+ resetIndex();
+ return false;
+ }
}
- public int getSubSensorSize() {
- return subSensorSize;
+ public void nextSeries() {
+ curIndex++;
}
- public void nextIndex() {
- curIndex++;
- if (curIndex >= subSensorSize) {
- resetIndex();
- }
+ public int getCurIndex() {
+ return curIndex;
}
public void resetIndex() {
[iotdb] 02/02: ignore iotdbSessionVectorABDeviceIT
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiangweiwei pushed a commit to branch aggrVector2
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit fa59d6d390c7902770c4b49d7654b5ce5dbaf12b
Author: Alima777 <wx...@gmail.com>
AuthorDate: Tue Sep 21 19:26:23 2021 +0800
ignore iotdbSessionVectorABDeviceIT
---
.../java/org/apache/iotdb/session/IoTDBSessionVectorABDeviceIT.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/session/src/test/java/org/apache/iotdb/session/IoTDBSessionVectorABDeviceIT.java b/session/src/test/java/org/apache/iotdb/session/IoTDBSessionVectorABDeviceIT.java
index 5de49f4..313f7b4 100644
--- a/session/src/test/java/org/apache/iotdb/session/IoTDBSessionVectorABDeviceIT.java
+++ b/session/src/test/java/org/apache/iotdb/session/IoTDBSessionVectorABDeviceIT.java
@@ -32,6 +32,7 @@ import org.apache.iotdb.tsfile.write.schema.VectorMeasurementSchema;
import org.junit.AfterClass;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
import java.util.ArrayList;
@@ -64,6 +65,7 @@ public class IoTDBSessionVectorABDeviceIT {
}
@Test
+ @Ignore
public void vectorAlignByDeviceTest() {
try {
SessionDataSet dataSet =