You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by lt...@apache.org on 2019/04/16 12:26:55 UTC
[incubator-iotdb] 04/19: reorganize query dataset code
This is an automated email from the ASF dual-hosted git repository.
lta pushed a commit to branch cluster_read
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 1d6c7a3426c4a0c05ca65b2348ce8f09b3025175
Author: lta <li...@163.com>
AuthorDate: Fri Apr 12 20:31:24 2019 +0800
reorganize query dataset code
---
.../groupby/GroupByEngineDataSet.java | 4 ++--
.../groupby/GroupByWithOnlyTimeFilterDataSet.java} | 8 ++++----
.../groupby/GroupByWithValueFilterDataSet.java} | 8 ++++----
.../iotdb/db/query/executor/AggregateEngineExecutor.java | 2 +-
.../apache/iotdb/db/query/executor/EngineQueryRouter.java | 10 ++++------
.../query/{aggregation => factory}/AggreFuncFactory.java | 3 ++-
.../iotdb/db/query/executor/GroupByEngineDataSetTest.java | 14 +++++++-------
7 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/executor/groupby/GroupByEngineDataSet.java b/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByEngineDataSet.java
similarity index 97%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/executor/groupby/GroupByEngineDataSet.java
rename to iotdb/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByEngineDataSet.java
index f7ecea8..cd1b95b 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/query/executor/groupby/GroupByEngineDataSet.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByEngineDataSet.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.iotdb.db.query.executor.groupby;
+package org.apache.iotdb.db.query.dataset.groupby;
import java.util.ArrayList;
import java.util.List;
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.factory.AggreFuncFactory;
import org.apache.iotdb.db.query.aggregation.AggreResultData;
import org.apache.iotdb.db.query.aggregation.AggregateFunction;
import org.apache.iotdb.tsfile.exception.write.UnSupportedDataTypeException;
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/executor/groupby/GroupByWithOnlyTimeFilterDataSetDataSet.java b/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithOnlyTimeFilterDataSet.java
similarity index 97%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/executor/groupby/GroupByWithOnlyTimeFilterDataSetDataSet.java
rename to iotdb/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithOnlyTimeFilterDataSet.java
index e82b567..e2688ba 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/query/executor/groupby/GroupByWithOnlyTimeFilterDataSetDataSet.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithOnlyTimeFilterDataSet.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.query.executor.groupby;
+package org.apache.iotdb.db.query.dataset.groupby;
import java.io.IOException;
import java.util.ArrayList;
@@ -45,7 +45,7 @@ import org.apache.iotdb.tsfile.read.expression.impl.GlobalTimeExpression;
import org.apache.iotdb.tsfile.read.filter.basic.Filter;
import org.apache.iotdb.tsfile.utils.Pair;
-public class GroupByWithOnlyTimeFilterDataSetDataSet extends GroupByEngineDataSet {
+public class GroupByWithOnlyTimeFilterDataSet extends GroupByEngineDataSet {
protected List<IPointReader> unSequenceReaderList;
protected List<IAggregateReader> sequenceReaderList;
@@ -56,7 +56,7 @@ public class GroupByWithOnlyTimeFilterDataSetDataSet extends GroupByEngineDataSe
/**
* constructor.
*/
- public GroupByWithOnlyTimeFilterDataSetDataSet(long jobId, List<Path> paths, long unit,
+ public GroupByWithOnlyTimeFilterDataSet(long jobId, List<Path> paths, long unit,
long origin, List<Pair<Long, Long>> mergedIntervals) {
super(jobId, paths, unit, origin, mergedIntervals);
this.unSequenceReaderList = new ArrayList<>();
@@ -103,7 +103,7 @@ public class GroupByWithOnlyTimeFilterDataSetDataSet extends GroupByEngineDataSe
public RowRecord next() throws IOException {
if (!hasCachedTimeInterval) {
throw new IOException("need to call hasNext() before calling next() "
- + "in GroupByWithOnlyTimeFilterDataSetDataSet.");
+ + "in GroupByWithOnlyTimeFilterDataSet.");
}
hasCachedTimeInterval = false;
RowRecord record = new RowRecord(startTime);
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/executor/groupby/GroupByWithValueFilterDataSetDataSet.java b/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithValueFilterDataSet.java
similarity index 94%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/executor/groupby/GroupByWithValueFilterDataSetDataSet.java
rename to iotdb/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithValueFilterDataSet.java
index 7a6b3d2..f7ffa29 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/query/executor/groupby/GroupByWithValueFilterDataSetDataSet.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithValueFilterDataSet.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.query.executor.groupby;
+package org.apache.iotdb.db.query.dataset.groupby;
import java.io.IOException;
import java.util.ArrayList;
@@ -38,7 +38,7 @@ import org.apache.iotdb.tsfile.read.expression.IExpression;
import org.apache.iotdb.tsfile.read.query.timegenerator.TimeGenerator;
import org.apache.iotdb.tsfile.utils.Pair;
-public class GroupByWithValueFilterDataSetDataSet extends GroupByEngineDataSet {
+public class GroupByWithValueFilterDataSet extends GroupByEngineDataSet {
private List<EngineReaderByTimeStamp> allDataReaderList;
private TimeGenerator timestampGenerator;
@@ -59,7 +59,7 @@ public class GroupByWithValueFilterDataSetDataSet extends GroupByEngineDataSet {
/**
* constructor.
*/
- public GroupByWithValueFilterDataSetDataSet(long jobId, List<Path> paths, long unit, long origin,
+ public GroupByWithValueFilterDataSet(long jobId, List<Path> paths, long unit, long origin,
List<Pair<Long, Long>> mergedIntervals) {
super(jobId, paths, unit, origin, mergedIntervals);
this.allDataReaderList = new ArrayList<>();
@@ -85,7 +85,7 @@ public class GroupByWithValueFilterDataSetDataSet extends GroupByEngineDataSet {
public RowRecord next() throws IOException {
if (!hasCachedTimeInterval) {
throw new IOException("need to call hasNext() before calling next()"
- + " in GroupByWithOnlyTimeFilterDataSetDataSet.");
+ + " in GroupByWithOnlyTimeFilterDataSet.");
}
hasCachedTimeInterval = false;
for (AggregateFunction function : functions) {
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 ba76c2f..508a787 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
@@ -28,7 +28,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.metadata.MManager;
-import org.apache.iotdb.db.query.aggregation.AggreFuncFactory;
+import org.apache.iotdb.db.query.factory.AggreFuncFactory;
import org.apache.iotdb.db.query.aggregation.AggreResultData;
import org.apache.iotdb.db.query.aggregation.AggregateFunction;
import org.apache.iotdb.db.query.aggregation.impl.LastAggrFunc;
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 96ad5ad..c18e798 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,8 +27,8 @@ 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.executor.groupby.GroupByWithOnlyTimeFilterDataSetDataSet;
-import org.apache.iotdb.db.query.executor.groupby.GroupByWithValueFilterDataSetDataSet;
+import org.apache.iotdb.db.query.dataset.groupby.GroupByWithOnlyTimeFilterDataSet;
+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;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
@@ -49,8 +49,6 @@ import org.apache.iotdb.tsfile.utils.Pair;
*/
public class EngineQueryRouter {
-
-
/**
* execute physical plan.
*/
@@ -164,12 +162,12 @@ public class EngineQueryRouter {
IExpression optimizedExpression = ExpressionOptimizer.getInstance()
.optimize(expression, selectedSeries);
if (optimizedExpression.getType() == ExpressionType.GLOBAL_TIME) {
- GroupByWithOnlyTimeFilterDataSetDataSet groupByEngine = new GroupByWithOnlyTimeFilterDataSetDataSet(
+ GroupByWithOnlyTimeFilterDataSet groupByEngine = new GroupByWithOnlyTimeFilterDataSet(
nextJobId, selectedSeries, unit, origin, mergedIntervalList);
groupByEngine.initGroupBy(context, aggres, optimizedExpression);
return groupByEngine;
} else {
- GroupByWithValueFilterDataSetDataSet groupByEngine = new GroupByWithValueFilterDataSetDataSet(
+ GroupByWithValueFilterDataSet groupByEngine = new GroupByWithValueFilterDataSet(
nextJobId,
selectedSeries, unit, origin, mergedIntervalList);
groupByEngine.initGroupBy(context, aggres, optimizedExpression);
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/AggreFuncFactory.java b/iotdb/src/main/java/org/apache/iotdb/db/query/factory/AggreFuncFactory.java
similarity index 96%
rename from iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/AggreFuncFactory.java
rename to iotdb/src/main/java/org/apache/iotdb/db/query/factory/AggreFuncFactory.java
index c2d1883..495d853 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/query/aggregation/AggreFuncFactory.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/query/factory/AggreFuncFactory.java
@@ -17,9 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.query.aggregation;
+package org.apache.iotdb.db.query.factory;
import org.apache.iotdb.db.exception.ProcessorException;
+import org.apache.iotdb.db.query.aggregation.AggregateFunction;
import org.apache.iotdb.db.query.aggregation.impl.CountAggrFunc;
import org.apache.iotdb.db.query.aggregation.impl.FirstAggrFunc;
import org.apache.iotdb.db.query.aggregation.impl.LastAggrFunc;
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/query/executor/GroupByEngineDataSetTest.java b/iotdb/src/test/java/org/apache/iotdb/db/query/executor/GroupByEngineDataSetTest.java
index b4f808d..066f05f 100644
--- a/iotdb/src/test/java/org/apache/iotdb/db/query/executor/GroupByEngineDataSetTest.java
+++ b/iotdb/src/test/java/org/apache/iotdb/db/query/executor/GroupByEngineDataSetTest.java
@@ -20,8 +20,8 @@ package org.apache.iotdb.db.query.executor;
import java.util.ArrayList;
import java.util.List;
-import org.apache.iotdb.db.query.executor.groupby.GroupByEngineDataSet;
-import org.apache.iotdb.db.query.executor.groupby.GroupByWithValueFilterDataSetDataSet;
+import org.apache.iotdb.db.query.dataset.groupby.GroupByEngineDataSet;
+import org.apache.iotdb.db.query.dataset.groupby.GroupByWithValueFilterDataSet;
import org.apache.iotdb.tsfile.utils.Pair;
import org.junit.Assert;
import org.junit.Test;
@@ -39,7 +39,7 @@ public class GroupByEngineDataSetTest {
long[] startTimeArray = {805, 810, 830};
long[] endTimeArray = {810, 830, 850};
- GroupByEngineDataSet groupByEngine = new GroupByWithValueFilterDataSetDataSet(jobId, null, unit, startTimePoint, pairList);
+ GroupByEngineDataSet groupByEngine = new GroupByWithValueFilterDataSet(jobId, null, unit, startTimePoint, pairList);
int cnt = 0;
while (groupByEngine.hasNext()){
Pair pair = groupByEngine.nextTimePartition();
@@ -64,7 +64,7 @@ public class GroupByEngineDataSetTest {
long[] startTimeArray = {805, 810, 830, 850, 1200, 1210};
long[] endTimeArray = {810, 830, 850, 870, 1210, 1230};
- GroupByEngineDataSet groupByEngine = new GroupByWithValueFilterDataSetDataSet(jobId, null, unit, startTimePoint, pairList);
+ GroupByEngineDataSet groupByEngine = new GroupByWithValueFilterDataSet(jobId, null, unit, startTimePoint, pairList);
int cnt = 0;
while (groupByEngine.hasNext()){
Pair pair = groupByEngine.nextTimePartition();
@@ -89,7 +89,7 @@ public class GroupByEngineDataSetTest {
long[] startTimeArray = {805, 820, 850, 860, 1200, 1220};
long[] endTimeArray = {820, 840, 860, 880, 1220, 1240};
- GroupByEngineDataSet groupByEngine = new GroupByWithValueFilterDataSetDataSet(jobId, null, unit, startTimePoint, pairList);
+ GroupByEngineDataSet groupByEngine = new GroupByWithValueFilterDataSet(jobId, null, unit, startTimePoint, pairList);
int cnt = 0;
while (groupByEngine.hasNext()){
Pair pair = groupByEngine.nextTimePartition();
@@ -114,7 +114,7 @@ public class GroupByEngineDataSetTest {
long[] startTimeArray = {805, 1200};
long[] endTimeArray = {900, 1300};
- GroupByEngineDataSet groupByEngine = new GroupByWithValueFilterDataSetDataSet(jobId, null, unit, startTimePoint, pairList);
+ GroupByEngineDataSet groupByEngine = new GroupByWithValueFilterDataSet(jobId, null, unit, startTimePoint, pairList);
int cnt = 0;
while (groupByEngine.hasNext()){
Pair pair = groupByEngine.nextTimePartition();
@@ -139,7 +139,7 @@ public class GroupByEngineDataSetTest {
long[] startTimeArray = {50, 585, 590};
long[] endTimeArray = {110, 590, 670};
- GroupByEngineDataSet groupByEngine = new GroupByWithValueFilterDataSetDataSet(jobId, null, unit, startTimePoint, pairList);
+ GroupByEngineDataSet groupByEngine = new GroupByWithValueFilterDataSet(jobId, null, unit, startTimePoint, pairList);
int cnt = 0;
while (groupByEngine.hasNext()){
Pair pair = groupByEngine.nextTimePartition();