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

[rrd4j] Improved the internal data structure #16389

Merged
merged 1 commit into from
Feb 17, 2024
Merged

[rrd4j] Improved the internal data structure #16389

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 17 additions & 7 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 @@ -25,6 +25,7 @@
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentSkipListMap;
Expand Down Expand Up @@ -102,6 +103,15 @@
QueryablePersistenceService.class }, configurationPid = "org.openhab.rrd4j", configurationPolicy = ConfigurationPolicy.OPTIONAL)
public class RRD4jPersistenceService implements QueryablePersistenceService {

private record Key(long timestamp, String name) implements Comparable<Key> {
@Override
public int compareTo(Key other) {
int c = Long.compare(timestamp, other.timestamp);

return (c == 0) ? Objects.compare(name, other.name, String::compareTo) : c;
}
}

public static final String SERVICE_ID = "rrd4j";

private static final String DEFAULT_OTHER = "default_other";
Expand All @@ -116,7 +126,7 @@ public class RRD4jPersistenceService implements QueryablePersistenceService {

private final Map<String, RrdDefConfig> rrdDefs = new ConcurrentHashMap<>();

private final ConcurrentSkipListMap<Long, Map<String, Double>> storageMap = new ConcurrentSkipListMap<>();
private final ConcurrentSkipListMap<Key, Double> storageMap = new ConcurrentSkipListMap<>(Key::compareTo);

private static final String DATASOURCE_STATE = "state";

Expand Down Expand Up @@ -318,7 +328,7 @@ public void store(final Item item, @Nullable final String alias) {
}

long now = System.currentTimeMillis() / 1000;
Double oldValue = storageMap.computeIfAbsent(now, t -> new ConcurrentHashMap<>()).put(name, value);
Double oldValue = storageMap.put(new Key(now, name), value);
if (oldValue != null && !oldValue.equals(value)) {
logger.debug(
"Discarding value {} for item {} with timestamp {} because a new value ({}) arrived with the same timestamp.",
Expand All @@ -327,14 +337,14 @@ public void store(final Item item, @Nullable final String alias) {
}

private void doStore(boolean force) {
long now = System.currentTimeMillis() / 1000;
while (!storageMap.isEmpty()) {
long timestamp = storageMap.firstKey();
long now = System.currentTimeMillis() / 1000;
if (now > timestamp || force) {
Key key = storageMap.firstKey();
if (now > key.timestamp || force) {
// no new elements can be added for this timestamp because we are already past that time or the service
// requires forced storing
Map<String, Double> values = storageMap.pollFirstEntry().getValue();
values.forEach((name, value) -> writePointToDatabase(name, value, timestamp));
Double value = storageMap.pollFirstEntry().getValue();
writePointToDatabase(key.name, value, key.timestamp);
} else {
return;
}
Expand Down
Loading