fix IT

Author: Liu Zhengyun

integration-test/src/test/java/org/apache/iotdb/ainode/it/AINodeConcurrentForecastIT.java

@@ -49,7 +49,7 @@ public class AINodeConcurrentForecastIT {
   private static final Logger LOGGER = LoggerFactory.getLogger(AINodeConcurrentForecastIT.class);
 
   private static final String FORECAST_TABLE_FUNCTION_SQL_TEMPLATE =
-      "SELECT * FROM FORECAST(model_id=>'%s', input=>(SELECT time,s FROM root.AI) ORDER BY time, output_length=>%d)";
+      "SELECT * FROM FORECAST(model_id=>'%s', targets=>(SELECT time,s FROM root.AI) ORDER BY time, output_length=>%d)";
 
   @BeforeClass
   public static void setUp() throws Exception {

integration-test/src/test/java/org/apache/iotdb/ainode/it/AINodeForecastIT.java

@@ -47,10 +47,10 @@ public class AINodeForecastIT {
   private static final String FORECAST_TABLE_FUNCTION_SQL_TEMPLATE =
       "SELECT * FROM FORECAST("
           + "model_id=>'%s', "
-          + "targets=>(SELECT time, s%d FROM db.AI), "
+          + "targets=>(SELECT time, s%d FROM db.AI WHERE time<%d ORDER BY time DESC LIMIT %d) ORDER BY time, "
           + "output_start_time=>%d, "
           + "output_length=>%d, "
-          + "output_interval=>'%s', "
+          + "output_interval=>%d, "
           + "timecol=>'%s'"
           + ")";
 
@@ -63,7 +63,7 @@ public static void setUp() throws Exception {
       statement.execute("CREATE DATABASE db");
       statement.execute(
           "CREATE TABLE db.AI (s0 FLOAT FIELD, s1 DOUBLE FIELD, s2 INT32 FIELD, s3 INT64 FIELD)");
-      for (int i = 0; i < 2880; i++) {
+      for (int i = 0; i < 5760; i++) {
         statement.execute(
             String.format(
                 "INSERT INTO db.AI(time,s0,s1,s2,s3) VALUES(%d,%f,%f,%d,%d)",
@@ -96,9 +96,11 @@ public void forecastTableFunctionTest(
               FORECAST_TABLE_FUNCTION_SQL_TEMPLATE,
               modelInfo.getModelId(),
               i,
+              5760,
               2880,
+              5760,
               96,
-              "1s",
+              1,
               "time");
       try (ResultSet resultSet = statement.executeQuery(forecastTableFunctionSQL)) {
         int count = 0;
@@ -129,52 +131,58 @@ public void forecastTableFunctionErrorTest(
             FORECAST_TABLE_FUNCTION_SQL_TEMPLATE,
             modelInfo.getModelId(),
             0,
-            2879,
+            5760,
+            2880,
+            5759,
             96,
-            "1s",
+            1,
             "time");
     errorTest(
         statement,
         invalidOutputStartTimeSQL,
-        "The OUTPUT_START_TIME should be greater than the maximum timestamp of target time series. Expected greater than [2879] but found [2879].");
+        "701: The OUTPUT_START_TIME should be greater than the maximum timestamp of target time series. Expected greater than [5759] but found [5759].");
 
     // OUTPUT_LENGTH error
     String invalidOutputLengthSQL =
         String.format(
-            FORECAST_TABLE_FUNCTION_SQL_TEMPLATE, modelInfo.getModelId(), 0, 2880, 0, "1s", "time");
-    errorTest(statement, invalidOutputLengthSQL, "OUTPUT_LENGTH should be greater than 0");
+            FORECAST_TABLE_FUNCTION_SQL_TEMPLATE,
+            modelInfo.getModelId(),
+            0,
+            5760,
+            2880,
+            5760,
+            0,
+            1,
+            "time");
+    errorTest(statement, invalidOutputLengthSQL, "701: OUTPUT_LENGTH should be greater than 0");
 
     // OUTPUT_INTERVAL error
     String invalidOutputIntervalSQL =
         String.format(
             FORECAST_TABLE_FUNCTION_SQL_TEMPLATE,
             modelInfo.getModelId(),
             0,
+            5760,
             2880,
+            5760,
             96,
-            "0s",
+            -1,
             "time");
-    errorTest(statement, invalidOutputIntervalSQL, "OUTPUT_INTERVAL should be greater than 0");
+    errorTest(statement, invalidOutputIntervalSQL, "701: OUTPUT_INTERVAL should be greater than 0");
 
-    // TIMECOL error-1
-    String invalidTimecolSQL1 =
+    // TIMECOL error
+    String invalidTimecolSQL2 =
         String.format(
             FORECAST_TABLE_FUNCTION_SQL_TEMPLATE,
             modelInfo.getModelId(),
             0,
+            5760,
             2880,
+            5760,
             96,
-            "1s",
-            "nonexistent_column");
+            1,
+            "s0");
     errorTest(
-        statement,
-        invalidTimecolSQL1,
-        "Required column [nonexistent_column] not found in the source table argument.");
-
-    // TIMECOL error-2
-    String invalidTimecolSQL2 =
-        String.format(
-            FORECAST_TABLE_FUNCTION_SQL_TEMPLATE, modelInfo.getModelId(), 0, 2880, 96, "1s", "s0");
-    errorTest(statement, invalidTimecolSQL2, "The type of the column s0 is not as expected.");
+        statement, invalidTimecolSQL2, "701: The type of the column [s0] is not as expected.");
   }
 }

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/function/tvf/ForecastTableFunction.java

@@ -58,6 +58,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
@@ -275,7 +276,7 @@ public TableFunctionAnalysis analyze(Map<String, Argument> arguments) {
     }
 
     long outputInterval = (long) ((ScalarArgument) arguments.get(OUTPUT_INTERVAL)).getValue();
-    if (outputInterval <= 0) {
+    if (outputInterval < 0) {
       throw new SemanticException(String.format("%s should be greater than 0", OUTPUT_INTERVAL));
     }
 
@@ -470,6 +471,9 @@ public void finish(
 
       int columnSize = properColumnBuilders.size();
 
+      // sort inputRecords in ascending order by timestamp
+      inputRecords.sort(Comparator.comparingLong(record -> record.getLong(0)));
+
       // time column
       long inputStartTime = inputRecords.getFirst().getLong(0);
       long inputEndTime = inputRecords.getLast().getLong(0);

iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TableFunctionTest.java

@@ -356,7 +356,7 @@ public void testForecastFunction() {
 
     String sql =
         "SELECT * FROM FORECAST("
-            + "input => (SELECT time,s3 FROM table1 WHERE tag1='shanghai' AND tag2='A3' AND tag3='YY' ORDER BY time DESC LIMIT 1440), "
+            + "targets => (SELECT time,s3 FROM table1 WHERE tag1='shanghai' AND tag2='A3' AND tag3='YY' ORDER BY time DESC LIMIT 1440), "
             + "model_id => 'timer_xl')";
     LogicalQueryPlan logicalQueryPlan = planTester.createPlan(sql);
 
@@ -416,7 +416,7 @@ public void testForecastFunctionWithNoLowerCase() {
 
     String sql =
         "SELECT * FROM FORECAST("
-            + "input => (SELECT time,s3 FROM table1 WHERE tag1='shanghai' AND tag2='A3' AND tag3='YY' ORDER BY time DESC LIMIT 1440), "
+            + "targets => (SELECT time,s3 FROM table1 WHERE tag1='shanghai' AND tag2='A3' AND tag3='YY' ORDER BY time DESC LIMIT 1440), "
             + "model_id => 'timer_xl', timecol=>'TiME')";
     LogicalQueryPlan logicalQueryPlan = planTester.createPlan(sql);