[incubator-iotdb] branch aggregate updated: fix imports and comments

[caogaofei]

This is an automated email from the ASF dual-hosted git repository.

caogaofei pushed a commit to branch aggregate
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git


The following commit(s) were added to refs/heads/aggregate by this push:
     new 74ed4bd  fix imports and comments
74ed4bd is described below

commit 74ed4bdc671fa1adced046b6e7d0d714c7552b7a
Author: CGF <cgf1...@foxmail.com>
AuthorDate: Tue Mar 26 10:55:10 2019 +0800

    fix imports and comments
---
 .../org/apache/iotdb/db/query/aggregation/impl/FirstAggrFunc.java | 4 ----
 .../java/org/apache/iotdb/db/query/executor/GroupByEngine.java    | 8 ++------
 .../iotdb/db/query/executor/GroupByWithOnlyTimeFilterDataSet.java | 2 +-
 .../iotdb/db/query/executor/GroupByWithValueFilterDataSet.java    | 2 --
 4 files changed, 3 insertions(+), 13 deletions(-)

diff --git 
a/iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/FirstAggrFunc.java
 
b/iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/FirstAggrFunc.java
index 749393a..f75fd7e 100644
--- 
a/iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/FirstAggrFunc.java
+++ 
b/iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/impl/FirstAggrFunc.java
@@ -80,7 +80,6 @@ public class FirstAggrFunc extends AggregateFunction {
 
     if (dataInThisPage.hasNext()) {
       resultData.putTimeAndValue(0, dataInThisPage.currentValue());
-      return;
     }
   }
 
@@ -109,7 +108,6 @@ public class FirstAggrFunc extends AggregateFunction {
     if (dataInThisPage.hasNext() && dataInThisPage.currentTime() < bound) {
       resultData.putTimeAndValue(0, dataInThisPage.currentValue());
       dataInThisPage.next();
-      return;
     }
   }
 
@@ -121,7 +119,6 @@ public class FirstAggrFunc extends AggregateFunction {
     }
     if (unsequenceReader.hasNext()) {
       resultData.putTimeAndValue(0, 
unsequenceReader.current().getValue().getValue());
-      return;
     }
   }
 
@@ -133,7 +130,6 @@ public class FirstAggrFunc extends AggregateFunction {
     }
     if (unsequenceReader.hasNext() && 
unsequenceReader.current().getTimestamp() < bound) {
       resultData.putTimeAndValue(0, 
unsequenceReader.current().getValue().getValue());
-      return;
     }
   }
 
diff --git 
a/iotdb/src/main/java/org/apache/iotdb/db/query/executor/GroupByEngine.java 
b/iotdb/src/main/java/org/apache/iotdb/db/query/executor/GroupByEngine.java
index a4effd6..f77da09 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/query/executor/GroupByEngine.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/query/executor/GroupByEngine.java
@@ -19,22 +19,18 @@
 
 package org.apache.iotdb.db.query.executor;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import org.apache.iotdb.db.exception.FileNodeManagerException;
 import org.apache.iotdb.db.exception.PathErrorException;
 import org.apache.iotdb.db.exception.ProcessorException;
 import org.apache.iotdb.db.metadata.MManager;
 import org.apache.iotdb.db.query.aggregation.AggreFuncFactory;
 import org.apache.iotdb.db.query.aggregation.AggreResultData;
 import org.apache.iotdb.db.query.aggregation.AggregateFunction;
-import org.apache.iotdb.db.query.context.QueryContext;
 import org.apache.iotdb.tsfile.exception.write.UnSupportedDataTypeException;
 import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
 import org.apache.iotdb.tsfile.read.common.Field;
 import org.apache.iotdb.tsfile.read.common.Path;
-import org.apache.iotdb.tsfile.read.expression.IExpression;
 import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet;
 import org.apache.iotdb.tsfile.utils.Pair;
 
@@ -44,11 +40,11 @@ public abstract class GroupByEngine extends QueryDataSet {
   protected List<Path> selectedSeries;
   private long unit;
   private long origin;
-  protected List<Pair<Long, Long>> mergedIntervals;
+  private List<Pair<Long, Long>> mergedIntervals;
 
   protected long startTime;
   protected long endTime;
-  protected int usedIndex;
+  private int usedIndex;
   protected List<AggregateFunction> functions;
   protected boolean hasCachedTimeInterval;
 
diff --git 
a/iotdb/src/main/java/org/apache/iotdb/db/query/executor/GroupByWithOnlyTimeFilterDataSet.java
 
b/iotdb/src/main/java/org/apache/iotdb/db/query/executor/GroupByWithOnlyTimeFilterDataSet.java
index 922148c..5606f9f 100644
--- 
a/iotdb/src/main/java/org/apache/iotdb/db/query/executor/GroupByWithOnlyTimeFilterDataSet.java
+++ 
b/iotdb/src/main/java/org/apache/iotdb/db/query/executor/GroupByWithOnlyTimeFilterDataSet.java
@@ -124,7 +124,7 @@ public class GroupByWithOnlyTimeFilterDataSet extends 
GroupByEngine {
     return record;
   }
 
-  protected AggreResultData nextSeries(int idx) throws IOException, 
ProcessorException {
+  private AggreResultData nextSeries(int idx) throws IOException, 
ProcessorException {
     IPointReader unsequenceReader = unSequenceReaderList.get(idx);
     IAggregateReader sequenceReader = sequenceReaderList.get(idx);
     AggregateFunction function = functions.get(idx);
diff --git 
a/iotdb/src/main/java/org/apache/iotdb/db/query/executor/GroupByWithValueFilterDataSet.java
 
b/iotdb/src/main/java/org/apache/iotdb/db/query/executor/GroupByWithValueFilterDataSet.java
index a4002f2..c77e192 100644
--- 
a/iotdb/src/main/java/org/apache/iotdb/db/query/executor/GroupByWithValueFilterDataSet.java
+++ 
b/iotdb/src/main/java/org/apache/iotdb/db/query/executor/GroupByWithValueFilterDataSet.java
@@ -40,7 +40,6 @@ import org.apache.iotdb.tsfile.utils.Pair;
 
 public class GroupByWithValueFilterDataSet extends GroupByEngine {
 
-
   private List<EngineReaderByTimeStamp> allDataReaderList;
   private TimeGenerator timestampGenerator;
   private long timestamp;
@@ -91,7 +90,6 @@ public class GroupByWithValueFilterDataSet extends 
GroupByEngine {
         hasCachedTimestamp = false;
         timestampArray[timeArrayLength++] = timestamp;
       } else {
-        //所有域均为空
         return constructRowRecord();
       }
     }