Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[rrd4j] Improve querying the RRD4jPersistenceService #16360

Merged
merged 1 commit into from
Feb 5, 2024
Merged

[rrd4j] Improve querying the RRD4jPersistenceService #16360

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 14 additions & 11 deletions ...e.rrd4j/src/main/java/org/openhab/persistence/rrd4j/internal/RRD4jPersistenceService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import java.util.function.DoubleFunction;
import java.util.stream.Collectors;
import java.util.stream.Stream;

Expand Down Expand Up @@ -443,6 +444,8 @@ public Iterable<HistoricItem> query(FilterCriteria filter) {
long end = filterEndDate == null ? System.currentTimeMillis() / 1000
: filterEndDate.toInstant().getEpochSecond();

DoubleFunction<State> toState = toStateMapper(item, unit);

try {
if (filterBeginDate == null) {
// as rrd goes back for years and gets more and more inaccurate, we only support descending order
Expand All @@ -455,8 +458,8 @@ public Iterable<HistoricItem> query(FilterCriteria filter) {
// we are asked only for the most recent value!
double lastValue = db.getLastDatasourceValue(DATASOURCE_STATE);
if (!Double.isNaN(lastValue)) {
HistoricItem rrd4jItem = new RRD4jItem(itemName, mapToState(lastValue, item, unit),
ZonedDateTime.ofInstant(Instant.ofEpochMilli(db.getLastArchiveUpdateTime() * 1000),
HistoricItem rrd4jItem = new RRD4jItem(itemName, toState.apply(lastValue),
ZonedDateTime.ofInstant(Instant.ofEpochSecond(db.getLastArchiveUpdateTime()),
ZoneId.systemDefault()));
return List.of(rrd4jItem);
} else {
Expand Down Expand Up @@ -486,13 +489,14 @@ public Iterable<HistoricItem> query(FilterCriteria filter) {

List<HistoricItem> items = new ArrayList<>();
long ts = result.getFirstTimestamp();
ZonedDateTime zdt = ZonedDateTime.ofInstant(Instant.ofEpochSecond(ts), ZoneId.systemDefault());
long step = result.getRowCount() > 1 ? result.getStep() : 0;
for (double value : result.getValues(DATASOURCE_STATE)) {
if (!Double.isNaN(value) && (((ts >= start) && (ts <= end)) || (start == end))) {
RRD4jItem rrd4jItem = new RRD4jItem(itemName, mapToState(value, item, unit),
ZonedDateTime.ofInstant(Instant.ofEpochSecond(ts), ZoneId.systemDefault()));
RRD4jItem rrd4jItem = new RRD4jItem(itemName, toState.apply(value), zdt);
items.add(rrd4jItem);
}
zdt = zdt.plusSeconds(step);
ts += step;
}
return items;
Expand Down Expand Up @@ -603,25 +607,24 @@ public ConsolFun getConsolidationFunction(RrdDb db) {
}
}

@SuppressWarnings({ "unchecked", "rawtypes" })
private State mapToState(double value, @Nullable Item item, @Nullable Unit unit) {
private <Q extends Quantity<Q>> DoubleFunction<State> toStateMapper(@Nullable Item item, @Nullable Unit<Q> unit) {
if (item instanceof GroupItem groupItem) {
item = groupItem.getBaseItem();
}

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) {
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) {
// 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) {
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) {
Expand Down