Merge branch 'master' of github.com:thingsboard/thingsboard

@@ -506,6 +506,8 @@ spring:
       repositories:
       repositories:
         enabled: "true"
         enabled: "true"
   jpa:
   jpa:
+    properties:
+      javax.persistence.query.timeout: "${JAVAX_PERSISTENCE_QUERY_TIMEOUT:30000}"
     open-in-view: "false"
     open-in-view: "false"
     hibernate:
     hibernate:
       ddl-auto: "none"
       ddl-auto: "none"

@@ -44,6 +44,7 @@ import java.util.Optional;
 import java.util.UUID;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.concurrent.locks.ReentrantLock;
 
 
@@ -148,6 +149,7 @@ public class JpaBaseEdgeEventDao extends JpaAbstractSearchTextDao<EdgeEventEntit
              PreparedStatement stmt = connection.prepareStatement("call cleanup_edge_events_by_ttl(?,?)")) {
              PreparedStatement stmt = connection.prepareStatement("call cleanup_edge_events_by_ttl(?,?)")) {
             stmt.setLong(1, ttl);
             stmt.setLong(1, ttl);
             stmt.setLong(2, 0);
             stmt.setLong(2, 0);
+            stmt.setQueryTimeout((int) TimeUnit.HOURS.toSeconds(1));
             stmt.execute();
             stmt.execute();
             printWarnings(stmt);
             printWarnings(stmt);
             try (ResultSet resultSet = stmt.getResultSet()) {
             try (ResultSet resultSet = stmt.getResultSet()) {

@@ -23,6 +23,7 @@ import org.thingsboard.server.dao.util.HsqlDao;
 import java.sql.Connection;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.SQLException;
+import java.util.concurrent.TimeUnit;
 
 
 @Slf4j
 @Slf4j
 @HsqlDao
 @HsqlDao
@@ -35,6 +36,7 @@ public class HsqlEventCleanupRepository extends JpaAbstractDaoListeningExecutorS
         try (Connection connection = dataSource.getConnection();
         try (Connection connection = dataSource.getConnection();
              PreparedStatement stmt = connection.prepareStatement("DELETE FROM event WHERE ts < ? AND event_type != 'DEBUG_RULE_NODE' AND event_type != 'DEBUG_RULE_CHAIN'")) {
              PreparedStatement stmt = connection.prepareStatement("DELETE FROM event WHERE ts < ? AND event_type != 'DEBUG_RULE_NODE' AND event_type != 'DEBUG_RULE_CHAIN'")) {
             stmt.setLong(1, otherExpirationTime);
             stmt.setLong(1, otherExpirationTime);
+            stmt.setQueryTimeout((int) TimeUnit.HOURS.toSeconds(1));
             stmt.execute();
             stmt.execute();
         } catch (SQLException e) {
         } catch (SQLException e) {
             log.error("SQLException occurred during events TTL task execution ", e);
             log.error("SQLException occurred during events TTL task execution ", e);
@@ -43,6 +45,7 @@ public class HsqlEventCleanupRepository extends JpaAbstractDaoListeningExecutorS
         try (Connection connection = dataSource.getConnection();
         try (Connection connection = dataSource.getConnection();
              PreparedStatement stmt = connection.prepareStatement("DELETE FROM event WHERE ts < ? AND (event_type = 'DEBUG_RULE_NODE' OR event_type = 'DEBUG_RULE_CHAIN')")) {
              PreparedStatement stmt = connection.prepareStatement("DELETE FROM event WHERE ts < ? AND (event_type = 'DEBUG_RULE_NODE' OR event_type = 'DEBUG_RULE_CHAIN')")) {
             stmt.setLong(1, debugExpirationTime);
             stmt.setLong(1, debugExpirationTime);
+            stmt.setQueryTimeout((int) TimeUnit.HOURS.toSeconds(1));
             stmt.execute();
             stmt.execute();
         } catch (SQLException e) {
         } catch (SQLException e) {
             log.error("SQLException occurred during events TTL task execution ", e);
             log.error("SQLException occurred during events TTL task execution ", e);

@@ -24,6 +24,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.SQLException;
+import java.util.concurrent.TimeUnit;
 
 
 @Slf4j
 @Slf4j
 @PsqlDao
 @PsqlDao
@@ -37,6 +38,7 @@ public class PsqlEventCleanupRepository extends JpaAbstractDaoListeningExecutorS
             stmt.setLong(1, otherEventsTtl);
             stmt.setLong(1, otherEventsTtl);
             stmt.setLong(2, debugEventsTtl);
             stmt.setLong(2, debugEventsTtl);
             stmt.setLong(3, 0);
             stmt.setLong(3, 0);
+            stmt.setQueryTimeout((int) TimeUnit.HOURS.toSeconds(1));
             stmt.execute();
             stmt.execute();
             printWarnings(stmt);
             printWarnings(stmt);
             try (ResultSet resultSet = stmt.getResultSet()){
             try (ResultSet resultSet = stmt.getResultSet()){

@@ -74,6 +74,7 @@ public abstract class AbstractSqlTimeseriesDao extends BaseAbstractSqlTimeseries
             stmt.setObject(1, ModelConstants.NULL_UUID);
             stmt.setObject(1, ModelConstants.NULL_UUID);
             stmt.setLong(2, systemTtl);
             stmt.setLong(2, systemTtl);
             stmt.setLong(3, 0);
             stmt.setLong(3, 0);
+            stmt.setQueryTimeout((int) TimeUnit.HOURS.toSeconds(1));
             stmt.execute();
             stmt.execute();
             printWarnings(stmt);
             printWarnings(stmt);
             try (ResultSet resultSet = stmt.getResultSet()) {
             try (ResultSet resultSet = stmt.getResultSet()) {

@@ -47,6 +47,7 @@ import java.time.format.DateTimeFormatter;
 import java.util.Map;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.concurrent.locks.ReentrantLock;
 
 
 @Component
 @Component
@@ -111,6 +112,7 @@ public class JpaPsqlTimeseriesDao extends AbstractChunkedAggregationTimeseriesDa
             stmt.setString(1, partitioning);
             stmt.setString(1, partitioning);
             stmt.setLong(2, systemTtl);
             stmt.setLong(2, systemTtl);
             stmt.setLong(3, 0);
             stmt.setLong(3, 0);
+            stmt.setQueryTimeout((int) TimeUnit.HOURS.toSeconds(1));
             stmt.execute();
             stmt.execute();
             printWarnings(stmt);
             printWarnings(stmt);
             try (ResultSet resultSet = stmt.getResultSet()) {
             try (ResultSet resultSet = stmt.getResultSet()) {