Browse Source

Minor improvements

pull/12159/head
Andrii Landiak 2 years ago
parent
commit
954ce237b1
  1. 15
      application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java
  2. 1
      dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java

15
application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java

@ -106,20 +106,7 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
log.warn("Failed to execute update script for device profile rule nodes due to: ", e);
}
}
case "3.8.1" -> {
updateSchema("3.8.1", 3008001, "3.9.0", 3009000);
try {
execute("UPDATE tenant_profile " +
"SET profile_data = jsonb_set(profile_data, '{configuration, maxEdges}', " +
" to_jsonb(COALESCE(NULLIF((profile_data -> 'configuration' ->> 'maxDevices')::integer, 0), 0)), true " +
") " +
"WHERE NOT (profile_data -> 'configuration' ? 'maxEdges');",
false);
} catch (Exception e) {
log.warn("Failed to update tenant_profile with maxEdges configuration due to: ", e);
}
}
case "3.8.1" -> updateSchema("3.8.1", 3008001, "3.9.0", 3009000);
default -> throw new RuntimeException("Unsupported fromVersion '" + fromVersion + "'");
}
}

1
dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java

@ -259,6 +259,7 @@ public class EdgeServiceImpl extends AbstractCachedEntityService<EdgeCacheKey, E
edgeDao.removeById(tenantId, edgeId.getId());
publishEvictEvent(new EdgeCacheEvictEvent(edge.getTenantId(), edge.getName(), null));
countService.publishCountEntityEvictEvent(tenantId, EntityType.EDGE);
eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(tenantId).entityId(edgeId).build());
}

Loading…
Cancel
Save