You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ro...@apache.org on 2021/08/31 07:13:11 UTC
[iotdb] 02/04: refactor constructors of UDTF dataset classes
This is an automated email from the ASF dual-hosted git repository.
rong pushed a commit to branch nested-operations
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 40013f4d9a5c48586b6e21c6887dedda472a0665
Author: Steve Yurong Su <ro...@apache.org>
AuthorDate: Mon Jun 7 15:28:33 2021 +0800
refactor constructors of UDTF dataset classes
---
.../db/query/dataset/UDTFAlignByTimeDataSet.java | 20 +++++++--------
.../db/query/dataset/UDTFNonAlignDataSet.java | 20 +++++++--------
.../iotdb/db/query/executor/UDTFQueryExecutor.java | 30 +++-------------------
3 files changed, 22 insertions(+), 48 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/query/dataset/UDTFAlignByTimeDataSet.java b/server/src/main/java/org/apache/iotdb/db/query/dataset/UDTFAlignByTimeDataSet.java
index 640612a..41ea61a 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/dataset/UDTFAlignByTimeDataSet.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/dataset/UDTFAlignByTimeDataSet.java
@@ -20,7 +20,6 @@
package org.apache.iotdb.db.query.dataset;
import org.apache.iotdb.db.exception.query.QueryProcessException;
-import org.apache.iotdb.db.metadata.PartialPath;
import org.apache.iotdb.db.qp.physical.crud.UDTFPlan;
import org.apache.iotdb.db.query.context.QueryContext;
import org.apache.iotdb.db.query.reader.series.IReaderByTimestamp;
@@ -50,8 +49,6 @@ public class UDTFAlignByTimeDataSet extends UDTFDataSet implements DirectAlignBy
public UDTFAlignByTimeDataSet(
QueryContext context,
UDTFPlan udtfPlan,
- List<PartialPath> deduplicatedPaths,
- List<TSDataType> deduplicatedDataTypes,
TimeGenerator timestampGenerator,
List<IReaderByTimestamp> readersOfSelectedSeries,
List<Boolean> cached)
@@ -59,8 +56,8 @@ public class UDTFAlignByTimeDataSet extends UDTFDataSet implements DirectAlignBy
super(
context,
udtfPlan,
- deduplicatedPaths,
- deduplicatedDataTypes,
+ udtfPlan.getDeduplicatedPaths(),
+ udtfPlan.getDeduplicatedDataTypes(),
timestampGenerator,
readersOfSelectedSeries,
cached);
@@ -69,13 +66,14 @@ public class UDTFAlignByTimeDataSet extends UDTFDataSet implements DirectAlignBy
/** execute without value filter */
public UDTFAlignByTimeDataSet(
- QueryContext context,
- UDTFPlan udtfPlan,
- List<PartialPath> deduplicatedPaths,
- List<TSDataType> deduplicatedDataTypes,
- List<ManagedSeriesReader> readersOfSelectedSeries)
+ QueryContext context, UDTFPlan udtfPlan, List<ManagedSeriesReader> readersOfSelectedSeries)
throws QueryProcessException, IOException, InterruptedException {
- super(context, udtfPlan, deduplicatedPaths, deduplicatedDataTypes, readersOfSelectedSeries);
+ super(
+ context,
+ udtfPlan,
+ udtfPlan.getDeduplicatedPaths(),
+ udtfPlan.getDeduplicatedDataTypes(),
+ readersOfSelectedSeries);
initTimeHeap();
}
diff --git a/server/src/main/java/org/apache/iotdb/db/query/dataset/UDTFNonAlignDataSet.java b/server/src/main/java/org/apache/iotdb/db/query/dataset/UDTFNonAlignDataSet.java
index db91446..7f90cae 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/dataset/UDTFNonAlignDataSet.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/dataset/UDTFNonAlignDataSet.java
@@ -20,7 +20,6 @@
package org.apache.iotdb.db.query.dataset;
import org.apache.iotdb.db.exception.query.QueryProcessException;
-import org.apache.iotdb.db.metadata.PartialPath;
import org.apache.iotdb.db.qp.physical.crud.UDTFPlan;
import org.apache.iotdb.db.query.context.QueryContext;
import org.apache.iotdb.db.query.reader.series.IReaderByTimestamp;
@@ -55,8 +54,6 @@ public class UDTFNonAlignDataSet extends UDTFDataSet implements DirectNonAlignDa
public UDTFNonAlignDataSet(
QueryContext context,
UDTFPlan udtfPlan,
- List<PartialPath> deduplicatedPaths,
- List<TSDataType> deduplicatedDataTypes,
TimeGenerator timestampGenerator,
List<IReaderByTimestamp> readersOfSelectedSeries,
List<Boolean> cached)
@@ -64,8 +61,8 @@ public class UDTFNonAlignDataSet extends UDTFDataSet implements DirectNonAlignDa
super(
context,
udtfPlan,
- deduplicatedPaths,
- deduplicatedDataTypes,
+ udtfPlan.getDeduplicatedPaths(),
+ udtfPlan.getDeduplicatedDataTypes(),
timestampGenerator,
readersOfSelectedSeries,
cached);
@@ -74,13 +71,14 @@ public class UDTFNonAlignDataSet extends UDTFDataSet implements DirectNonAlignDa
/** execute without value filter */
public UDTFNonAlignDataSet(
- QueryContext context,
- UDTFPlan udtfPlan,
- List<PartialPath> deduplicatedPaths,
- List<TSDataType> deduplicatedDataTypes,
- List<ManagedSeriesReader> readersOfSelectedSeries)
+ QueryContext context, UDTFPlan udtfPlan, List<ManagedSeriesReader> readersOfSelectedSeries)
throws QueryProcessException, IOException, InterruptedException {
- super(context, udtfPlan, deduplicatedPaths, deduplicatedDataTypes, readersOfSelectedSeries);
+ super(
+ context,
+ udtfPlan,
+ udtfPlan.getDeduplicatedPaths(),
+ udtfPlan.getDeduplicatedDataTypes(),
+ readersOfSelectedSeries);
isInitialized = false;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/query/executor/UDTFQueryExecutor.java b/server/src/main/java/org/apache/iotdb/db/query/executor/UDTFQueryExecutor.java
index b0ce81a..934ec2d 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/executor/UDTFQueryExecutor.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/executor/UDTFQueryExecutor.java
@@ -48,12 +48,7 @@ public class UDTFQueryExecutor extends RawDataQueryExecutor {
public QueryDataSet executeWithoutValueFilterAlignByTime(QueryContext context)
throws StorageEngineException, QueryProcessException, IOException, InterruptedException {
List<ManagedSeriesReader> readersOfSelectedSeries = initManagedSeriesReader(context);
- return new UDTFAlignByTimeDataSet(
- context,
- udtfPlan,
- udtfPlan.getDeduplicatedPaths(),
- udtfPlan.getDeduplicatedDataTypes(),
- readersOfSelectedSeries);
+ return new UDTFAlignByTimeDataSet(context, udtfPlan, readersOfSelectedSeries);
}
public QueryDataSet executeWithValueFilterAlignByTime(QueryContext context)
@@ -67,24 +62,13 @@ public class UDTFQueryExecutor extends RawDataQueryExecutor {
List<IReaderByTimestamp> readersOfSelectedSeries =
initSeriesReaderByTimestamp(context, udtfPlan, cached);
return new UDTFAlignByTimeDataSet(
- context,
- udtfPlan,
- udtfPlan.getDeduplicatedPaths(),
- udtfPlan.getDeduplicatedDataTypes(),
- timestampGenerator,
- readersOfSelectedSeries,
- cached);
+ context, udtfPlan, timestampGenerator, readersOfSelectedSeries, cached);
}
public QueryDataSet executeWithoutValueFilterNonAlign(QueryContext context)
throws QueryProcessException, StorageEngineException, IOException, InterruptedException {
List<ManagedSeriesReader> readersOfSelectedSeries = initManagedSeriesReader(context);
- return new UDTFNonAlignDataSet(
- context,
- udtfPlan,
- udtfPlan.getDeduplicatedPaths(),
- udtfPlan.getDeduplicatedDataTypes(),
- readersOfSelectedSeries);
+ return new UDTFNonAlignDataSet(context, udtfPlan, readersOfSelectedSeries);
}
public QueryDataSet executeWithValueFilterNonAlign(QueryContext context)
@@ -98,12 +82,6 @@ public class UDTFQueryExecutor extends RawDataQueryExecutor {
List<IReaderByTimestamp> readersOfSelectedSeries =
initSeriesReaderByTimestamp(context, udtfPlan, cached);
return new UDTFNonAlignDataSet(
- context,
- udtfPlan,
- udtfPlan.getDeduplicatedPaths(),
- udtfPlan.getDeduplicatedDataTypes(),
- timestampGenerator,
- readersOfSelectedSeries,
- cached);
+ context, udtfPlan, timestampGenerator, readersOfSelectedSeries, cached);
}
}