[improvement][headless] Fix the issue of retrieving empty table infor…

…mation in H2 (#1789)
tencentmusic · Oct 12, 2024 · fc94a67 · fc94a67
1 parent 3501f59
commit fc94a67
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/...ess/core/src/main/java/com/tencent/supersonic/headless/core/adaptor/db/BaseDbAdaptor.java b/...ess/core/src/main/java/com/tencent/supersonic/headless/core/adaptor/db/BaseDbAdaptor.java
@@ -45,8 +45,8 @@ public List<String> getTables(ConnectInfo connectionInfo, String schemaName)
         List<String> tablesAndViews = new ArrayList<>();
         DatabaseMetaData metaData = getDatabaseMetaData(connectionInfo);
 
-        try (ResultSet resultSet =
-                metaData.getTables(schemaName, schemaName, null, new String[] {"TABLE", "VIEW"})) {
+        try {
+            ResultSet resultSet = getResultSet(schemaName, metaData);
             while (resultSet.next()) {
                 String name = resultSet.getString("TABLE_NAME");
                 tablesAndViews.add(name);
@@ -57,6 +57,11 @@ public List<String> getTables(ConnectInfo connectionInfo, String schemaName)
         return tablesAndViews;
     }
 
+    protected ResultSet getResultSet(String schemaName, DatabaseMetaData metaData)
+            throws SQLException {
+        return metaData.getTables(schemaName, schemaName, null, new String[] {"TABLE", "VIEW"});
+    }
+
     public List<DBColumn> getColumns(ConnectInfo connectInfo, String schemaName, String tableName)
             throws SQLException {
         List<DBColumn> dbColumns = Lists.newArrayList();

diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/adaptor/db/H2Adaptor.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/adaptor/db/H2Adaptor.java
@@ -2,7 +2,13 @@
 
 import com.tencent.supersonic.common.pojo.Constants;
 import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum;
+import lombok.extern.slf4j.Slf4j;
 
+import java.sql.DatabaseMetaData;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+@Slf4j
 public class H2Adaptor extends BaseDbAdaptor {
 
     @Override
@@ -30,6 +36,11 @@ public String getDateFormat(String dateType, String dateFormat, String column) {
         return column;
     }
 
+    protected ResultSet getResultSet(String schemaName, DatabaseMetaData metaData)
+            throws SQLException {
+        return metaData.getTables(schemaName, null, null, new String[] {"TABLE", "VIEW"});
+    }
+
     @Override
     public String functionNameCorrector(String sql) {
         return sql;