You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hx...@apache.org on 2019/06/28 13:35:31 UTC
[incubator-iotdb] branch feature_async_close_tsfile updated: rename
some functions and classes
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch feature_async_close_tsfile
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/feature_async_close_tsfile by this push:
new ec478a3 rename some functions and classes
new e216a10 Merge pull request #210 from LeiRui/rename28
ec478a3 is described below
commit ec478a3da7138da30f0b3e8e94639a74204bd4a8
Author: RuiLei <ru...@gmail.com>
AuthorDate: Fri Jun 28 09:51:00 2019 +0800
rename some functions and classes
---
.../query/dataset/groupby/GroupByWithValueFilterDataSet.java | 2 +-
...terDataSet.java => GroupByWithoutValueFilterDataSet.java} | 8 ++++----
.../iotdb/db/query/executor/AggregateEngineExecutor.java | 12 ++++++------
.../apache/iotdb/db/query/executor/EngineQueryRouter.java | 10 +++++-----
4 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithValueFilterDataSet.java b/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithValueFilterDataSet.java
index 6db4662..b12618e 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithValueFilterDataSet.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithValueFilterDataSet.java
@@ -85,7 +85,7 @@ public class GroupByWithValueFilterDataSet extends GroupByEngineDataSet {
public RowRecord next() throws IOException {
if (!hasCachedTimeInterval) {
throw new IOException("need to call hasNext() before calling next()"
- + " in GroupByWithOnlyTimeFilterDataSet.");
+ + " in GroupByWithoutValueFilterDataSet.");
}
hasCachedTimeInterval = false;
for (AggregateFunction function : functions) {
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithOnlyTimeFilterDataSet.java b/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithoutValueFilterDataSet.java
similarity index 97%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithOnlyTimeFilterDataSet.java
rename to iotdb/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithoutValueFilterDataSet.java
index 87f81cb..c567ff1 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithOnlyTimeFilterDataSet.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithoutValueFilterDataSet.java
@@ -45,7 +45,7 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-public class GroupByWithOnlyTimeFilterDataSet extends GroupByEngineDataSet {
+public class GroupByWithoutValueFilterDataSet extends GroupByEngineDataSet {
private List<IPointReader> unSequenceReaderList;
private List<IAggregateReader> sequenceReaderList;
@@ -56,8 +56,8 @@ public class GroupByWithOnlyTimeFilterDataSet extends GroupByEngineDataSet {
/**
* constructor.
*/
- public GroupByWithOnlyTimeFilterDataSet(long jobId, List<Path> paths, long unit,
- long origin, List<Pair<Long, Long>> mergedIntervals) {
+ public GroupByWithoutValueFilterDataSet(long jobId, List<Path> paths, long unit,
+ long origin, List<Pair<Long, Long>> mergedIntervals) {
super(jobId, paths, unit, origin, mergedIntervals);
this.unSequenceReaderList = new ArrayList<>();
this.sequenceReaderList = new ArrayList<>();
@@ -105,7 +105,7 @@ public class GroupByWithOnlyTimeFilterDataSet extends GroupByEngineDataSet {
public RowRecord next() throws IOException {
if (!hasCachedTimeInterval) {
throw new IOException("need to call hasNext() before calling next() "
- + "in GroupByWithOnlyTimeFilterDataSet.");
+ + "in GroupByWithoutValueFilterDataSet.");
}
hasCachedTimeInterval = false;
RowRecord record = new RowRecord(startTime);
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 074b587..f041908 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
@@ -80,7 +80,7 @@ public class AggregateEngineExecutor {
*
* @param context query context
*/
- public QueryDataSet executeWithOutTimeGenerator(QueryContext context)
+ public QueryDataSet executeWithoutValueFilter(QueryContext context)
throws FileNodeManagerException, IOException, PathErrorException, ProcessorException {
Filter timeFilter = null;
if (expression != null) {
@@ -124,7 +124,7 @@ public class AggregateEngineExecutor {
List<AggreResultData> aggreResultDataList = new ArrayList<>();
//TODO use multi-thread
for (int i = 0; i < selectedSeries.size(); i++) {
- AggreResultData aggreResultData = aggregateWithOutTimeGenerator(aggregateFunctions.get(i),
+ AggreResultData aggreResultData = aggregateWithoutValueFilter(aggregateFunctions.get(i),
readersOfSequenceData.get(i), readersOfUnSequenceData.get(i), timeFilter);
aggreResultDataList.add(aggreResultData);
}
@@ -140,7 +140,7 @@ public class AggregateEngineExecutor {
* @param filter time filter or null
* @return one series aggregate result data
*/
- private AggreResultData aggregateWithOutTimeGenerator(AggregateFunction function,
+ private AggreResultData aggregateWithoutValueFilter(AggregateFunction function,
IAggregateReader sequenceReader, IPointReader unSequenceReader, Filter filter)
throws IOException, ProcessorException {
if (function instanceof MaxTimeAggrFunc || function instanceof LastAggrFunc) {
@@ -257,7 +257,7 @@ public class AggregateEngineExecutor {
*
* @param context query context.
*/
- public QueryDataSet executeWithTimeGenerator(QueryContext context)
+ public QueryDataSet executeWithValueFilter(QueryContext context)
throws FileNodeManagerException, PathErrorException, IOException, ProcessorException {
QueryResourceManager
.getInstance().beginQueryOfGivenQueryPaths(context.getJobId(), selectedSeries);
@@ -274,7 +274,7 @@ public class AggregateEngineExecutor {
function.init();
aggregateFunctions.add(function);
}
- List<AggreResultData> batchDataList = aggregateWithTimeGenerator(aggregateFunctions,
+ List<AggreResultData> batchDataList = aggregateWithValueFilter(aggregateFunctions,
timestampGenerator,
readersOfSelectedSeries);
return constructDataSet(batchDataList);
@@ -283,7 +283,7 @@ public class AggregateEngineExecutor {
/**
* calculation aggregate result with value filter.
*/
- private List<AggreResultData> aggregateWithTimeGenerator(
+ private List<AggreResultData> aggregateWithValueFilter(
List<AggregateFunction> aggregateFunctions,
EngineTimeGenerator timestampGenerator,
List<IReaderByTimeStamp> readersOfSelectedSeries)
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 f474cae..3bec33c 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
@@ -27,7 +27,7 @@ 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.query.context.QueryContext;
-import org.apache.iotdb.db.query.dataset.groupby.GroupByWithOnlyTimeFilterDataSet;
+import org.apache.iotdb.db.query.dataset.groupby.GroupByWithoutValueFilterDataSet;
import org.apache.iotdb.db.query.dataset.groupby.GroupByWithValueFilterDataSet;
import org.apache.iotdb.db.query.fill.IFill;
import org.apache.iotdb.tsfile.exception.filter.QueryFilterOptimizationException;
@@ -91,14 +91,14 @@ public class EngineQueryRouter implements IEngineQueryRouter {
AggregateEngineExecutor engineExecutor = new AggregateEngineExecutor(
selectedSeries, aggres, optimizedExpression);
if (optimizedExpression.getType() == ExpressionType.GLOBAL_TIME) {
- return engineExecutor.executeWithOutTimeGenerator(context);
+ return engineExecutor.executeWithoutValueFilter(context);
} else {
- return engineExecutor.executeWithTimeGenerator(context);
+ return engineExecutor.executeWithValueFilter(context);
}
} else {
AggregateEngineExecutor engineExecutor = new AggregateEngineExecutor(
selectedSeries, aggres, null);
- return engineExecutor.executeWithOutTimeGenerator(context);
+ return engineExecutor.executeWithoutValueFilter(context);
}
}
@@ -149,7 +149,7 @@ public class EngineQueryRouter implements IEngineQueryRouter {
IExpression optimizedExpression = ExpressionOptimizer.getInstance()
.optimize(expression, selectedSeries);
if (optimizedExpression.getType() == ExpressionType.GLOBAL_TIME) {
- GroupByWithOnlyTimeFilterDataSet groupByEngine = new GroupByWithOnlyTimeFilterDataSet(
+ GroupByWithoutValueFilterDataSet groupByEngine = new GroupByWithoutValueFilterDataSet(
nextJobId, selectedSeries, unit, origin, mergedIntervalList);
groupByEngine.initGroupBy(context, aggres, optimizedExpression);
return groupByEngine;