resolve conflicts

Author: JackieTien97

RELEASE_NOTES.md

@@ -19,6 +19,28 @@
 
 -->
 
+# Apache IoTDB 2.0.4
+
+## Features & Improvements
+- Data Query: Added user-defined table functions (UDTF) and various built-in table functions to the table model.
+- Data Query: Added support for ASOF INNER JOIN on time columns in the table model.
+- Data Query: Added the approximate aggregation function approx_count_distinct to the table model.
+- Stream Processing: Added support for asynchronous loading of TsFile through SQL.
+- System Management: Added support for disaster recovery load balancing strategy in replica selection during scaling down.
+- System Management: Adapted to Windows Server 2025.
+- Scripts and Tools: Categorized and organized script tools, and separated Windows-specific scripts.
+- ...
+
+## Bugs
+- Fixed the memory leak issue in the WAL compression buffer.
+- Fixed the issue where the async connector gets stuck after running for a long time.
+- Fixed the issue where data subscription cannot be terminated after using data export scripts.
+- Fixed the issue where pipe restarts frequently due to insertnode and resource management memory problems under memory pressure.
+- Fixed the NPE issue triggered during memory statistics estimation on the data synchronization receiver end.
+- Fixed the error when configuring ConsumerConstant.NODE_URLS_KEY as a cluster address while using SubscriptionPullConsumer to consume data.
+- Fixed the deadlock issue on DN startup caused by concurrent agent pipe metadata fetching and CN metadata pushing.
+- ...
+
 # Apache IoTDB 2.0.3
 
 ## Features & Improvements

integration-test/src/test/java/org/apache/iotdb/confignode/it/IoTDBConfigNodeSnapshot2IT.java

@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.iotdb.confignode.it;
+
+import org.apache.iotdb.consensus.ConsensusFactory;
+import org.apache.iotdb.it.env.EnvFactory;
+import org.apache.iotdb.it.framework.IoTDBTestRunner;
+import org.apache.iotdb.itbase.category.ClusterIT;
+
+import org.junit.Before;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+
+@RunWith(IoTDBTestRunner.class)
+@Category({ClusterIT.class})
+public class IoTDBConfigNodeSnapshot2IT extends IoTDBConfigNodeSnapshotIT {
+  @Before
+  public void setUp() throws Exception {
+    // set setConfigNodeRatisSnapshotTriggerThreshold to 1
+    EnvFactory.getEnv()
+        .getConfig()
+        .getCommonConfig()
+        .setConfigNodeConsensusProtocolClass(ConsensusFactory.RATIS_CONSENSUS)
+        .setConfigNodeRatisSnapshotTriggerThreshold(1)
+        .setTimePartitionInterval(testTimePartitionInterval);
+
+    // Init 2C2D cluster environment
+    EnvFactory.getEnv().initClusterEnvironment(2, 2);
+  }
+}

integration-test/src/test/java/org/apache/iotdb/confignode/it/IoTDBConfigNodeSnapshotIT.java

