demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/openhab/openhab-addons.git synced 2025-02-09 13:57:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improved querying the RRD4jPersistenceService (#16360)

Browse Source 
Signed-off-by: Jörg Sautter <joerg.sautter@gmx.net>
This commit is contained in:
joerg1985 2024-02-05 10:38:56 +01:00 committed by GitHub
parent f45cff82d1
commit e3d5e5d999
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,6 +33,7 @@ import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture; import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.function.DoubleFunction;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
@ -443,6 +444,8 @@ public class RRD4jPersistenceService implements QueryablePersistenceService {
long end = filterEndDate == null ? System.currentTimeMillis() / 1000 long end = filterEndDate == null ? System.currentTimeMillis() / 1000
: filterEndDate.toInstant().getEpochSecond(); : filterEndDate.toInstant().getEpochSecond();
DoubleFunction<State> toState = toStateMapper(item, unit);
try { try {
if (filterBeginDate == null) { if (filterBeginDate == null) {
// as rrd goes back for years and gets more and more inaccurate, we only support descending order // as rrd goes back for years and gets more and more inaccurate, we only support descending order
@ -455,8 +458,8 @@ public class RRD4jPersistenceService implements QueryablePersistenceService {
// 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)) {
HistoricItem rrd4jItem = new RRD4jItem(itemName, mapToState(lastValue, item, unit), HistoricItem rrd4jItem = new RRD4jItem(itemName, toState.apply(lastValue),
ZonedDateTime.ofInstant(Instant.ofEpochMilli(db.getLastArchiveUpdateTime() * 1000), ZonedDateTime.ofInstant(Instant.ofEpochSecond(db.getLastArchiveUpdateTime()),
ZoneId.systemDefault())); ZoneId.systemDefault()));
return List.of(rrd4jItem); return List.of(rrd4jItem);
} else { } else {
@ -486,13 +489,14 @@ public class RRD4jPersistenceService implements QueryablePersistenceService {
List<HistoricItem> items = new ArrayList<>(); List<HistoricItem> items = new ArrayList<>();
long ts = result.getFirstTimestamp(); long ts = result.getFirstTimestamp();
ZonedDateTime zdt = ZonedDateTime.ofInstant(Instant.ofEpochSecond(ts), ZoneId.systemDefault());
long step = result.getRowCount() > 1 ? result.getStep() : 0; long step = result.getRowCount() > 1 ? result.getStep() : 0;
for (double value : result.getValues(DATASOURCE_STATE)) { for (double value : result.getValues(DATASOURCE_STATE)) {
if (!Double.isNaN(value) && (((ts >= start) && (ts <= end)) || (start == end))) { if (!Double.isNaN(value) && (((ts >= start) && (ts <= end)) || (start == end))) {
RRD4jItem rrd4jItem = new RRD4jItem(itemName, mapToState(value, item, unit), RRD4jItem rrd4jItem = new RRD4jItem(itemName, toState.apply(value), zdt);
ZonedDateTime.ofInstant(Instant.ofEpochSecond(ts), ZoneId.systemDefault()));
items.add(rrd4jItem); items.add(rrd4jItem);
} }
zdt = zdt.plusSeconds(step);
ts += step; ts += step;
} }
return items; return items;
@ -603,25 +607,24 @@ public class RRD4jPersistenceService implements QueryablePersistenceService {
} }
} }
@SuppressWarnings({ "unchecked", "rawtypes" }) private <Q extends Quantity<Q>> DoubleFunction<State> toStateMapper(@Nullable Item item, @Nullable Unit<Q> unit) {
private State mapToState(double value, @Nullable Item item, @Nullable Unit unit) {
if (item instanceof GroupItem groupItem) { if (item instanceof GroupItem groupItem) {
item = groupItem.getBaseItem(); item = groupItem.getBaseItem();
} }
if (item instanceof SwitchItem && !(item instanceof DimmerItem)) { if (item instanceof SwitchItem && !(item instanceof DimmerItem)) {
return OnOffType.from(value != 0.0d); return (value) -> OnOffType.from(value != 0.0d);
} else if (item instanceof ContactItem) { } else if (item instanceof ContactItem) {
return value == 0.0d ? OpenClosedType.CLOSED : OpenClosedType.OPEN; return (value) -> value == 0.0d ? OpenClosedType.CLOSED : OpenClosedType.OPEN;
} else if (item instanceof DimmerItem || item instanceof RollershutterItem || item instanceof ColorItem) { } else if (item instanceof DimmerItem || item instanceof RollershutterItem || item instanceof ColorItem) {
// make sure Items that need PercentTypes instead of DecimalTypes do receive the right information // make sure Items that need PercentTypes instead of DecimalTypes do receive the right information
return new PercentType((int) Math.round(value * 100)); return (value) -> new PercentType((int) Math.round(value * 100));
} else if (item instanceof NumberItem) { } else if (item instanceof NumberItem) {
if (unit != null) { if (unit != null) {
return new QuantityType(value, unit); return (value) -> new QuantityType<>(value, unit);
} }
} }
return new DecimalType(value); return DecimalType::new;
} }
private boolean isSupportedItemType(Item item) { private boolean isSupportedItemType(Item item) {