Support altering column/table names of table model

.gitignore

@@ -124,6 +124,7 @@ iotdb-core/tsfile/src/main/antlr4/org/apache/tsfile/parser/gen/
 .mvn/.gradle-enterprise/
 .mvn/.develocity/
 .run/
+*.sevo
 
 # Relational Grammar ANTLR
 iotdb-core/relational-grammar/src/main/antlr4/org/apache/iotdb/db/relational/grammar/sql/.antlr/

dependencies.json

@@ -113,7 +113,6 @@
     "org.bouncycastle:bcprov-jdk18on",
     "org.bouncycastle:bcutil-jdk18on",
     "org.checkerframework:checker-qual",
-    "org.checkerframework:checker-qual",
     "org.eclipse.collections:eclipse-collections",
     "org.eclipse.collections:eclipse-collections-api",
     "org.eclipse.jetty:jetty-http",

integration-test/src/main/java/org/apache/iotdb/itbase/runtime/RequestDelegate.java

@@ -126,6 +126,10 @@ protected void handleExceptions(Exception[] exceptions) throws SQLException {
         break;
       }
     }
+
+    if (!exceptionInconsistent && exceptionMsg[0] != null) {
+      throw new SQLException(exceptionMsg[0]);
+    }
     for (int i = 0; i < businessExceptions.length; i++) {
       if (businessExceptions[i] != null) {
         // As each exception has its own stacktrace, in order to display them clearly, we can only
@@ -134,9 +138,6 @@ protected void handleExceptions(Exception[] exceptions) throws SQLException {
             "Exception happens during request to {}", getEndpoints().get(i), businessExceptions[i]);
       }
     }
-    if (!exceptionInconsistent && exceptionMsg[0] != null) {
-      throw new SQLException(exceptionMsg[0]);
-    }
     if (exceptionInconsistent) {
       throw new InconsistentDataException(Arrays.asList(exceptionMsg), getEndpoints());
     }

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

@@ -19,6 +19,10 @@
 
 package org.apache.iotdb.relational.it.db.it;
 
+import org.apache.iotdb.db.storageengine.dataregion.tsfile.evolution.ColumnRename;
+import org.apache.iotdb.db.storageengine.dataregion.tsfile.evolution.SchemaEvolution;
+import org.apache.iotdb.db.storageengine.dataregion.tsfile.evolution.SchemaEvolutionFile;
+import org.apache.iotdb.db.storageengine.dataregion.tsfile.evolution.TableRename;
 import org.apache.iotdb.it.env.EnvFactory;
 import org.apache.iotdb.it.framework.IoTDBTestRunner;
 import org.apache.iotdb.it.utils.TsFileTableGenerator;
@@ -45,12 +49,18 @@
 import java.nio.file.Files;
 import java.sql.Connection;
 import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.fail;
+
 @RunWith(IoTDBTestRunner.class)
 @Category({TableLocalStandaloneIT.class, TableClusterIT.class})
 public class IoTDBLoadTsFileIT {
@@ -255,7 +265,91 @@ public void testLoadWithTableMod() throws Exception {
 
       try (final ResultSet resultSet = statement.executeQuery("show tables")) {
         Assert.assertTrue(resultSet.next());
-        Assert.assertFalse(resultSet.next());
+        assertFalse(resultSet.next());
+      }
+    }
+  }
+
+  @Test
+  public void testLoadWithSevoFile() throws Exception {
+    final int lineCount = 10000;
+
+    List<Pair<MeasurementSchema, MeasurementSchema>> measurementSchemas =
+        generateMeasurementSchemas();
+    List<ColumnCategory> columnCategories =
+        generateTabletColumnCategory(0, measurementSchemas.size());
+
+    final File file = new File(tmpDir, "1-0-0-0.tsfile");
+
+    List<MeasurementSchema> schemaList1 =
+        measurementSchemas.stream().map(pair -> pair.left).collect(Collectors.toList());
+
+    try (final TsFileTableGenerator generator = new TsFileTableGenerator(file)) {
+      generator.registerTable(SchemaConfig.TABLE_0, new ArrayList<>(schemaList1), columnCategories);
+      generator.generateData(SchemaConfig.TABLE_0, lineCount, PARTITION_INTERVAL / 10_000);
+    }
+
+    // rename table0 to table1
+    File sevoFile = new File(tmpDir, "0.sevo");
+    SchemaEvolutionFile schemaEvolutionFile = new SchemaEvolutionFile(sevoFile.getAbsolutePath());
+    SchemaEvolution schemaEvolution = new TableRename(SchemaConfig.TABLE_0, SchemaConfig.TABLE_1);
+    schemaEvolutionFile.append(Collections.singletonList(schemaEvolution));
+    // rename INT322INT32 to INT322INT32_NEW
+    schemaEvolution = new ColumnRename(SchemaConfig.TABLE_1, "INT322INT32", "INT322INT32_NEW");
+    schemaEvolutionFile.append(Collections.singletonList(schemaEvolution));
+
+    try (final Connection connection =
+            EnvFactory.getEnv().getConnection(BaseEnv.TABLE_SQL_DIALECT);
+        final Statement statement = connection.createStatement()) {
+      statement.execute(String.format("create database if not exists %s", SchemaConfig.DATABASE_0));
+      statement.execute(String.format("use %s", SchemaConfig.DATABASE_0));
+      statement.execute(
+          String.format(
+              "load '%s' with ('database'='%s', 'sevo-file-path'='%s')",
+              file.getAbsolutePath(), SchemaConfig.DATABASE_0, schemaEvolutionFile.getFilePath()));
+
+      // cannot query using table0
+      try (final ResultSet resultSet =
+          statement.executeQuery(String.format("select count(*) from %s", SchemaConfig.TABLE_0))) {
+        fail();
+      } catch (SQLException e) {
+        assertEquals("550: Table 'root.test' does not exist.", e.getMessage());
+      }
+
+      // can query with table1
+      try (final ResultSet resultSet =
+          statement.executeQuery(String.format("select count(*) from %s", SchemaConfig.TABLE_1))) {
+        if (resultSet.next()) {
+          Assert.assertEquals(lineCount, resultSet.getLong(1));
+        } else {
+          Assert.fail("This ResultSet is empty.");
+        }
+      }
+
+      // cannot query using INT322INT32
+      try (final ResultSet resultSet =
+          statement.executeQuery(
+              String.format("select count(%s) from %s", "INT322INT32", SchemaConfig.TABLE_1))) {
+        fail();
+      } catch (SQLException e) {
+        assertEquals("616: Column 'int322int32' cannot be resolved", e.getMessage());
+      }
+
+      // can query with INT322INT32_NEW
+      try (final ResultSet resultSet =
+          statement.executeQuery(
+              String.format("select count(%s) from %s", "INT322INT32_NEW", SchemaConfig.TABLE_1))) {
+        if (resultSet.next()) {
+          Assert.assertEquals(lineCount, resultSet.getLong(1));
+        } else {
+          Assert.fail("This ResultSet is empty.");
+        }
+      }
+
+      try (final ResultSet resultSet = statement.executeQuery("show tables")) {
+        Assert.assertTrue(resultSet.next());
+        assertEquals(SchemaConfig.TABLE_1, resultSet.getString(1));
+        assertFalse(resultSet.next());
       }
     }
   }