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 2020/02/11 03:44:15 UTC
[incubator-iotdb] branch ty-debug updated: solve group by bug
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch ty-debug
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/ty-debug by this push:
new c88f236 solve group by bug
c88f236 is described below
commit c88f236a0aa2c10349d9ff3011551d89450153cd
Author: JackieTien97 <Ja...@foxmail.com>
AuthorDate: Tue Feb 11 11:42:19 2020 +0800
solve group by bug
---
.../iotdb/db/query/dataset/DeviceIterateDataSet.java | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/query/dataset/DeviceIterateDataSet.java b/server/src/main/java/org/apache/iotdb/db/query/dataset/DeviceIterateDataSet.java
index 792e85d..1e3298c 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/dataset/DeviceIterateDataSet.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/dataset/DeviceIterateDataSet.java
@@ -18,12 +18,6 @@
*/
package org.apache.iotdb.db.query.dataset;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
import org.apache.iotdb.db.exception.StorageEngineException;
import org.apache.iotdb.db.exception.query.QueryProcessException;
import org.apache.iotdb.db.qp.physical.crud.AggregationPlan;
@@ -42,6 +36,9 @@ import org.apache.iotdb.tsfile.read.expression.IExpression;
import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet;
import org.apache.iotdb.tsfile.utils.Binary;
+import java.io.IOException;
+import java.util.*;
+
/**
* This QueryDataSet is used for GROUP_BY_DEVICE query result.
@@ -131,11 +128,11 @@ public class DeviceIterateDataSet extends QueryDataSet {
} else {
curDataSetInitialized = false;
}
- for (int i = 0; i < deduplicatedMeasurementColumns.size(); i++) {
- currentColumnMapRelation[i] = -1;
- }
while (deviceIterator.hasNext()) {
+ for (int i = 0; i < deduplicatedMeasurementColumns.size(); i++) {
+ currentColumnMapRelation[i] = -1;
+ }
currentDevice = deviceIterator.next();
Set<String> measurementColumnsOfGivenDevice = measurementColumnsGroupByDevice
.get(currentDevice);