This is an automated email from the ASF dual-hosted git repository. jiangtian pushed a commit to branch force_ci/support_schema_evolution in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 452ef817e015192f4242b2f49cb4d7cd95cb6b47 Author: Tian Jiang <[email protected]> AuthorDate: Fri Jan 16 10:55:16 2026 +0800 spotless --- .../iotdb/relational/it/schema/IoTDBTableIT.java | 19 +++++++------------ .../dataregion/tsfile/evolution/EvolvedSchema.java | 12 ++++++------ 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBTableIT.java index 109b863cc49..3fff7ed9a02 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBTableIT.java @@ -625,7 +625,6 @@ public class IoTDBTableIT { assertEquals("701: Columns in table shall not share the same name time.", e.getMessage()); } } catch (final SQLException e) { - e.printStackTrace(); fail(e.getMessage()); } } @@ -1435,7 +1434,8 @@ public class IoTDBTableIT { statement.execute("ALTER TABLE rename_same RENAME TO rename_same"); fail(); } catch (SQLException e) { - assertEquals("701: The table's old name shall not be equal to the new one.", e.getMessage()); + assertEquals( + "701: The table's old name shall not be equal to the new one.", e.getMessage()); } } } @@ -1560,12 +1560,7 @@ public class IoTDBTableIT { assertEquals(2, md.getColumnCount()); String colName = md.getColumnName(2); // accept either exact quoted name or normalized variant - assertTrue( - colName.equals("s-特") - || colName.equals("s-\u7279") - || colName.equals("s特") - || colName.equals("s_特") - || colName.length() > 0); + assertTrue(colName.equals("s-特") || colName.equals("s特") || colName.equals("s_特")); } } @@ -1586,12 +1581,12 @@ public class IoTDBTableIT { statement.execute("ALTER TABLE tmulti RENAME COLUMN b TO c"); statement.execute("INSERT INTO tmulti (time, c) VALUES (3, 3)"); -// -// statement.execute("ALTER TABLE tmulti RENAME COLUMN c TO a"); -// statement.execute("INSERT INTO tmulti (time, a) VALUES (4, 4)"); + + statement.execute("ALTER TABLE tmulti RENAME COLUMN c TO a"); + statement.execute("INSERT INTO tmulti (time, a) VALUES (4, 4)"); ResultSet rs = statement.executeQuery("SELECT * FROM tmulti"); - for (int i = 1; i <= 3; i++) { + for (int i = 1; i <= 4; i++) { assertTrue(rs.next()); assertEquals(i, rs.getLong(1)); assertEquals(i, rs.getInt(2)); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/evolution/EvolvedSchema.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/evolution/EvolvedSchema.java index a90817781e9..e32d3649c94 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/evolution/EvolvedSchema.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/evolution/EvolvedSchema.java @@ -316,17 +316,17 @@ public class EvolvedSchema implements Accountable { EvolvedSchema newEvolvedSchema = new EvolvedSchema(); newEvolvedSchema.finalToOriginalTableNames = new LinkedHashMap<>(evolvedSchema.finalToOriginalTableNames); - newEvolvedSchema.finalToOriginalColumnNames = - new LinkedHashMap<>(); - for (Entry<String, Map<String, String>> entry : evolvedSchema.finalToOriginalColumnNames.entrySet()) { + newEvolvedSchema.finalToOriginalColumnNames = new LinkedHashMap<>(); + for (Entry<String, Map<String, String>> entry : + evolvedSchema.finalToOriginalColumnNames.entrySet()) { newEvolvedSchema.finalToOriginalColumnNames.put( entry.getKey(), new LinkedHashMap<>(entry.getValue())); } newEvolvedSchema.originalToFinalTableNames = new LinkedHashMap<>(evolvedSchema.originalToFinalTableNames); - newEvolvedSchema.originalToFinalColumnNames = - new LinkedHashMap<>(); - for (Entry<String, Map<String, String>> entry : evolvedSchema.originalToFinalColumnNames.entrySet()) { + newEvolvedSchema.originalToFinalColumnNames = new LinkedHashMap<>(); + for (Entry<String, Map<String, String>> entry : + evolvedSchema.originalToFinalColumnNames.entrySet()) { newEvolvedSchema.originalToFinalColumnNames.put( entry.getKey(), new LinkedHashMap<>(entry.getValue())); }
