This is an automated email from the ASF dual-hosted git repository.

jerryshao pushed a commit to branch branch-1.3
in repository https://gitbox.apache.org/repos/asf/gravitino.git


The following commit(s) were added to refs/heads/branch-1.3 by this push:
     new 875cd9d9d0 [Cherry-pick to branch-1.3] [#14840] 
fix(catalog-jdbc-mysql): Skip dropping a missing index when ifExists is true 
(#14841) (#14868)
875cd9d9d0 is described below

commit 875cd9d9d0b857747d9f18fb9cd6c39eb7e88fea
Author: github-actions[bot] 
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Nov 11 11:16:11 2026 +0800

    [Cherry-pick to branch-1.3] [#14840] fix(catalog-jdbc-mysql): Skip dropping 
a missing index when ifExists is true (#14841) (#14868)
    
    **Cherry-pick Information:**
    - Original commit: fbfff6f491431e565afbe694a66ae8e6a8539cc1
    - Target branch: `branch-1.3`
    - Status: ✅ Clean cherry-pick (no conflicts)
    
    Co-authored-by: Yuhui <[email protected]>
---
 .../operation/OceanBaseTableOperations.java        | 19 ++++++++++------
 .../operation/TestOceanBaseTableOperations.java    | 24 ++++++++++++++++++---
 .../mysql/operation/MysqlTableOperations.java      | 19 ++++++++++------
 .../mysql/operation/TestMysqlTableOperations.java  | 25 +++++++++++++++++++---
 4 files changed, 69 insertions(+), 18 deletions(-)

diff --git 
a/catalogs-contrib/catalog-jdbc-oceanbase/src/main/java/org/apache/gravitino/catalog/oceanbase/operation/OceanBaseTableOperations.java
 
b/catalogs-contrib/catalog-jdbc-oceanbase/src/main/java/org/apache/gravitino/catalog/oceanbase/operation/OceanBaseTableOperations.java
index 799affe6e7..3833365ad6 100644
--- 
a/catalogs-contrib/catalog-jdbc-oceanbase/src/main/java/org/apache/gravitino/catalog/oceanbase/operation/OceanBaseTableOperations.java
+++ 
b/catalogs-contrib/catalog-jdbc-oceanbase/src/main/java/org/apache/gravitino/catalog/oceanbase/operation/OceanBaseTableOperations.java
@@ -289,7 +289,11 @@ public class OceanBaseTableOperations extends 
JdbcTableOperations {
         alterSql.add(addIndexDefinition((TableChange.AddIndex) change));
       } else if (change instanceof TableChange.DeleteIndex) {
         lazyLoadTable = getOrCreateTable(databaseName, tableName, 
lazyLoadTable);
-        alterSql.add(deleteIndexDefinition(lazyLoadTable, 
(TableChange.DeleteIndex) change));
+        String deleteIndexSql =
+            deleteIndexDefinition(lazyLoadTable, (TableChange.DeleteIndex) 
change);
+        if (StringUtils.isNotEmpty(deleteIndexSql)) {
+          alterSql.add(deleteIndexSql);
+        }
       } else if (change instanceof TableChange.UpdateColumnAutoIncrement) {
         lazyLoadTable = getOrCreateTable(databaseName, tableName, 
lazyLoadTable);
         alterSql.add(
@@ -359,11 +363,14 @@ public class OceanBaseTableOperations extends 
JdbcTableOperations {
   @VisibleForTesting
   static String deleteIndexDefinition(
       JdbcTable lazyLoadTable, TableChange.DeleteIndex deleteIndex) {
-    if (!deleteIndex.isIfExists()) {
-      Preconditions.checkArgument(
-          Arrays.stream(lazyLoadTable.index())
-              .anyMatch(index -> index.name().equals(deleteIndex.getName())),
-          "Index does not exist");
+    // Index names are case-insensitive in MySQL.
+    boolean indexExists =
+        Arrays.stream(lazyLoadTable.index())
+            .anyMatch(index -> 
index.name().equalsIgnoreCase(deleteIndex.getName()));
+    if (!indexExists) {
+      // A missing index is a no-op when ifExists is set; return empty SQL to 
skip it.
+      Preconditions.checkArgument(deleteIndex.isIfExists(), "Index does not 
exist");
+      return "";
     }
     return "DROP INDEX " + BACK_QUOTE + deleteIndex.getName() + BACK_QUOTE;
   }
diff --git 
a/catalogs-contrib/catalog-jdbc-oceanbase/src/test/java/org/apache/gravitino/catalog/oceanbase/operation/TestOceanBaseTableOperations.java
 
b/catalogs-contrib/catalog-jdbc-oceanbase/src/test/java/org/apache/gravitino/catalog/oceanbase/operation/TestOceanBaseTableOperations.java
index 237b4e378a..0c62516482 100644
--- 
a/catalogs-contrib/catalog-jdbc-oceanbase/src/test/java/org/apache/gravitino/catalog/oceanbase/operation/TestOceanBaseTableOperations.java
+++ 
b/catalogs-contrib/catalog-jdbc-oceanbase/src/test/java/org/apache/gravitino/catalog/oceanbase/operation/TestOceanBaseTableOperations.java
@@ -1195,11 +1195,22 @@ public class TestOceanBaseTableOperations extends 
TestOceanBase {
     // load table
     JdbcTable load = TABLE_OPERATIONS.load(TEST_DB_NAME, tableName);
 
-    // If ifExists is set to true then the code should not throw an exception 
if the index doesn't
-    // exist.
+    // If ifExists is set to true and the index doesn't exist, no SQL should 
be generated.
     TableChange.DeleteIndex deleteIndex = new TableChange.DeleteIndex("uk_1", 
true);
     sql = OceanBaseTableOperations.deleteIndexDefinition(load, deleteIndex);
-    Assertions.assertEquals("DROP INDEX `uk_1`", sql);
+    Assertions.assertEquals("", sql);
+    Assertions.assertDoesNotThrow(
+        () -> TABLE_OPERATIONS.alterTable(TEST_DB_NAME, tableName, 
deleteIndex));
+    Assertions.assertDoesNotThrow(
+        () ->
+            TABLE_OPERATIONS.alterTable(
+                TEST_DB_NAME,
+                tableName,
+                deleteIndex,
+                TableChange.updateComment("updated comment")));
+    JdbcTable altered = TABLE_OPERATIONS.load(TEST_DB_NAME, tableName);
+    Assertions.assertEquals("updated comment", altered.comment());
+    Assertions.assertEquals(1, altered.index().length);
 
     // The index existence check should only verify existence when ifExists is 
false, preventing
     // failures when dropping non-existent indexes.
@@ -1213,6 +1224,13 @@ public class TestOceanBaseTableOperations extends 
TestOceanBase {
     TableChange.DeleteIndex deleteIndex3 = new TableChange.DeleteIndex("uk_2", 
false);
     sql = OceanBaseTableOperations.deleteIndexDefinition(load, deleteIndex3);
     Assertions.assertEquals("DROP INDEX `uk_2`", sql);
+
+    // Index names are matched case-insensitively.
+    TableChange.DeleteIndex deleteIndex4 = new TableChange.DeleteIndex("UK_2", 
true);
+    sql = OceanBaseTableOperations.deleteIndexDefinition(load, deleteIndex4);
+    Assertions.assertEquals("DROP INDEX `UK_2`", sql);
+    TABLE_OPERATIONS.alterTable(TEST_DB_NAME, tableName, deleteIndex4);
+    Assertions.assertEquals(0, TABLE_OPERATIONS.load(TEST_DB_NAME, 
tableName).index().length);
   }
 
   @Test
diff --git 
a/catalogs/catalog-jdbc-mysql/src/main/java/org/apache/gravitino/catalog/mysql/operation/MysqlTableOperations.java
 
b/catalogs/catalog-jdbc-mysql/src/main/java/org/apache/gravitino/catalog/mysql/operation/MysqlTableOperations.java
index 3e32b8d324..3884b2fdb4 100644
--- 
a/catalogs/catalog-jdbc-mysql/src/main/java/org/apache/gravitino/catalog/mysql/operation/MysqlTableOperations.java
+++ 
b/catalogs/catalog-jdbc-mysql/src/main/java/org/apache/gravitino/catalog/mysql/operation/MysqlTableOperations.java
@@ -366,7 +366,11 @@ public class MysqlTableOperations extends 
JdbcTableOperations {
         alterSql.add(addIndexDefinition((TableChange.AddIndex) change));
       } else if (change instanceof TableChange.DeleteIndex) {
         lazyLoadTable = getOrCreateTable(databaseName, tableName, 
lazyLoadTable);
-        alterSql.add(deleteIndexDefinition(lazyLoadTable, 
(TableChange.DeleteIndex) change));
+        String deleteIndexSql =
+            deleteIndexDefinition(lazyLoadTable, (TableChange.DeleteIndex) 
change);
+        if (StringUtils.isNotEmpty(deleteIndexSql)) {
+          alterSql.add(deleteIndexSql);
+        }
       } else if (change instanceof TableChange.UpdateColumnAutoIncrement) {
         lazyLoadTable = getOrCreateTable(databaseName, tableName, 
lazyLoadTable);
         alterSql.add(
@@ -432,11 +436,14 @@ public class MysqlTableOperations extends 
JdbcTableOperations {
   @VisibleForTesting
   static String deleteIndexDefinition(
       JdbcTable lazyLoadTable, TableChange.DeleteIndex deleteIndex) {
-    if (!deleteIndex.isIfExists()) {
-      Preconditions.checkArgument(
-          Arrays.stream(lazyLoadTable.index())
-              .anyMatch(index -> index.name().equals(deleteIndex.getName())),
-          "Index does not exist");
+    // Index names are case-insensitive in MySQL.
+    boolean indexExists =
+        Arrays.stream(lazyLoadTable.index())
+            .anyMatch(index -> 
index.name().equalsIgnoreCase(deleteIndex.getName()));
+    if (!indexExists) {
+      // A missing index is a no-op when ifExists is set; return empty SQL to 
skip it.
+      Preconditions.checkArgument(deleteIndex.isIfExists(), "Index does not 
exist");
+      return "";
     }
     return "DROP INDEX " + quote(deleteIndex.getName());
   }
diff --git 
a/catalogs/catalog-jdbc-mysql/src/test/java/org/apache/gravitino/catalog/mysql/operation/TestMysqlTableOperations.java
 
b/catalogs/catalog-jdbc-mysql/src/test/java/org/apache/gravitino/catalog/mysql/operation/TestMysqlTableOperations.java
index ffa34854d7..11cece8445 100644
--- 
a/catalogs/catalog-jdbc-mysql/src/test/java/org/apache/gravitino/catalog/mysql/operation/TestMysqlTableOperations.java
+++ 
b/catalogs/catalog-jdbc-mysql/src/test/java/org/apache/gravitino/catalog/mysql/operation/TestMysqlTableOperations.java
@@ -1382,11 +1382,22 @@ public class TestMysqlTableOperations extends TestMysql 
{
     // load table
     JdbcTable load = TABLE_OPERATIONS.load(TEST_DB_NAME.toString(), tableName);
 
-    // If ifExists is set to true then the code should not throw an exception 
if the index doesn't
-    // exist.
+    // If ifExists is set to true and the index doesn't exist, no SQL should 
be generated.
     TableChange.DeleteIndex deleteIndex = new TableChange.DeleteIndex("uk_1", 
true);
     sql = MysqlTableOperations.deleteIndexDefinition(load, deleteIndex);
-    Assertions.assertEquals("DROP INDEX `uk_1`", sql);
+    Assertions.assertEquals("", sql);
+    Assertions.assertDoesNotThrow(
+        () -> TABLE_OPERATIONS.alterTable(TEST_DB_NAME.toString(), tableName, 
deleteIndex));
+    Assertions.assertDoesNotThrow(
+        () ->
+            TABLE_OPERATIONS.alterTable(
+                TEST_DB_NAME.toString(),
+                tableName,
+                deleteIndex,
+                TableChange.updateComment("updated comment")));
+    JdbcTable altered = TABLE_OPERATIONS.load(TEST_DB_NAME.toString(), 
tableName);
+    Assertions.assertEquals("updated comment", altered.comment());
+    Assertions.assertEquals(1, altered.index().length);
 
     // The index existence check should only verify existence when ifExists is 
false, preventing
     // failures when dropping non-existent indexes.
@@ -1400,6 +1411,14 @@ public class TestMysqlTableOperations extends TestMysql {
     TableChange.DeleteIndex deleteIndex3 = new TableChange.DeleteIndex("uk_2", 
false);
     sql = MysqlTableOperations.deleteIndexDefinition(load, deleteIndex3);
     Assertions.assertEquals("DROP INDEX `uk_2`", sql);
+
+    // Index names are matched case-insensitively.
+    TableChange.DeleteIndex deleteIndex4 = new TableChange.DeleteIndex("UK_2", 
true);
+    sql = MysqlTableOperations.deleteIndexDefinition(load, deleteIndex4);
+    Assertions.assertEquals("DROP INDEX `UK_2`", sql);
+    TABLE_OPERATIONS.alterTable(TEST_DB_NAME.toString(), tableName, 
deleteIndex4);
+    Assertions.assertEquals(
+        0, TABLE_OPERATIONS.load(TEST_DB_NAME.toString(), 
tableName).index().length);
   }
 
   @Test

Reply via email to