[kylin] 07/22: KYLIN-5493 set epoch_target as primary key of epoch table

[xxyu]

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

xxyu pushed a commit to branch kylin5
in repository https://gitbox.apache.org/repos/asf/kylin.git

commit d8cd3cd95c06598ffd464ec2761dda9a537074c8
Author: Jiawei Li <1019037...@qq.com>
AuthorDate: Fri Jan 6 14:45:59 2023 +0800

    KYLIN-5493 set epoch_target as primary key of epoch table
---
 .../common/persistence/metadata/jdbc/JdbcUtil.java | 25 ++++++++++------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git 
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/jdbc/JdbcUtil.java
 
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/jdbc/JdbcUtil.java
index afe9e37174..5c24313fb2 100644
--- 
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/jdbc/JdbcUtil.java
+++ 
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/jdbc/JdbcUtil.java
@@ -123,23 +123,20 @@ public class JdbcUtil {
     }
 
     private static boolean isPrimaryKeyExists(Connection conn, String... 
tables) throws SQLException {
-        try {
-            for (String table : tables) {
-                try {
-                    val resultSet = 
conn.getMetaData().getPrimaryKeys(conn.getCatalog(), conn.getSchema(), table);
-                    if (resultSet.next()) {
-                        return true;
-                    }
-                } catch (Exception e) {
-                    logger.warn("get primary key from table {} failed", table, 
e);
+
+        for (String table : tables) {
+            try {
+                val resultSet = 
conn.getMetaData().getPrimaryKeys(conn.getCatalog(), conn.getSchema(), table);
+                if (resultSet.next()) {
+                    return true;
                 }
-            }
-        } finally {
-            if (!conn.isClosed()) {
-                conn.close();
+            } catch (Exception e) {
+                log.warn("get primary key from table {} failed", table, e);
             }
         }
-
+        if (!conn.isClosed()) {
+            conn.close();
+        }
         return false;
 
     }