Commit a7012e261fc5edff80e439ae71f95998d86be685
Merge branch 'master' of github.com:thingsboard/thingsboard
Showing
1 changed file
with
2 additions
and
1 deletions
| @@ -57,6 +57,7 @@ import javax.annotation.PreDestroy; | @@ -57,6 +57,7 @@ import javax.annotation.PreDestroy; | ||
| 57 | import java.time.Instant; | 57 | import java.time.Instant; |
| 58 | import java.time.LocalDateTime; | 58 | import java.time.LocalDateTime; |
| 59 | import java.time.ZoneOffset; | 59 | import java.time.ZoneOffset; |
| 60 | +import java.time.temporal.ChronoUnit; | ||
| 60 | import java.util.ArrayList; | 61 | import java.util.ArrayList; |
| 61 | import java.util.Arrays; | 62 | import java.util.Arrays; |
| 62 | import java.util.Collections; | 63 | import java.util.Collections; |
| @@ -175,7 +176,7 @@ public class CassandraBaseTimeseriesDao extends CassandraAbstractAsyncDao implem | @@ -175,7 +176,7 @@ public class CassandraBaseTimeseriesDao extends CassandraAbstractAsyncDao implem | ||
| 175 | } | 176 | } |
| 176 | 177 | ||
| 177 | public boolean isFixedPartitioning() { | 178 | public boolean isFixedPartitioning() { |
| 178 | - return tsFormat.getTruncateUnit().equals(TsPartitionDate.EPOCH_START); | 179 | + return tsFormat.getTruncateUnit().equals(ChronoUnit.FOREVER); |
| 179 | } | 180 | } |
| 180 | 181 | ||
| 181 | private ListenableFuture<List<Long>> getPartitionsFuture(TenantId tenantId, ReadTsKvQuery query, EntityId entityId, long minPartition, long maxPartition) { | 182 | private ListenableFuture<List<Long>> getPartitionsFuture(TenantId tenantId, ReadTsKvQuery query, EntityId entityId, long minPartition, long maxPartition) { |