[kylin] 03/34: KYLIN-5445 minor fix sonar

[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 665400c2bc24c3f8109ff878e2b67ac245f738be
Author: Jiawei Li <1019037...@qq.com>
AuthorDate: Fri Jan 6 14:14:50 2023 +0800

    KYLIN-5445 minor fix sonar
---
 .../common/persistence/metadata/jdbc/JdbcUtil.java | 33 +++++++++-------------
 1 file changed, 14 insertions(+), 19 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 0fa58ed773..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,27 +123,22 @@ 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) {
-                    log.warn("get primary key from table {} failed", table, e);
-                }
-            }
 
-            return false;
-        } catch (Exception e) {
-            logger.error("Fail to know if table {} primary key exists", 
tables, e);
-        } finally {
-            if (!conn.isClosed()) {
-                conn.close();
+        for (String table : tables) {
+            try {
+                val resultSet = 
conn.getMetaData().getPrimaryKeys(conn.getCatalog(), conn.getSchema(), table);
+                if (resultSet.next()) {
+                    return true;
+                }
+            } catch (Exception e) {
+                log.warn("get primary key from table {} failed", table, e);
             }
         }
-        return true;
+        if (!conn.isClosed()) {
+            conn.close();
+        }
+        return false;
+
     }
 
     public static boolean isIndexExists(Connection conn, String table, String 
index) throws SQLException {
@@ -161,7 +156,7 @@ public class JdbcUtil {
                     }
                 }
             }
-        } catch (SQLException e) {
+        } catch (Exception e) {
             logger.error("Fail to know if table {} index {} exists", tables, 
index, e);
         } finally {
             if (!conn.isClosed())