From f0385ff7b0bf69442d168d5a2afad681e8a9ec2d Mon Sep 17 00:00:00 2001 From: Weiyi Liu Date: Mon, 9 Mar 2020 11:36:48 +0800 Subject: [PATCH] Remove & Simplfy redundancy code. (#4467) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: 吴晟 Wu Sheng --- .../jdbc/h2/dao/H2AggregationQueryDAO.java | 20 +++++++------------ .../jdbc/mysql/MySQLAggregationQueryDAO.java | 19 +++++++----------- 2 files changed, 14 insertions(+), 25 deletions(-) diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2AggregationQueryDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2AggregationQueryDAO.java index b75682e45b..dea2b0b38d 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2AggregationQueryDAO.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2AggregationQueryDAO.java @@ -101,19 +101,13 @@ public class H2AggregationQueryDAO implements IAggregationQueryDAO { sql.append(" group by ").append(Metrics.ENTITY_ID); sql.append(") order by value ").append(order.equals(Order.ASC) ? "asc" : "desc").append(" limit ").append(topN); List topNEntities = new ArrayList<>(); - try (Connection connection = h2Client.getConnection()) { - try (ResultSet resultSet = h2Client.executeQuery(connection, sql.toString(), conditions.toArray(new Object[0]))) { - - try { - while (resultSet.next()) { - TopNEntity topNEntity = new TopNEntity(); - topNEntity.setId(resultSet.getString(Metrics.ENTITY_ID)); - topNEntity.setValue(resultSet.getLong("value")); - topNEntities.add(topNEntity); - } - } catch (SQLException e) { - throw new IOException(e); - } + try (Connection connection = h2Client.getConnection(); + ResultSet resultSet = h2Client.executeQuery(connection, sql.toString(), conditions.toArray(new Object[0]))) { + while (resultSet.next()) { + TopNEntity topNEntity = new TopNEntity(); + topNEntity.setId(resultSet.getString(Metrics.ENTITY_ID)); + topNEntity.setValue(resultSet.getLong("value")); + topNEntities.add(topNEntity); } } catch (SQLException e) { throw new IOException(e); diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLAggregationQueryDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLAggregationQueryDAO.java index a636ac3cd3..b175ea72de 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLAggregationQueryDAO.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLAggregationQueryDAO.java @@ -60,18 +60,13 @@ public class MySQLAggregationQueryDAO extends H2AggregationQueryDAO { sql.append(" order by value ").append(order.equals(Order.ASC) ? "asc" : "desc").append(" limit ").append(topN); List topNEntities = new ArrayList<>(); - try (Connection connection = getH2Client().getConnection()) { - try (ResultSet resultSet = getH2Client().executeQuery(connection, sql.toString(), conditions.toArray(new Object[0]))) { - try { - while (resultSet.next()) { - TopNEntity topNEntity = new TopNEntity(); - topNEntity.setId(resultSet.getString(Metrics.ENTITY_ID)); - topNEntity.setValue(resultSet.getLong("value")); - topNEntities.add(topNEntity); - } - } catch (SQLException e) { - throw new IOException(e); - } + try (Connection connection = getH2Client().getConnection(); + ResultSet resultSet = getH2Client().executeQuery(connection, sql.toString(), conditions.toArray(new Object[0]))) { + while (resultSet.next()) { + TopNEntity topNEntity = new TopNEntity(); + topNEntity.setId(resultSet.getString(Metrics.ENTITY_ID)); + topNEntity.setValue(resultSet.getLong("value")); + topNEntities.add(topNEntity); } } catch (SQLException e) { throw new IOException(e); -- GitLab