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

code simplified

Browse Source
This commit is contained in:
ShvaykaD 2021-02-22 17:04:20 +02:00 committed by Andrew Shvayka
parent 0d28d6279c
commit b418b08d23
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,17 +116,12 @@ public class JpaPsqlTimeseriesDao extends AbstractChunkedAggregationTimeseriesDa
partitioningRepository.save(psqlPartition); partitioningRepository.save(psqlPartition);
log.trace("Adding partition to Set: {}", psqlPartition); log.trace("Adding partition to Set: {}", psqlPartition);
partitions.put(psqlPartition.getStart(), psqlPartition); partitions.put(psqlPartition.getStart(), psqlPartition);
} catch (Exception e) { } catch (DataIntegrityViolationException ex) {
log.trace("Error occurred during partition save:", e); log.trace("Error occurred during partition save:", ex);
if (e instanceof DataIntegrityViolationException) { if (ex.getCause() instanceof ConstraintViolationException) {
DataIntegrityViolationException ex = (DataIntegrityViolationException) e; log.warn("Saving partition [{}] rejected. Timeseries data will save to the ts_kv_indefinite (DEFAULT) partition.", psqlPartition.getPartitionDate());
Throwable cause = ex.getCause();
if (cause instanceof ConstraintViolationException) {
ConstraintViolationException constraintViolationException = (ConstraintViolationException) cause;
log.warn("Saving partition [{}] rejected: {}", psqlPartition.getPartitionDate(), constraintViolationException.getCause().getMessage());
partitions.put(psqlPartition.getStart(), psqlPartition); partitions.put(psqlPartition.getStart(), psqlPartition);
} }
}
} finally { } finally {
partitionCreationLock.unlock(); partitionCreationLock.unlock();
} }