This is an automated email from the ASF dual-hosted git repository. haonan pushed a commit to branch sonarbug in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit bcad19ec4a5e0aa90c2024ae9ff29af362682bdf Author: HTHou <[email protected]> AuthorDate: Mon Aug 16 00:01:52 2021 +0800 Fix some bugs reported by sonar --- .../apache/iotdb/jdbc/IoTDBDatabaseMetadata.java | 67 +++++++++++++--------- .../db/integration/IoTDBSessionTimeoutIT.java | 6 +- .../apache/iotdb/session/SessionConnection.java | 2 +- 3 files changed, 46 insertions(+), 29 deletions(-) diff --git a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadata.java b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadata.java index 16fc628..b774df4 100644 --- a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadata.java +++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadata.java @@ -386,10 +386,23 @@ public class IoTDBDatabaseMetadata implements DatabaseMetaData { columnTypeList.add(fields[i].getSqlType()); columnNameIndex.put(fields[i].getName(), i); } + return new IoTDBJDBCResultSet( + stmt, + columnNameList, + columnTypeList, + columnNameIndex, + false, + client, + null, + 0, + sessionId, + null, + (long) 60 * 1000, + true); } catch (Exception e) { e.printStackTrace(); } finally { - colse(null, stmt); + close(null, stmt); } return new IoTDBJDBCResultSet( stmt, @@ -432,7 +445,7 @@ public class IoTDBDatabaseMetadata implements DatabaseMetaData { } catch (Exception e) { e.printStackTrace(); } finally { - colse(null, stmt); + close(null, stmt); } return new IoTDBJDBCResultSet( @@ -489,7 +502,7 @@ public class IoTDBDatabaseMetadata implements DatabaseMetaData { } catch (IOException e) { e.printStackTrace(); } finally { - colse(rs, stmt); + close(rs, stmt); } return new IoTDBJDBCResultSet( stmt, @@ -701,7 +714,7 @@ public class IoTDBDatabaseMetadata implements DatabaseMetaData { } catch (IOException e) { e.printStackTrace(); } finally { - colse(rs, stmt); + close(rs, stmt); } return new IoTDBJDBCResultSet( stmt, @@ -804,7 +817,7 @@ public class IoTDBDatabaseMetadata implements DatabaseMetaData { } catch (IOException e) { e.printStackTrace(); } finally { - colse(rs, stmt); + close(rs, stmt); } return new IoTDBJDBCResultSet( stmt, @@ -858,7 +871,7 @@ public class IoTDBDatabaseMetadata implements DatabaseMetaData { } catch (Exception e) { e.printStackTrace(); } finally { - colse(null, stmt); + close(null, stmt); } return new IoTDBJDBCResultSet( stmt, @@ -971,7 +984,7 @@ public class IoTDBDatabaseMetadata implements DatabaseMetaData { } catch (Exception e) { e.printStackTrace(); } finally { - colse(null, stmt); + close(null, stmt); } return new IoTDBJDBCResultSet( stmt, @@ -1073,7 +1086,7 @@ public class IoTDBDatabaseMetadata implements DatabaseMetaData { } catch (IOException e) { e.printStackTrace(); } finally { - colse(rs, stmt); + close(rs, stmt); } return new IoTDBJDBCResultSet( stmt, @@ -1145,7 +1158,7 @@ public class IoTDBDatabaseMetadata implements DatabaseMetaData { } catch (IOException e) { e.printStackTrace(); } finally { - colse(rs, stmt); + close(rs, stmt); } return new IoTDBJDBCResultSet( stmt, @@ -1197,7 +1210,7 @@ public class IoTDBDatabaseMetadata implements DatabaseMetaData { } catch (Exception e) { e.printStackTrace(); } finally { - colse(null, stmt); + close(null, stmt); } return new IoTDBJDBCResultSet( stmt, @@ -1245,7 +1258,7 @@ public class IoTDBDatabaseMetadata implements DatabaseMetaData { } catch (Exception e) { e.printStackTrace(); } finally { - colse(null, stmt); + close(null, stmt); } return new IoTDBJDBCResultSet( stmt, @@ -1406,7 +1419,7 @@ public class IoTDBDatabaseMetadata implements DatabaseMetaData { } catch (Exception e) { e.printStackTrace(); } finally { - colse(resultSet, statement); + close(resultSet, statement); } return result; } @@ -1460,7 +1473,7 @@ public class IoTDBDatabaseMetadata implements DatabaseMetaData { } catch (IOException e) { e.printStackTrace(); } finally { - colse(null, stmt); + close(null, stmt); } return new IoTDBJDBCResultSet( stmt, @@ -1515,7 +1528,7 @@ public class IoTDBDatabaseMetadata implements DatabaseMetaData { } catch (Exception e) { e.printStackTrace(); } finally { - colse(null, stmt); + close(null, stmt); } return new IoTDBJDBCResultSet( stmt, @@ -1559,7 +1572,7 @@ public class IoTDBDatabaseMetadata implements DatabaseMetaData { } catch (Exception e) { e.printStackTrace(); } finally { - colse(null, stmt); + close(null, stmt); } return new IoTDBJDBCResultSet( stmt, @@ -1635,7 +1648,7 @@ public class IoTDBDatabaseMetadata implements DatabaseMetaData { } catch (IOException e) { e.printStackTrace(); } finally { - colse(null, stmt); + close(null, stmt); } return new IoTDBJDBCResultSet( stmt, @@ -1713,7 +1726,7 @@ public class IoTDBDatabaseMetadata implements DatabaseMetaData { } catch (IOException e) { e.printStackTrace(); } finally { - colse(rs, stmt); + close(rs, stmt); } return new IoTDBJDBCResultSet( stmt, @@ -1766,7 +1779,7 @@ public class IoTDBDatabaseMetadata implements DatabaseMetaData { } catch (Exception e) { e.printStackTrace(); } finally { - colse(null, stmt); + close(null, stmt); } return new IoTDBJDBCResultSet( stmt, @@ -1806,7 +1819,7 @@ public class IoTDBDatabaseMetadata implements DatabaseMetaData { } catch (Exception e) { e.printStackTrace(); } finally { - colse(null, stmt); + close(null, stmt); } return new IoTDBJDBCResultSet( stmt, @@ -1842,7 +1855,7 @@ public class IoTDBDatabaseMetadata implements DatabaseMetaData { } catch (Exception ex) { ex.printStackTrace(); } finally { - colse(resultSet, statement); + close(resultSet, statement); } return result; } @@ -1924,7 +1937,7 @@ public class IoTDBDatabaseMetadata implements DatabaseMetaData { } catch (IOException e) { e.printStackTrace(); } finally { - colse(rs, stmt); + close(rs, stmt); } return new IoTDBJDBCResultSet( stmt, @@ -1966,7 +1979,7 @@ public class IoTDBDatabaseMetadata implements DatabaseMetaData { } catch (IOException e) { e.printStackTrace(); } finally { - colse(null, stmt); + close(null, stmt); } return new IoTDBJDBCResultSet( stmt, @@ -2134,7 +2147,7 @@ public class IoTDBDatabaseMetadata implements DatabaseMetaData { } catch (IOException e) { e.printStackTrace(); } finally { - colse(rs, stmt); + close(rs, stmt); } return new IoTDBJDBCResultSet( stmt, @@ -2151,7 +2164,7 @@ public class IoTDBDatabaseMetadata implements DatabaseMetaData { false); } - private void colse(ResultSet rs, Statement stmt) { + private void close(ResultSet rs, Statement stmt) { try { if (rs != null) { @@ -2520,7 +2533,7 @@ public class IoTDBDatabaseMetadata implements DatabaseMetaData { } catch (IOException e) { e.printStackTrace(); } finally { - colse(null, stmt); + close(null, stmt); } return new IoTDBJDBCResultSet( stmt, @@ -2562,7 +2575,7 @@ public class IoTDBDatabaseMetadata implements DatabaseMetaData { } catch (Exception e) { e.printStackTrace(); } finally { - colse(null, stmt); + close(null, stmt); } return new IoTDBJDBCResultSet( stmt, @@ -2615,7 +2628,7 @@ public class IoTDBDatabaseMetadata implements DatabaseMetaData { } catch (Exception e) { e.printStackTrace(); } finally { - colse(null, stmt); + close(null, stmt); } return new IoTDBJDBCResultSet( stmt, diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBSessionTimeoutIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBSessionTimeoutIT.java index d4c8918..b826ace 100644 --- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBSessionTimeoutIT.java +++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBSessionTimeoutIT.java @@ -59,7 +59,11 @@ public class IoTDBSessionTimeoutIT { try (Connection connection = DriverManager.getConnection("jdbc:iotdb://127.0.0.1:6667/", "root", "root"); Statement statement = connection.createStatement()) { - Thread.sleep(SESSION_TIMEOUT + 10000); + try { + Thread.sleep(SESSION_TIMEOUT + 10000); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + } statement.execute("show storage group"); fail("session did not timeout as expected"); } catch (IoTDBSQLException e) { diff --git a/session/src/main/java/org/apache/iotdb/session/SessionConnection.java b/session/src/main/java/org/apache/iotdb/session/SessionConnection.java index 79b9967..b1f37f6 100644 --- a/session/src/main/java/org/apache/iotdb/session/SessionConnection.java +++ b/session/src/main/java/org/apache/iotdb/session/SessionConnection.java @@ -78,6 +78,7 @@ public class SessionConnection { private EndPoint endPoint; private List<EndPoint> endPointList = new ArrayList<>(); private boolean enableRedirect = false; + private Random random = new Random(); // TestOnly public SessionConnection() {} @@ -747,7 +748,6 @@ public class SessionConnection { private boolean reconnect() { boolean connectedSuccess = false; - Random random = new Random(); for (int i = 1; i <= Config.RETRY_NUM; i++) { if (transport != null) { transport.close();
