public
/
openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[rrd4j] Reliably get the latest value, if the filter end date is set to "now" (#16059) 

Signed-off-by: Kai Kreuzer <kai@openhab.org>
This commit is contained in:
Kai Kreuzer 2023-12-14 07:23:49 +01:00 committed by GitHub
parent 969518a077
commit ea3e608c81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bundles/org.openhab.persistence.rrd4j/src/main/java/org/openhab/persistence/rrd4j/internal/RRD4jPersistenceService.java
View File

@ -15,6 +15,7 @@ package org.openhab.persistence.rrd4j.internal;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.time.Duration;
import java.time.Instant; import java.time.Instant;
import java.time.ZoneId; import java.time.ZoneId;
import java.time.ZonedDateTime; import java.time.ZonedDateTime;
@ -444,15 +445,13 @@ public class RRD4jPersistenceService implements QueryablePersistenceService {
try { try {
if (filterBeginDate == null) { if (filterBeginDate == null) {
// as rrd goes back for years and gets more and more // as rrd goes back for years and gets more and more inaccurate, we only support descending order
// inaccurate, we only support descending order // and a single return value if no begin date is given - this case is required specifically for the
// and a single return value // historicState() query, which we want to support
// if there is no begin date is given - this case is
// required specifically for the historicState()
// query, which we want to support
if (filter.getOrdering() == Ordering.DESCENDING && filter.getPageSize() == 1 if (filter.getOrdering() == Ordering.DESCENDING && filter.getPageSize() == 1
&& filter.getPageNumber() == 0) { && filter.getPageNumber() == 0) {
if (filterEndDate == null) { if (filterEndDate == null || Duration.between(filterEndDate, ZonedDateTime.now()).getSeconds() < db
.getRrdDef().getStep()) {
// we are asked only for the most recent value! // we are asked only for the most recent value!
double lastValue = db.getLastDatasourceValue(DATASOURCE_STATE); double lastValue = db.getLastDatasourceValue(DATASOURCE_STATE);
if (!Double.isNaN(lastValue)) { if (!Double.isNaN(lastValue)) {