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 db442064affb5e833e9c0330c8dba8c13f83ed21 Author: Steve Yurong Su <[email protected]> AuthorDate: Thu Sep 9 09:42:44 2021 +0800 fix build --- .../cluster/query/ClusterUDTFQueryExecutor.java | 31 ++++------------------ .../iotdb/db/query/udf/builtin/UDTFSelectK.java | 2 +- .../iotdb/db/query/udf/builtin/UDTFValueTrend.java | 3 ++- .../apache/iotdb/db/query/udf/example/Adder.java | 4 ++- .../org/apache/iotdb/db/query/udf/example/Max.java | 2 +- 5 files changed, 12 insertions(+), 30 deletions(-) diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/ClusterUDTFQueryExecutor.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/ClusterUDTFQueryExecutor.java index 764437e..6a0aca8 100644 --- a/cluster/src/main/java/org/apache/iotdb/cluster/query/ClusterUDTFQueryExecutor.java +++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/ClusterUDTFQueryExecutor.java @@ -38,6 +38,7 @@ import java.util.List; import static org.apache.iotdb.tsfile.read.query.executor.ExecutorWithTimeGenerator.markFilterdPaths; public class ClusterUDTFQueryExecutor extends ClusterDataQueryExecutor { + protected final UDTFPlan udtfPlan; protected final MetaGroupMember metaGroupMember; @@ -50,12 +51,7 @@ public class ClusterUDTFQueryExecutor extends ClusterDataQueryExecutor { 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) @@ -69,24 +65,13 @@ public class ClusterUDTFQueryExecutor extends ClusterDataQueryExecutor { 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) @@ -100,12 +85,6 @@ public class ClusterUDTFQueryExecutor extends ClusterDataQueryExecutor { List<IReaderByTimestamp> readersOfSelectedSeries = initSeriesReaderByTimestamp(context, udtfPlan, cached); return new UDTFNonAlignDataSet( - context, - udtfPlan, - udtfPlan.getDeduplicatedPaths(), - udtfPlan.getDeduplicatedDataTypes(), - timestampGenerator, - readersOfSelectedSeries, - cached); + context, udtfPlan, timestampGenerator, readersOfSelectedSeries, cached); } } diff --git a/server/src/main/java/org/apache/iotdb/db/query/udf/builtin/UDTFSelectK.java b/server/src/main/java/org/apache/iotdb/db/query/udf/builtin/UDTFSelectK.java index 640740a..b97f227 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/udf/builtin/UDTFSelectK.java +++ b/server/src/main/java/org/apache/iotdb/db/query/udf/builtin/UDTFSelectK.java @@ -79,7 +79,7 @@ public abstract class UDTFSelectK implements UDTF { @Override public void transform(Row row, PointCollector collector) - throws UDFInputSeriesDataTypeNotValidException { + throws UDFInputSeriesDataTypeNotValidException, IOException { switch (dataType) { case INT32: transformInt(row.getTime(), row.getInt(0)); diff --git a/server/src/main/java/org/apache/iotdb/db/query/udf/builtin/UDTFValueTrend.java b/server/src/main/java/org/apache/iotdb/db/query/udf/builtin/UDTFValueTrend.java index eb32e37..8862ef1 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/udf/builtin/UDTFValueTrend.java +++ b/server/src/main/java/org/apache/iotdb/db/query/udf/builtin/UDTFValueTrend.java @@ -48,7 +48,8 @@ public abstract class UDTFValueTrend implements UDTF { 0, TSDataType.INT32, TSDataType.INT64, TSDataType.FLOAT, TSDataType.DOUBLE); } - protected void updatePreviousValue(Row row) throws UDFInputSeriesDataTypeNotValidException { + protected void updatePreviousValue(Row row) + throws UDFInputSeriesDataTypeNotValidException, IOException { switch (dataType) { case INT32: previousInt = row.getInt(0); diff --git a/server/src/test/java/org/apache/iotdb/db/query/udf/example/Adder.java b/server/src/test/java/org/apache/iotdb/db/query/udf/example/Adder.java index da7bc40..2b1fc1f 100644 --- a/server/src/test/java/org/apache/iotdb/db/query/udf/example/Adder.java +++ b/server/src/test/java/org/apache/iotdb/db/query/udf/example/Adder.java @@ -32,6 +32,8 @@ import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; + public class Adder implements UDTF { private static final Logger logger = LoggerFactory.getLogger(Adder.class); @@ -66,7 +68,7 @@ public class Adder implements UDTF { row.getTime(), (long) (extractDoubleValue(row, 0) + extractDoubleValue(row, 1) + addend)); } - private double extractDoubleValue(Row row, int index) { + private double extractDoubleValue(Row row, int index) throws IOException { double value; switch (row.getDataType(index)) { case INT32: diff --git a/server/src/test/java/org/apache/iotdb/db/query/udf/example/Max.java b/server/src/test/java/org/apache/iotdb/db/query/udf/example/Max.java index 3d3796b..ef4aa50 100644 --- a/server/src/test/java/org/apache/iotdb/db/query/udf/example/Max.java +++ b/server/src/test/java/org/apache/iotdb/db/query/udf/example/Max.java @@ -54,7 +54,7 @@ public class Max implements UDTF { } @Override - public void transform(Row row, PointCollector collector) { + public void transform(Row row, PointCollector collector) throws IOException { int candidateValue = row.getInt(0); if (time == null || value < candidateValue) { time = row.getTime();
