Commit d6abca0096f07ff6342cab3d8341ded7b4ade5af
Committed by
GitHub
Merge pull request #4022 from AndrewVolosytnykhThingsboard/cassandraBaseTimeseriesDaoFix
CassandraBaseTimeseriesDao init method fix (revert)
Showing
1 changed file
with
9 additions
and
9 deletions
... | ... | @@ -116,16 +116,16 @@ public class CassandraBaseTimeseriesDao extends AbstractCassandraBaseTimeseriesD |
116 | 116 | super.startExecutor(); |
117 | 117 | if (!isInstall()) { |
118 | 118 | getFetchStmt(Aggregation.NONE, DESC_ORDER); |
119 | - Optional<NoSqlTsPartitionDate> partition = NoSqlTsPartitionDate.parse(partitioning); | |
120 | - if (partition.isPresent()) { | |
121 | - tsFormat = partition.get(); | |
122 | - if (!isFixedPartitioning() && partitionsCacheSize > 0) { | |
123 | - cassandraTsPartitionsCache = new CassandraTsPartitionsCache(partitionsCacheSize); | |
124 | - } | |
125 | - } else { | |
126 | - log.warn("Incorrect configuration of partitioning {}", partitioning); | |
127 | - throw new RuntimeException("Failed to parse partitioning property: " + partitioning + "!"); | |
119 | + } | |
120 | + Optional<NoSqlTsPartitionDate> partition = NoSqlTsPartitionDate.parse(partitioning); | |
121 | + if (partition.isPresent()) { | |
122 | + tsFormat = partition.get(); | |
123 | + if (!isFixedPartitioning() && partitionsCacheSize > 0) { | |
124 | + cassandraTsPartitionsCache = new CassandraTsPartitionsCache(partitionsCacheSize); | |
128 | 125 | } |
126 | + } else { | |
127 | + log.warn("Incorrect configuration of partitioning {}", partitioning); | |
128 | + throw new RuntimeException("Failed to parse partitioning property: " + partitioning + "!"); | |
129 | 129 | } |
130 | 130 | } |
131 | 131 | ... | ... |