This is an automated email from the ASF dual-hosted git repository. caogaofei pushed a commit to branch beyyes/rel-1.2 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit e45655035684379f51ac5a845cfd102ee0832275 Author: Beyyes <[email protected]> AuthorDate: Tue Sep 26 23:38:54 2023 +0800 fix conflict --- .../org/apache/iotdb/db/queryengine/plan/analyze/Analysis.java | 8 -------- .../iotdb/db/queryengine/plan/planner/plan/node/PlanNodeType.java | 5 ----- 2 files changed, 13 deletions(-) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/Analysis.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/Analysis.java index 341b4cd8b61..38bf86087da 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/Analysis.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/Analysis.java @@ -758,14 +758,6 @@ public class Analysis { this.lastQueryNonWritableViewSourceExpressionMap = lastQueryNonWritableViewSourceExpressionMap; } - public ModelInferenceDescriptor getModelInferenceDescriptor() { - return modelInferenceDescriptor; - } - - public void setModelInferenceDescriptor(ModelInferenceDescriptor modelInferenceDescriptor) { - this.modelInferenceDescriptor = modelInferenceDescriptor; - } - public Map<String, List<String>> getOutputDeviceToQueriedDevicesMap() { return outputDeviceToQueriedDevicesMap; } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanNodeType.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanNodeType.java index 5c2a9b56605..98be8a79971 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanNodeType.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanNodeType.java @@ -387,13 +387,8 @@ public enum PlanNodeType { return AlterLogicalViewNode.deserialize(buffer); case 79: return PipeEnrichedInsertNode.deserialize(buffer); -<<<<<<< HEAD -======= - case 80: - return ForecastNode.deserialize(buffer); case 81: return LastQueryTransformNode.deserialize(buffer); ->>>>>>> 5f5a1d4fb7 (Enhance last query, support non single base series (#11120)) default: throw new IllegalArgumentException("Invalid node type: " + nodeType); }
