[apache#1707] feat(mysql): Support mysql index.

Clearvive · Jan 29, 2024 · 92a41a6 · 92a41a6
1 parent 48e5b43
commit 92a41a6
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 47 deletions.
diff --git a/...on/src/main/java/com/datastrato/gravitino/catalog/jdbc/operation/JdbcTableOperations.java b/...on/src/main/java/com/datastrato/gravitino/catalog/jdbc/operation/JdbcTableOperations.java
@@ -113,15 +113,15 @@ public JdbcTable load(String databaseName, String tableName) throws NoSuchTableE
       List<JdbcColumn> jdbcColumns = new ArrayList<>();
       ResultSet columns = getColumns(connection, databaseName, tableName);
       while (columns.next()) {
-        JdbcColumn.Builder columnBuilder = createJdbcColumnBuilder(columns);
-        extractJdbcColumnFromResultSet(columns, columnBuilder);
+        JdbcColumn.Builder columnBuilder = getBasicJdbcColumnInfo(columns);
+        boolean autoIncrement = getAutoIncrementInfo(columns);
+        columnBuilder.withAutoIncrement(autoIncrement);
         jdbcColumns.add(columnBuilder.build());
       }
 
       JdbcTable.Builder jdbcTableBuilder = createJdbcTableBuilder(table);
-      extractJdbcTableFromResultSet(table, jdbcTableBuilder);
 
-      // 3.Get table properties
+      // 3.The underlying implementation class customizes the extension of table information.
       extractJdbcTable(connection, tableName, jdbcTableBuilder);
 
       return jdbcTableBuilder.withColumns(jdbcColumns.toArray(new JdbcColumn[0])).build();
@@ -130,6 +130,8 @@ public JdbcTable load(String databaseName, String tableName) throws NoSuchTableE
     }
   }
 
+  protected abstract boolean getAutoIncrementInfo(ResultSet columns) throws SQLException;
+
   @Override
   public void rename(String databaseName, String oldTableName, String newTableName)
       throws NoSuchTableException {
@@ -195,15 +197,11 @@ protected ResultSet getColumns(Connection connection, String databaseName, Strin
     return metaData.getColumns(connection.getCatalog(), connection.getSchema(), tableName, null);
   }
 
-  protected abstract void extractJdbcColumnFromResultSet(
-      ResultSet column, JdbcColumn.Builder columnBuilder) throws SQLException;
-
-  protected abstract void extractJdbcTableFromResultSet(
-      ResultSet column, JdbcTable.Builder columnBuilder) throws SQLException;
-
-  protected abstract void extractJdbcTable(
+  protected void extractJdbcTable(
       Connection connection, String tableName, JdbcTable.Builder jdbcTableBuilder)
-      throws SQLException;
+      throws SQLException {
+    // nothing to do
+  }
 
   protected abstract String generateCreateTableSql(
       String tableName,
@@ -235,7 +233,7 @@ protected JdbcTable.Builder createJdbcTableBuilder(ResultSet table) throws SQLEx
         .withProperties(Collections.emptyMap());
   }
 
-  protected JdbcColumn.Builder createJdbcColumnBuilder(ResultSet column) throws SQLException {
+  protected JdbcColumn.Builder getBasicJdbcColumnInfo(ResultSet column) throws SQLException {
     JdbcTypeConverter.JdbcTypeBean typeBean =
         new JdbcTypeConverter.JdbcTypeBean(column.getString("TYPE_NAME"));
     typeBean.setColumnSize(column.getString("COLUMN_SIZE"));

diff --git a/.../src/test/java/com/datastrato/gravitino/catalog/jdbc/operation/SqliteTableOperations.java b/.../src/test/java/com/datastrato/gravitino/catalog/jdbc/operation/SqliteTableOperations.java
@@ -5,12 +5,9 @@
 package com.datastrato.gravitino.catalog.jdbc.operation;
 
 import com.datastrato.gravitino.catalog.jdbc.JdbcColumn;
-import com.datastrato.gravitino.catalog.jdbc.JdbcTable;
 import com.datastrato.gravitino.rel.TableChange;
 import com.datastrato.gravitino.rel.expressions.transforms.Transform;
-import java.sql.Connection;
 import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.Map;
 
 public class SqliteTableOperations extends JdbcTableOperations {
@@ -76,15 +73,7 @@ protected String generateAlterTableSql(
   }
 
   @Override
-  protected void extractJdbcColumnFromResultSet(ResultSet column, JdbcColumn.Builder columnBuilder)
-      throws SQLException {}
-
-  @Override
-  protected void extractJdbcTableFromResultSet(ResultSet column, JdbcTable.Builder columnBuilder)
-      throws SQLException {}
-
-  @Override
-  protected void extractJdbcTable(
-      Connection connection, String tableName, JdbcTable.Builder jdbcTableBuilder)
-      throws SQLException {}
+  protected boolean getAutoIncrementInfo(ResultSet columns) {
+    return false;
+  }
 }
diff --git a/.../src/main/java/com/datastrato/gravitino/catalog/mysql/operation/MysqlTableOperations.java b/.../src/main/java/com/datastrato/gravitino/catalog/mysql/operation/MysqlTableOperations.java
@@ -149,16 +149,10 @@ protected String generateCreateTableSql(
   }
 
   @Override
-  protected void extractJdbcColumnFromResultSet(
-      ResultSet resultSet, JdbcColumn.Builder columnBuilder) throws SQLException {
-    columnBuilder.withAutoIncrement(
-        "YES".equalsIgnoreCase(resultSet.getString("IS_AUTOINCREMENT")));
+  protected boolean getAutoIncrementInfo(ResultSet resultSet) throws SQLException {
+    return "YES".equalsIgnoreCase(resultSet.getString("IS_AUTOINCREMENT"));
   }
 
-  @Override
-  protected void extractJdbcTableFromResultSet(ResultSet column, JdbcTable.Builder columnBuilder)
-      throws SQLException {}
-
   @Override
   protected void extractJdbcTable(
       Connection connection, String tableName, JdbcTable.Builder tableBuilder) throws SQLException {

diff --git a/...java/com/datastrato/gravitino/catalog/postgresql/operation/PostgreSqlTableOperations.java b/...java/com/datastrato/gravitino/catalog/postgresql/operation/PostgreSqlTableOperations.java
@@ -382,20 +382,10 @@ private String updateColumnCommentFieldDefinition(
   }
 
   @Override
-  protected void extractJdbcColumnFromResultSet(
-      ResultSet resultSet, JdbcColumn.Builder columnBuilder) throws SQLException {
-    columnBuilder.withAutoIncrement(resultSet.getBoolean("IS_AUTOINCREMENT"));
+  protected boolean getAutoIncrementInfo(ResultSet resultSet) throws SQLException {
+    return resultSet.getBoolean("IS_AUTOINCREMENT");
   }
 
-  @Override
-  protected void extractJdbcTableFromResultSet(ResultSet column, JdbcTable.Builder columnBuilder)
-      throws SQLException {}
-
-  @Override
-  protected void extractJdbcTable(
-      Connection connection, String tableName, JdbcTable.Builder jdbcTableBuilder)
-      throws SQLException {}
-
   @Override
   protected Connection getConnection(String schema) throws SQLException {
     Connection connection = dataSource.getConnection();