@@ -83,16 +83,15 @@
 @RunWith(IoTDBTestRunner.class)
 @Category({ClusterIT.class})
 public class IoTDBConfigNodeSnapshotIT {
-  private static final int testRatisSnapshotTriggerThreshold = 100;
-  private static final long testTimePartitionInterval = 86400;
+  protected final long testTimePartitionInterval = 86400;
 
   @Before
   public void setUp() throws Exception {
     EnvFactory.getEnv()
         .getConfig()
         .getCommonConfig()
         .setConfigNodeConsensusProtocolClass(ConsensusFactory.RATIS_CONSENSUS)
-        .setConfigNodeRatisSnapshotTriggerThreshold(testRatisSnapshotTriggerThreshold)
+        .setConfigNodeRatisSnapshotTriggerThreshold(100)
         .setTimePartitionInterval(testTimePartitionInterval);
 
     // Init 2C2D cluster environment

integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBMultiTAGsWithAttributesTableIT.java

@@ -390,12 +390,12 @@ public void sortTAGWithExpressionTest() {
           "l3,217,null,d2,1971-01-01T00:00:00.500Z,",
           "l3,245,t,d1,1971-04-26T17:46:40.020Z,",
           "l3,245,null,d2,1971-04-26T17:46:40.020Z,",
-          "l4,52,null,d2,1970-01-01T00:00:00.080Z,",
           "l4,52,null,d1,1970-01-01T00:00:00.080Z,",
-          "l4,61,null,d2,1971-01-01T00:00:01.000Z,",
+          "l4,52,null,d2,1970-01-01T00:00:00.080Z,",
           "l4,61,null,d1,1971-01-01T00:00:01.000Z,",
-          "l4,67,null,d2,1971-04-26T18:01:40.000Z,",
+          "l4,61,null,d2,1971-01-01T00:00:01.000Z,",
           "l4,67,null,d1,1971-04-26T18:01:40.000Z,",
+          "l4,67,null,d2,1971-04-26T18:01:40.000Z,",
           "l5,220,null,d1,1971-01-01T00:00:10.000Z,",
           "l5,220,null,d2,1971-01-01T00:00:10.000Z,",
           "l5,250,null,d1,1971-08-20T11:33:20.000Z,",
@@ -404,7 +404,7 @@ public void sortTAGWithExpressionTest() {
           "l5,4662,null,d2,1970-01-01T00:00:00.100Z,",
         };
     tableResultSetEqualTest(
-        "select level,cast(num+floatNum as int32) as sum,attr1,device,time from table0 order by level asc, cast(num+floatNum as int32) asc, attr1 desc",
+        "select level,cast(num+floatNum as int32) as sum,attr1,device,time from table0 order by level asc, cast(num+floatNum as int32) asc, attr1 desc, device asc",
         expectedHeader,
         retArray,
         DATABASE_NAME);

integration-test/src/test/java/org/apache/iotdb/relational/it/query/view/recent/IoTDBNullValueTableViewIT.java

@@ -47,14 +47,18 @@ public class IoTDBNullValueTableViewIT {
         "insert into root.test.table1.d1(time,s1) values(0, null), (1, 1)",
         "flush",
         "insert into root.test.table1.d1(time,s1) values(0, 0)",
-        "flush"
+        "flush",
+        "create aligned timeseries root.test.table2.d1(s1 string)",
+        "insert into root.test.table2.d1(time,s1) aligned values(0, 0)",
+        "insert into root.test.table2.d1(time,s1) aligned values(1, 1)",
       };
 
   private static final String[] createTableViewSqls =
       new String[] {
         "CREATE DATABASE " + DATABASE_NAME,
         "USE " + DATABASE_NAME,
         "create view table1(id1 tag, s1 string) as root.test.table1.**",
+        "create view table2(id1 tag, s1 float) as root.test.table2.**",
       };
 
   @BeforeClass
@@ -80,5 +84,13 @@ public void nullTest() {
           "1970-01-01T00:00:00.000Z,d1,0,", "1970-01-01T00:00:00.001Z,d1,1,",
         };
     tableResultSetEqualTest("select * from table1", expectedHeader, retArray, DATABASE_NAME);
+    // case 2: For aligned series, when the data types of all series in the view are inconsistent
+    // with the data types of the actual series, the corresponding time can be queried, and other
+    // columns are null values.
+    retArray =
+        new String[] {
+          "1970-01-01T00:00:00.000Z,d1,null,", "1970-01-01T00:00:00.001Z,d1,null,",
+        };
+    tableResultSetEqualTest("select * from table2", expectedHeader, retArray, DATABASE_NAME);
   }
 }

iotdb-core/ainode/ainode/core/config.py

@@ -38,6 +38,7 @@
     AINODE_ROOT_DIR,
     AINODE_SYSTEM_DIR,
     AINODE_SYSTEM_FILE_NAME,
+    AINODE_TARGET_CONFIG_NODE_LIST,
     AINODE_THRIFT_COMPRESSION_ENABLED,
     AINODE_VERSION_INFO,
 )
@@ -73,7 +74,7 @@ def __init__(self):
         self._ain_model_storage_cache_size = 30
 
         # Target ConfigNode to be connected by AINode
