From 88307d6ef1bfd599fb46f3f68b46662856b95a7a Mon Sep 17 00:00:00 2001 From: David Date: Thu, 16 Aug 2018 12:03:12 +0300 Subject: [PATCH] address issue Add partition granularity to time series data #1006 https://github.com/thingsboard/thingsboard/issues/1006 --- .../CassandraBaseTimeseriesDao.java | 37 +++++++++++++------ .../dao/timeseries/TsPartitionDate.java | 7 +++- 2 files changed, 32 insertions(+), 12 deletions(-) diff --git a/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java b/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java index 7aa317cbf9..591023443c 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java @@ -54,10 +54,7 @@ import javax.annotation.PreDestroy; import java.time.Instant; import java.time.LocalDateTime; import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Optional; +import java.util.*; import java.util.stream.Collectors; import static com.datastax.driver.core.querybuilder.QueryBuilder.eq; @@ -76,6 +73,9 @@ public class CassandraBaseTimeseriesDao extends CassandraAbstractAsyncDao implem public static final String SELECT_PREFIX = "SELECT "; public static final String EQUALS_PARAM = " = ? "; + + private static List FIXED_PARTITION = Arrays.asList(new Long[]{0l}); + @Autowired private Environment environment; @@ -163,14 +163,28 @@ public class CassandraBaseTimeseriesDao extends CassandraAbstractAsyncDao implem } } + public boolean isFixedPartitioning(){ + return tsFormat.getTruncateUnit().equals(TsPartitionDate.FIXED_PARTITION); + } + + private ListenableFuture> getPartitionsFuture(TsKvQuery query, EntityId entityId, long minPartition, long maxPartition){ + + if(isFixedPartitioning()){ //no need to fetch partitions from DB + return Futures.immediateFuture(FIXED_PARTITION); + } + ResultSetFuture partitionsFuture = fetchPartitions(entityId, query.getKey(), minPartition, maxPartition); + + return Futures.transform(partitionsFuture, getPartitionsArrayFunction(), readResultsProcessingExecutor); + + } + private ListenableFuture> findAllAsyncWithLimit(EntityId entityId, TsKvQuery query) { + long minPartition = toPartitionTs(query.getStartTs()); long maxPartition = toPartitionTs(query.getEndTs()); - ResultSetFuture partitionsFuture = fetchPartitions(entityId, query.getKey(), minPartition, maxPartition); - + final ListenableFuture> partitionsListFuture = getPartitionsFuture(query,entityId,minPartition,maxPartition); final SimpleListenableFuture> resultFuture = new SimpleListenableFuture<>(); - final ListenableFuture> partitionsListFuture = Futures.transform(partitionsFuture, getPartitionsArrayFunction(), readResultsProcessingExecutor); Futures.addCallback(partitionsListFuture, new FutureCallback>() { @Override @@ -181,7 +195,7 @@ public class CassandraBaseTimeseriesDao extends CassandraAbstractAsyncDao implem @Override public void onFailure(Throwable t) { - log.error("[{}][{}] Failed to fetch partitions for interval {}-{}", entityId.getEntityType().name(), entityId.getId(), minPartition, maxPartition, t); + log.error("[{}][{}] Failed to fetch partitions for interval {}-{}", entityId.getEntityType().name(), entityId.getId(), toPartitionTs(query.getStartTs()), toPartitionTs(query.getEndTs()), t); } }, readResultsProcessingExecutor); @@ -229,10 +243,8 @@ public class CassandraBaseTimeseriesDao extends CassandraAbstractAsyncDao implem final long endTs = query.getEndTs(); final long ts = startTs + (endTs - startTs) / 2; - ResultSetFuture partitionsFuture = fetchPartitions(entityId, key, minPartition, maxPartition); - - ListenableFuture> partitionsListFuture = Futures.transform(partitionsFuture, getPartitionsArrayFunction(), readResultsProcessingExecutor); + ListenableFuture> partitionsListFuture = getPartitionsFuture(query,entityId, minPartition, maxPartition); ListenableFuture> aggregationChunks = Futures.transformAsync(partitionsListFuture, getFetchChunksAsyncFunction(entityId, key, aggregation, startTs, endTs), readResultsProcessingExecutor); @@ -308,6 +320,9 @@ public class CassandraBaseTimeseriesDao extends CassandraAbstractAsyncDao implem @Override public ListenableFuture savePartition(EntityId entityId, long tsKvEntryTs, String key, long ttl) { + if(isFixedPartitioning()){ + return getFuture(null, rs -> null); + } ttl = computeTtl(ttl); long partition = toPartitionTs(tsKvEntryTs); log.debug("Saving partition {} for the entity [{}-{}] and key {}", partition, entityId.getEntityType(), entityId.getId(), key); diff --git a/dao/src/main/java/org/thingsboard/server/dao/timeseries/TsPartitionDate.java b/dao/src/main/java/org/thingsboard/server/dao/timeseries/TsPartitionDate.java index 4148004dad..d9dfc7dc93 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/timeseries/TsPartitionDate.java +++ b/dao/src/main/java/org/thingsboard/server/dao/timeseries/TsPartitionDate.java @@ -16,22 +16,25 @@ package org.thingsboard.server.dao.timeseries; import java.time.LocalDateTime; +import java.time.ZoneOffset; import java.time.temporal.ChronoUnit; import java.time.temporal.TemporalUnit; import java.util.Optional; public enum TsPartitionDate { - MINUTES("yyyy-MM-dd-HH-mm", ChronoUnit.MINUTES), HOURS("yyyy-MM-dd-HH", ChronoUnit.HOURS), DAYS("yyyy-MM-dd", ChronoUnit.DAYS), MONTHS("yyyy-MM", ChronoUnit.MONTHS), YEARS("yyyy", ChronoUnit.YEARS); + MINUTES("yyyy-MM-dd-HH-mm", ChronoUnit.MINUTES), HOURS("yyyy-MM-dd-HH", ChronoUnit.HOURS), DAYS("yyyy-MM-dd", ChronoUnit.DAYS), MONTHS("yyyy-MM", ChronoUnit.MONTHS), YEARS("yyyy", ChronoUnit.YEARS),INDEFINITE("",ChronoUnit.FOREVER); private final String pattern; private final transient TemporalUnit truncateUnit; + public final static LocalDateTime FIXED_PARTITION = LocalDateTime.ofEpochSecond(0,0, ZoneOffset.UTC); TsPartitionDate(String pattern, TemporalUnit truncateUnit) { this.pattern = pattern; this.truncateUnit = truncateUnit; } + public String getPattern() { return pattern; } @@ -46,6 +49,8 @@ public enum TsPartitionDate { return time.truncatedTo(ChronoUnit.DAYS).withDayOfMonth(1); case YEARS: return time.truncatedTo(ChronoUnit.DAYS).withDayOfYear(1); + case INDEFINITE: + return FIXED_PARTITION; default: return time.truncatedTo(truncateUnit); }