[incubator-iotdb] branch aggregate updated: fix some variable naming

[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 19b65e8  fix some variable naming
19b65e8 is described below

commit 19b65e83dade9cb62df9bb0491b8f84b0f0de79c
Author: CGF <cgf1...@foxmail.com>
AuthorDate: Wed Mar 20 13:37:30 2019 +0800

    fix some variable naming
---
 .../iotdb/db/query/executor/AggregateEngineExecutor.java  | 15 +++++++--------
 .../apache/iotdb/db/query/executor/EngineQueryRouter.java |  1 -
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git 
a/iotdb/src/main/java/org/apache/iotdb/db/query/executor/AggregateEngineExecutor.java
 
b/iotdb/src/main/java/org/apache/iotdb/db/query/executor/AggregateEngineExecutor.java
index d9cf6ec..7446616 100644
--- 
a/iotdb/src/main/java/org/apache/iotdb/db/query/executor/AggregateEngineExecutor.java
+++ 
b/iotdb/src/main/java/org/apache/iotdb/db/query/executor/AggregateEngineExecutor.java
@@ -95,7 +95,7 @@ public class AggregateEngineExecutor {
     List<IPointReader> readersOfUnSequenceData = new ArrayList<>();
     List<AggregateFunction> aggregateFunctions = new ArrayList<>();
     for (int i = 0; i < selectedSeries.size(); i++) {
-      //construct AggregateFunction
+      // construct AggregateFunction
       TSDataType tsDataType = MManager.getInstance()
           .getSeriesType(selectedSeries.get(i).getFullPath());
       AggregateFunction function = 
AggreFuncFactory.getAggrFuncByName(aggres.get(i), tsDataType);
@@ -106,7 +106,7 @@ public class AggregateEngineExecutor {
           .getQueryDataSource(jobId, selectedSeries.get(i), context);
 
       // sequence reader for sealed tsfile, unsealed tsfile, memory
-      SequenceDataReader sequenceReader = null;
+      SequenceDataReader sequenceReader;
       if (function instanceof MaxTimeAggrFunc || function instanceof 
LastAggrFunc) {
         sequenceReader = new 
SequenceDataReader(queryDataSource.getSeqDataSource(), timeFilter,
             context, true);
@@ -122,14 +122,14 @@ public class AggregateEngineExecutor {
       readersOfUnSequenceData.add(unSeqMergeReader);
     }
 
-    List<BatchData> batchDatas = new ArrayList<BatchData>();
+    List<BatchData> batchDataList = new ArrayList<>();
     //TODO use multi-thread
     for (int i = 0; i < selectedSeries.size(); i++) {
       BatchData batchData = 
aggregateWithOutTimeGenerator(aggregateFunctions.get(i),
           readersOfSequenceData.get(i), readersOfUnSequenceData.get(i));
-      batchDatas.add(batchData);
+      batchDataList.add(batchData);
     }
-    return constructDataSet(batchDatas);
+    return constructDataSet(batchDataList);
   }
 
   private BatchData aggregateWithOutTimeGenerator(AggregateFunction function,
@@ -255,9 +255,9 @@ public class AggregateEngineExecutor {
       function.init();
       aggregateFunctions.add(function);
     }
-    List<BatchData> batchDatas = 
aggregateWithTimeGenerator(aggregateFunctions, timestampGenerator,
+    List<BatchData> batchDataList = 
aggregateWithTimeGenerator(aggregateFunctions, timestampGenerator,
         readersOfSelectedSeries);
-    return constructDataSet(batchDatas);
+    return constructDataSet(batchDataList);
   }
 
   private List<BatchData> aggregateWithTimeGenerator(List<AggregateFunction> 
aggregateFunctions,
@@ -281,7 +281,6 @@ public class AggregateEngineExecutor {
         aggregateFunctions.get(i)
             .calcAggregationUsingTimestamps(timestamps, 
readersOfSelectedSeries.get(i));
       }
-
     }
 
     List<BatchData> batchDataList = new ArrayList<>();
diff --git 
a/iotdb/src/main/java/org/apache/iotdb/db/query/executor/EngineQueryRouter.java 
b/iotdb/src/main/java/org/apache/iotdb/db/query/executor/EngineQueryRouter.java
index c36d5c2..168d2da 100644
--- 
a/iotdb/src/main/java/org/apache/iotdb/db/query/executor/EngineQueryRouter.java
+++ 
b/iotdb/src/main/java/org/apache/iotdb/db/query/executor/EngineQueryRouter.java
@@ -71,7 +71,6 @@ public class EngineQueryRouter {
         if (optimizedExpression.getType() == GLOBAL_TIME) {
           EngineExecutorWithoutTimeGenerator engineExecutor =
               new EngineExecutorWithoutTimeGenerator(
-
                   nextJobId, queryExpression);
           return engineExecutor.executeWithGlobalTimeFilter(context);
         } else {