dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix cleanup_timeseries_by_ttl procedure

Browse Source
This commit is contained in:
Dmytro Shvaika 2020-09-01 20:48:45 +03:00 committed by Andrew Shvayka
parent f647c69f50
commit f510b142a7
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/src/main/data/upgrade/2.4.3/schema_update_ttl.sql
View File

@ -59,8 +59,8 @@ $$
DECLARE DECLARE
tenant_cursor CURSOR FOR select tenant.id as tenant_id tenant_cursor CURSOR FOR select tenant.id as tenant_id
from tenant; from tenant;
tenant_id_record varchar; tenant_id_record uuid;
customer_id_record varchar; customer_id_record uuid;
tenant_ttl bigint; tenant_ttl bigint;
customer_ttl bigint; customer_ttl bigint;
deleted_for_entities bigint; deleted_for_entities bigint;

2
application/src/main/java/org/thingsboard/server/service/install/PsqlTsDatabaseUpgradeService.java
View File

@ -197,6 +197,8 @@ public class PsqlTsDatabaseUpgradeService extends AbstractSqlTsDatabaseUpgradeSe
break; break;
case "3.1.1": case "3.1.1":
try (Connection conn = DriverManager.getConnection(dbUrl, dbUserName, dbPassword)) { try (Connection conn = DriverManager.getConnection(dbUrl, dbUserName, dbPassword)) {
log.info("Load TTL functions ...");
loadSql(conn, LOAD_TTL_FUNCTIONS_SQL);
log.info("Load Drop Partitions functions ..."); log.info("Load Drop Partitions functions ...");
loadSql(conn, LOAD_DROP_PARTITIONS_FUNCTIONS_SQL); loadSql(conn, LOAD_DROP_PARTITIONS_FUNCTIONS_SQL);
} }

4
dao/src/main/resources/sql/schema-ts-psql.sql
View File

@ -188,8 +188,8 @@ $$
DECLARE DECLARE
tenant_cursor CURSOR FOR select tenant.id as tenant_id tenant_cursor CURSOR FOR select tenant.id as tenant_id
from tenant; from tenant;
tenant_id_record varchar; tenant_id_record uuid;
customer_id_record varchar; customer_id_record uuid;
tenant_ttl bigint; tenant_ttl bigint;
customer_ttl bigint; customer_ttl bigint;
deleted_for_entities bigint; deleted_for_entities bigint;