-        self._ain_target_config_node_list: TEndPoint = TEndPoint("127.0.0.1", 10710)
+        self._ain_target_config_node_list: TEndPoint = AINODE_TARGET_CONFIG_NODE_LIST
 
         # use for node management
         self._ainode_id = 0

iotdb-core/ainode/ainode/core/constant.py

@@ -21,6 +21,8 @@
 from enum import Enum
 from typing import List
 
+from ainode.thrift.common.ttypes import TEndPoint
+
 AINODE_CONF_DIRECTORY_NAME = "conf"
 AINODE_ROOT_CONF_DIRECTORY_NAME = "conf"
 AINODE_CONF_FILE_NAME = "iotdb-ainode.properties"
@@ -49,6 +51,7 @@
 AINODE_CLUSTER_INGRESS_USERNAME = "root"
 AINODE_CLUSTER_INGRESS_PASSWORD = "root"
 AINODE_CLUSTER_INGRESS_TIME_ZONE = "UTC+8"
+AINODE_TARGET_CONFIG_NODE_LIST = TEndPoint("127.0.0.1", 10710)
 
 # AINode log
 AINODE_LOG_FILE_NAMES = [

iotdb-core/ainode/ainode/core/exception.py

@@ -96,6 +96,11 @@ def __init__(self, msg: str):
         self.message = "Built-in model not support: {0}".format(msg)
 
 
+class BuiltInModelDeletionError(_BaseError):
+    def __init__(self, model_id: str):
+        self.message = "Cannot delete built-in model: {0}".format(model_id)
+
+
 class WrongAttributeTypeError(_BaseError):
     def __init__(self, attribute_name: str, expected_type: str):
         self.message = "Wrong type for attribute: {0}, expected: {1}".format(

iotdb-core/ainode/ainode/core/handler.py

@@ -30,6 +30,7 @@
     TInferenceResp,
     TRegisterModelReq,
     TRegisterModelResp,
+    TShowModelsReq,
     TShowModelsResp,
     TTrainingReq,
 )
@@ -58,8 +59,8 @@ def forecast(self, req: TForecastReq) -> TSStatus:
     def getAIHeartbeat(self, req: TAIHeartbeatReq) -> TAIHeartbeatResp:
         return ClusterManager.get_heart_beat(req)
 
-    def showModels(self) -> TShowModelsResp:
-        return self._model_manager.show_models()
+    def showModels(self, req: TShowModelsReq) -> TShowModelsResp:
+        return self._model_manager.show_models(req)
 
     def createTrainingTask(self, req: TTrainingReq) -> TSStatus:
         pass

iotdb-core/ainode/ainode/core/manager/inference_manager.py

@@ -84,15 +84,15 @@ def infer(self, full_data, predict_length=96, **_):
 
 
 class BuiltInStrategy(InferenceStrategy):
-    def infer(self, full_data):
+    def infer(self, full_data, **_):
         data = pd.DataFrame(full_data[1]).T
         output = self.model.inference(data)
         df = pd.DataFrame(output)
         return convert_to_binary(df)
 
 
 class RegisteredStrategy(InferenceStrategy):
-    def infer(self, full_data, window_interval=None, window_step=None, **kwargs):
+    def infer(self, full_data, window_interval=None, window_step=None, **_):
         _, dataset, _, length = full_data
         if window_interval is None or window_step is None:
             window_interval = length
@@ -130,7 +130,7 @@ def _get_strategy(self, model_id, model):
             return TimerXLStrategy(model)
         if isinstance(model, SundialForPrediction):
             return SundialStrategy(model)
-        if self.model_manager.model_storage._is_built_in(model_id):
+        if self.model_manager.model_storage._is_built_in_or_fine_tuned(model_id):
             return BuiltInStrategy(model)
         return RegisteredStrategy(model)
 
@@ -159,7 +159,7 @@ def _run(
 
             # inference by strategy
             strategy = self._get_strategy(model_id, model)
-            outputs = strategy.infer(full_data)
+            outputs = strategy.infer(full_data, **inference_attrs)
 
             # construct response
             status = get_status(TSStatusCode.SUCCESS_STATUS)