From b418b08d234b95c488a2b8ef76dbb22eeb6367f0 Mon Sep 17 00:00:00 2001 From: ShvaykaD Date: Mon, 22 Feb 2021 17:04:20 +0200 Subject: [PATCH] code simplified --- .../dao/sqlts/psql/JpaPsqlTimeseriesDao.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/dao/src/main/java/org/thingsboard/server/dao/sqlts/psql/JpaPsqlTimeseriesDao.java b/dao/src/main/java/org/thingsboard/server/dao/sqlts/psql/JpaPsqlTimeseriesDao.java index cec5a5a15f..c751c4a129 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sqlts/psql/JpaPsqlTimeseriesDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sqlts/psql/JpaPsqlTimeseriesDao.java @@ -116,16 +116,11 @@ public class JpaPsqlTimeseriesDao extends AbstractChunkedAggregationTimeseriesDa partitioningRepository.save(psqlPartition); log.trace("Adding partition to Set: {}", psqlPartition); partitions.put(psqlPartition.getStart(), psqlPartition); - } catch (Exception e) { - log.trace("Error occurred during partition save:", e); - if (e instanceof DataIntegrityViolationException) { - DataIntegrityViolationException ex = (DataIntegrityViolationException) e; - 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); - } + } catch (DataIntegrityViolationException ex) { + log.trace("Error occurred during partition save:", ex); + if (ex.getCause() instanceof ConstraintViolationException) { + log.warn("Saving partition [{}] rejected. Timeseries data will save to the ts_kv_indefinite (DEFAULT) partition.", psqlPartition.getPartitionDate()); + partitions.put(psqlPartition.getStart(), psqlPartition); } } finally { partitionCreationLock.unlock();