This is an automated email from the ASF dual-hosted git repository. caogaofei pushed a commit to branch beyyes/multi_devices_fe in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 08e64e57f044f82cb79dd2aac2f9ed3ab61c0c94 Author: Beyyes <[email protected]> AuthorDate: Wed Nov 8 10:07:58 2023 +0800 fix compile error with master --- .../plan/analyze/TemplatedDeviceAnalyze.java | 2 +- .../plan/planner/TemplatedLogicalPlan.java | 20 -------------------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedDeviceAnalyze.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedDeviceAnalyze.java index dbad1de404a..6cef714dc6d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedDeviceAnalyze.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedDeviceAnalyze.java @@ -38,7 +38,7 @@ import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.queryengine.plan.statement.crud.QueryStatement; import org.apache.iotdb.db.schemaengine.template.ClusterTemplateManager; import org.apache.iotdb.db.schemaengine.template.Template; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; +import org.apache.iotdb.tsfile.enums.TSDataType; import org.apache.iotdb.tsfile.read.filter.basic.Filter; import org.apache.iotdb.tsfile.utils.Pair; import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/TemplatedLogicalPlan.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/TemplatedLogicalPlan.java index 08d80a6c264..d87afc7e1f1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/TemplatedLogicalPlan.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/TemplatedLogicalPlan.java @@ -20,7 +20,6 @@ package org.apache.iotdb.db.queryengine.plan.planner; import org.apache.iotdb.commons.path.AlignedPath; import org.apache.iotdb.commons.path.PartialPath; -import org.apache.iotdb.commons.udf.builtin.ModelInferenceFunction; import org.apache.iotdb.db.queryengine.common.MPPQueryContext; import org.apache.iotdb.db.queryengine.plan.analyze.Analysis; import org.apache.iotdb.db.queryengine.plan.expression.Expression; @@ -28,8 +27,6 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.TimeJoinNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.TopKNode; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.AlignedSeriesScanNode; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.model.ForecastModelInferenceDescriptor; -import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.model.ModelInferenceDescriptor; import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering; import org.apache.iotdb.db.queryengine.plan.statement.crud.QueryStatement; import org.apache.iotdb.tsfile.read.filter.basic.Filter; @@ -40,7 +37,6 @@ import java.util.Collection; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.Set; import static org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant.DEVICE; @@ -137,22 +133,6 @@ public class TemplatedLogicalPlan { .planOffset(queryStatement.getRowOffset()) .planLimit(queryStatement.getRowLimit()); - if (queryStatement.isModelInferenceQuery()) { - ModelInferenceDescriptor modelInferenceDescriptor = analysis.getModelInferenceDescriptor(); - if (Objects.requireNonNull(modelInferenceDescriptor.getFunctionType()) - == ModelInferenceFunction.FORECAST) { - ForecastModelInferenceDescriptor forecastModelInferenceDescriptor = - (ForecastModelInferenceDescriptor) modelInferenceDescriptor; - planBuilder - .planLimit(forecastModelInferenceDescriptor.getModelInputLength()) - .planForecast(forecastModelInferenceDescriptor); - } else { - throw new IllegalArgumentException( - "Unsupported model inference function type: " - + modelInferenceDescriptor.getFunctionType()); - } - } - // plan select into if (queryStatement.isAlignByDevice()) { planBuilder = planBuilder.planDeviceViewInto(analysis.getDeviceViewIntoPathDescriptor());
