Merge pull request #4697 from ShvaykaD/feature/cleanup-call-deduplication

Added try with resource to auto-close the connections, statements and result sets in clean up calls

dao/src/main/java/org/thingsboard/server/dao/sql/edge/JpaEdgeDao.java

@@ -40,6 +40,7 @@ import org.thingsboard.server.dao.model.sql.EdgeInfoEntity;
 import org.thingsboard.server.dao.relation.RelationDao;
 import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao;
 
+import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -199,16 +200,17 @@ public class JpaEdgeDao extends JpaAbstractSearchTextDao<EdgeEntity, Edge> imple
 
     @Override
     public void cleanupEvents(long ttl) {
-        try {
+        log.info("Going to cleanup old edge events using ttl: {}s", ttl);
-            log.info("Going to cleanup old edge events using ttl: {}s", ttl);
+        try (Connection connection = dataSource.getConnection();
-            PreparedStatement stmt = dataSource.getConnection().prepareStatement("call cleanup_edge_events_by_ttl(?,?)");
+        PreparedStatement stmt = connection.prepareStatement("call cleanup_edge_events_by_ttl(?,?)")) {
             stmt.setLong(1, ttl);
             stmt.setLong(2, 0);
             stmt.execute();
             printWarnings(stmt);
-            ResultSet resultSet = stmt.getResultSet();
+            try (ResultSet resultSet = stmt.getResultSet()) {
-            resultSet.next();
+                resultSet.next();
-            log.info("Total edge events removed by TTL: [{}]", resultSet.getLong(1));
+                log.info("Total edge events removed by TTL: [{}]", resultSet.getLong(1));
+            }
         } catch (SQLException e) {
             log.error("SQLException occurred during edge events TTL task execution ", e);
         }

dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java

@@ -39,6 +39,7 @@ import org.thingsboard.server.dao.event.EventDao;
 import org.thingsboard.server.dao.model.sql.EventEntity;
 import org.thingsboard.server.dao.sql.JpaAbstractDao;
 
+import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -260,17 +261,18 @@ public class JpaBaseEventDao extends JpaAbstractDao<EventEntity, Event> implemen
 
     @Override
     public void cleanupEvents(long otherEventsTtl, long debugEventsTtl) {
-        try {
+        log.info("Going to cleanup old events using debug events ttl: {}s and other events ttl: {}s", debugEventsTtl, otherEventsTtl);
-            log.info("Going to cleanup old events using debug events ttl: {}s and other events ttl: {}s", debugEventsTtl, otherEventsTtl);
+        try (Connection connection = dataSource.getConnection();
-            PreparedStatement stmt = dataSource.getConnection().prepareStatement("call cleanup_events_by_ttl(?,?,?)");
+             PreparedStatement stmt = connection.prepareStatement("call cleanup_events_by_ttl(?,?,?)")) {
             stmt.setLong(1, otherEventsTtl);
             stmt.setLong(2, debugEventsTtl);
             stmt.setLong(3, 0);
             stmt.execute();
             printWarnings(stmt);
-            ResultSet resultSet = stmt.getResultSet();
+            try (ResultSet resultSet = stmt.getResultSet()){
-            resultSet.next();
+                resultSet.next();
-            log.info("Total events removed by TTL: [{}]", resultSet.getLong(1));
+                log.info("Total events removed by TTL: [{}]", resultSet.getLong(1));
+            }
         } catch (SQLException e) {
             log.error("SQLException occurred during events TTL task execution ", e);
         }

dao/src/main/java/org/thingsboard/server/dao/sqlts/AbstractSqlTimeseriesDao.java

@@ -29,6 +29,7 @@ import org.thingsboard.server.dao.model.ModelConstants;
 import org.thingsboard.server.dao.sql.ScheduledLogExecutorComponent;
 
 import javax.annotation.Nullable;
+import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -67,17 +68,18 @@ public abstract class AbstractSqlTimeseriesDao extends BaseAbstractSqlTimeseries
     private long systemTtl;
 
     public void cleanup(long systemTtl) {
-        try {
+        log.info("Going to cleanup old timeseries data using ttl: {}s", systemTtl);
-            log.info("Going to cleanup old timeseries data using ttl: {}s", systemTtl);
+        try (Connection connection = dataSource.getConnection();
-            PreparedStatement stmt = dataSource.getConnection().prepareStatement("call cleanup_timeseries_by_ttl(?,?,?)");
+             PreparedStatement stmt = connection.prepareStatement("call cleanup_timeseries_by_ttl(?,?,?)")) {
             stmt.setObject(1, ModelConstants.NULL_UUID);
             stmt.setLong(2, systemTtl);
             stmt.setLong(3, 0);
             stmt.execute();
             printWarnings(stmt);
-            ResultSet resultSet = stmt.getResultSet();
+            try (ResultSet resultSet = stmt.getResultSet()) {
-            resultSet.next();
+                resultSet.next();
-            log.info("Total telemetry removed stats by TTL for entities: [{}]", resultSet.getLong(1));
+                log.info("Total telemetry removed stats by TTL for entities: [{}]", resultSet.getLong(1));
+            }
         } catch (SQLException e) {
             log.error("SQLException occurred during timeseries TTL task execution ", e);
         }

dao/src/main/java/org/thingsboard/server/dao/sqlts/psql/JpaPsqlTimeseriesDao.java

@@ -35,6 +35,7 @@ import org.thingsboard.server.dao.timeseries.SqlTsPartitionDate;
 import org.thingsboard.server.dao.util.PsqlDao;
 import org.thingsboard.server.dao.util.SqlTsDao;
 
+import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -104,17 +105,18 @@ public class JpaPsqlTimeseriesDao extends AbstractChunkedAggregationTimeseriesDa
     }
 
     private void cleanupPartitions(long systemTtl) {
-        try {
+        log.info("Going to cleanup old timeseries data partitions using partition type: {} and ttl: {}s", partitioning, systemTtl);
-            log.info("Going to cleanup old timeseries data partitions using partition type: {} and ttl: {}s", partitioning, systemTtl);
+        try (Connection connection = dataSource.getConnection();
-            PreparedStatement stmt = dataSource.getConnection().prepareStatement("call drop_partitions_by_max_ttl(?,?,?)");
+             PreparedStatement stmt = connection.prepareStatement("call drop_partitions_by_max_ttl(?,?,?)")) {
             stmt.setString(1, partitioning);
             stmt.setLong(2, systemTtl);
             stmt.setLong(3, 0);
             stmt.execute();
             printWarnings(stmt);
-            ResultSet resultSet = stmt.getResultSet();
+            try (ResultSet resultSet = stmt.getResultSet()) {
-            resultSet.next();
+                resultSet.next();
-            log.info("Total partitions removed by TTL: [{}]", resultSet.getLong(1));
+                log.info("Total partitions removed by TTL: [{}]", resultSet.getLong(1));
+            }
         } catch (SQLException e) {
             log.error("SQLException occurred during TTL task execution ", e);
         }