From 5820c5446bdaa5b5a2f5851115d6c98ee4bf0bcb Mon Sep 17 00:00:00 2001
From: Alejandro Santana Lima <14906933+gotelgest@users.noreply.github.com>
Date: Mon, 25 Jan 2021 08:49:02 +0100
Subject: [PATCH] Do not load all data if it is not in the current time
 interval

---
 .../subscription/DefaultSubscriptionManagerService.java       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/subscription/DefaultSubscriptionManagerService.java b/application/src/main/java/org/thingsboard/server/service/subscription/DefaultSubscriptionManagerService.java
index 844db92de8..b73641e9ad 100644
--- a/application/src/main/java/org/thingsboard/server/service/subscription/DefaultSubscriptionManagerService.java
+++ b/application/src/main/java/org/thingsboard/server/service/subscription/DefaultSubscriptionManagerService.java
@@ -434,7 +434,9 @@ public class DefaultSubscriptionManagerService extends TbApplicationEventListene
             if (curTs > value) {
                 long startTs = subscription.getStartTime() > 0 ? Math.max(subscription.getStartTime(), value + 1L) : (value + 1L);
                 long endTs = subscription.getEndTime() > 0 ? Math.min(subscription.getEndTime(), curTs) : curTs;
-                queries.add(new BaseReadTsKvQuery(key, startTs, endTs, 0, 1000, Aggregation.NONE));
+                if (startTs > 1) {
+                    queries.add(new BaseReadTsKvQuery(key, startTs, endTs, 0, 1000, Aggregation.NONE));
+                }
             }
         });
         if (!queries.isEmpty()) {