Fix the bug in getIndexInfo for mysql (#14750)

apache · Aug 4, 2023 · d31c04c · d31c04c
1 parent 3335040
commit d31c04c
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 7 deletions.
diff --git a/server/src/main/java/org/apache/druid/metadata/SQLMetadataConnector.java b/server/src/main/java/org/apache/druid/metadata/SQLMetadataConnector.java
@@ -864,13 +864,7 @@ public Void withHandle(Handle handle) throws Exception
         {
           DatabaseMetaData databaseMetaData = handle.getConnection().getMetaData();
           // Fetch the index for given table
-          ResultSet resultSet = databaseMetaData.getIndexInfo(
-              null,
-              null,
-              StringUtils.toUpperCase(tableName),
-              false,
-              false
-          );
+          ResultSet resultSet = getIndexInfo(databaseMetaData, tableName);
           while (resultSet.next()) {
             String indexName = resultSet.getString("INDEX_NAME");
             if (org.apache.commons.lang.StringUtils.isNotBlank(indexName)) {
@@ -887,6 +881,24 @@ public Void withHandle(Handle handle) throws Exception
     return ImmutableSet.copyOf(res);
   }
 
+  /**
+   * Get the ResultSet for indexInfo for given table
+   *
+   * @param databaseMetaData DatabaseMetaData
+   * @param tableName        Name of table
+   * @return ResultSet with index info
+   */
+  public ResultSet getIndexInfo(DatabaseMetaData databaseMetaData, String tableName) throws SQLException
+  {
+    return databaseMetaData.getIndexInfo(
+        null,
+        null,
+        tableName,  // tableName is case-sensitive in mysql default setting
+        false,
+        false
+    );
+  }
+
   /**
    * create index on the table with retry if not already exist, to be called after createTable
    *

diff --git a/server/src/main/java/org/apache/druid/metadata/storage/derby/DerbyConnector.java b/server/src/main/java/org/apache/druid/metadata/storage/derby/DerbyConnector.java
@@ -168,6 +168,24 @@ public Void withHandle(Handle handle)
     );
   }
 
+  /**
+   * Get the ResultSet for indexInfo for given table
+   *
+   * @param databaseMetaData DatabaseMetaData
+   * @param tableName        Name of table
+   * @return ResultSet with index info
+   */
+  @Override
+  public ResultSet getIndexInfo(DatabaseMetaData databaseMetaData, String tableName) throws SQLException
+  {
+    return databaseMetaData.getIndexInfo(
+        null,
+        null,
+        StringUtils.toUpperCase(tableName),  // tableName needs to be uppercase in derby default setting
+        false,
+        false
+    );
+  }
   @LifecycleStart
   public void start()
   {