github
/
DolphinScheduler
mirror of https://gitee.com/dolphinscheduler/DolphinScheduler.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Fix bug : Use try-with-resources or close this "ResultSet" in a "finally" clause (#1689) 

* #1688 Fix bug : Use try-with-resources or close this "ResultSet" in a "finally" clause

* replace while to if where possible

* merge TaskRecordDao.java from dev
pull/2/head
Jave-Chen 5 years ago committed by Tboy
parent
3593a60374
commit
36e244297d
2 changed files with 42 additions and 39 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 42
      dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/MysqlPerformance.java
  2. 39
      dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/PostgrePerformance.java

42
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/MysqlPerformance.java
Unescape View File

@ -17,12 +17,7 @@
package org.apache.dolphinscheduler.dao.utils; package org.apache.dolphinscheduler.dao.utils;
import org.apache.dolphinscheduler.common.enums.DbType; import static org.apache.dolphinscheduler.dao.MonitorDBDao.VARIABLE_NAME;
import org.apache.dolphinscheduler.common.enums.Flag;
import org.apache.dolphinscheduler.dao.MonitorDBDao;
import org.apache.dolphinscheduler.dao.entity.MonitorRecord;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.sql.Connection; import java.sql.Connection;
import java.sql.ResultSet; import java.sql.ResultSet;
@ -30,7 +25,12 @@ import java.sql.SQLException;
import java.sql.Statement; import java.sql.Statement;
import java.util.Date; import java.util.Date;
import static org.apache.dolphinscheduler.dao.MonitorDBDao.VARIABLE_NAME; import org.apache.dolphinscheduler.common.enums.DbType;
import org.apache.dolphinscheduler.common.enums.Flag;
import org.apache.dolphinscheduler.dao.MonitorDBDao;
import org.apache.dolphinscheduler.dao.entity.MonitorRecord;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/** /**
* mysql performance * mysql performance
@ -55,26 +55,28 @@ public class MysqlPerformance extends BaseDBPerformance{
try{ try{
pstmt = conn.createStatement(); pstmt = conn.createStatement();
ResultSet rs1 = pstmt.executeQuery("show global variables"); try (ResultSet rs1 = pstmt.executeQuery("show global variables")) {
while(rs1.next()){ while(rs1.next()){
if(rs1.getString(VARIABLE_NAME).toUpperCase().equals("MAX_CONNECTIONS")){ if(rs1.getString(VARIABLE_NAME).equalsIgnoreCase("MAX_CONNECTIONS")){
monitorRecord.setMaxConnections( Long.parseLong(rs1.getString("value"))); monitorRecord.setMaxConnections( Long.parseLong(rs1.getString("value")));
}
} }
} }
ResultSet rs2 = pstmt.executeQuery("show global status"); try (ResultSet rs2 = pstmt.executeQuery("show global status")) {
while(rs2.next()){ while(rs2.next()){
if(rs2.getString(VARIABLE_NAME).toUpperCase().equals("MAX_USED_CONNECTIONS")){ if(rs2.getString(VARIABLE_NAME).equalsIgnoreCase("MAX_USED_CONNECTIONS")){
monitorRecord.setMaxUsedConnections(Long.parseLong(rs2.getString("value"))); monitorRecord.setMaxUsedConnections(Long.parseLong(rs2.getString("value")));
}else if(rs2.getString(VARIABLE_NAME).toUpperCase().equals("THREADS_CONNECTED")){ }else if(rs2.getString(VARIABLE_NAME).equalsIgnoreCase("THREADS_CONNECTED")){
monitorRecord.setThreadsConnections(Long.parseLong(rs2.getString("value"))); monitorRecord.setThreadsConnections(Long.parseLong(rs2.getString("value")));
}else if(rs2.getString(VARIABLE_NAME).toUpperCase().equals("THREADS_RUNNING")){ }else if(rs2.getString(VARIABLE_NAME).equalsIgnoreCase("THREADS_RUNNING")){
monitorRecord.setThreadsRunningConnections(Long.parseLong(rs2.getString("value"))); monitorRecord.setThreadsRunningConnections(Long.parseLong(rs2.getString("value")));
}
} }
} }
}catch (Exception e) { }catch (Exception e) {
monitorRecord.setState(Flag.NO); monitorRecord.setState(Flag.NO);
logger.error("SQLException " + e); logger.error("SQLException ", e);
}finally { }finally {
try { try {
if (pstmt != null) { if (pstmt != null) {

39
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/PostgrePerformance.java
Unescape View File

@ -16,6 +16,12 @@
*/ */
package org.apache.dolphinscheduler.dao.utils; package org.apache.dolphinscheduler.dao.utils;
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.Date;
import org.apache.dolphinscheduler.common.enums.DbType; import org.apache.dolphinscheduler.common.enums.DbType;
import org.apache.dolphinscheduler.common.enums.Flag; import org.apache.dolphinscheduler.common.enums.Flag;
import org.apache.dolphinscheduler.dao.MonitorDBDao; import org.apache.dolphinscheduler.dao.MonitorDBDao;
@ -23,12 +29,6 @@ import org.apache.dolphinscheduler.dao.entity.MonitorRecord;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.Date;
/** /**
* postgresql performance * postgresql performance
*/ */
@ -50,26 +50,27 @@ public class PostgrePerformance extends BaseDBPerformance {
Statement pstmt= null; Statement pstmt= null;
try{ try{
pstmt = conn.createStatement(); pstmt = conn.createStatement();
ResultSet rs1 = pstmt.executeQuery("select count(*) from pg_stat_activity;");
while(rs1.next()){ try (ResultSet rs1 = pstmt.executeQuery("select count(*) from pg_stat_activity;")) {
monitorRecord.setThreadsConnections(rs1.getInt("count")); if(rs1.next()){
break; monitorRecord.setThreadsConnections(rs1.getInt("count"));
}
} }
ResultSet rs2 = pstmt.executeQuery("show max_connections"); try (ResultSet rs2 = pstmt.executeQuery("show max_connections")) {
while(rs2.next()){ if(rs2.next()){
monitorRecord.setMaxConnections( rs2.getInt("max_connections")); monitorRecord.setMaxConnections( rs2.getInt("max_connections"));
break; }
} }
ResultSet rs3 = pstmt.executeQuery("select count(*) from pg_stat_activity pg where pg.state = 'active';"); try (ResultSet rs3 = pstmt.executeQuery("select count(*) from pg_stat_activity pg where pg.state = 'active';")) {
while(rs3.next()){ if(rs3.next()){
monitorRecord.setThreadsRunningConnections(rs3.getInt("count")); monitorRecord.setThreadsRunningConnections(rs3.getInt("count"));
break; }
} }
}catch (Exception e) { }catch (Exception e) {
monitorRecord.setState(Flag.NO); monitorRecord.setState(Flag.NO);
logger.error("SQLException " + e); logger.error("SQLException ", e);
}finally { }finally {
try { try {
if (pstmt != null) { if (pstmt != null) {

Write Preview
Loading…
Cancel
Save