Browse Source

fix cleanup_timeseries_by_ttl procedure

pull/3417/head
Dmytro Shvaika 6 years ago
committed by Andrew Shvayka
parent
commit
f510b142a7
  1. 4
      application/src/main/data/upgrade/2.4.3/schema_update_ttl.sql
  2. 2
      application/src/main/java/org/thingsboard/server/service/install/PsqlTsDatabaseUpgradeService.java
  3. 4
      dao/src/main/resources/sql/schema-ts-psql.sql

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

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

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

@ -197,6 +197,8 @@ public class PsqlTsDatabaseUpgradeService extends AbstractSqlTsDatabaseUpgradeSe
break;
case "3.1.1":
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 ...");
loadSql(conn, LOAD_DROP_PARTITIONS_FUNCTIONS_SQL);
}

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

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

Loading…
Cancel
Save