mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 09:52:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

[REFACTOR] Inline capability check for ProtectedStorageEntries

Browse Source 
Move the capability check inside the stream operation. This should
improve performance slightly, but more importantly it makes the
two filter functions almost identical so they can be combined.
This commit is contained in:
Julian Knutsen 2019-11-21 10:21:37 -08:00
parent 703a9a0ddd
commit 3aaf8a285e
No known key found for this signature in database
GPG Key ID: D85F536DB3615B2D
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
p2p/src/main/java/bisq/network/p2p/storage/P2PDataStorage.java
View File

@ -289,33 +289,19 @@ public class P2PDataStorage implements MessageListener, ConnectionListener, Pers
int maxEntries,
AtomicBoolean outProtectedStorageEntryOutputTruncated,
Capabilities peerCapabilities) {
Set<ProtectedStorageEntry> filteredDataSet = new HashSet<>();
AtomicInteger maxSize = new AtomicInteger(maxEntries);
Set<P2PDataStorage.ByteArray> excludedKeysAsByteArray = P2PDataStorage.ByteArray.convertBytesSetToByteArraySet(getDataRequest.getExcludedKeys());
Set<ProtectedStorageEntry> filteredSet = this.map.entrySet().stream()
.filter(e -> !excludedKeysAsByteArray.contains(e.getKey()))
.filter(e -> maxSize.decrementAndGet() >= 0)
.map(Map.Entry::getValue)
.filter(protectedStorageEntry -> shouldTransmitPayloadToPeer(peerCapabilities, protectedStorageEntry.getProtectedStoragePayload()))
.collect(Collectors.toSet());
if (maxSize.get() <= 0)
outProtectedStorageEntryOutputTruncated.set(true);
for (ProtectedStorageEntry protectedStorageEntry : filteredSet) {
final ProtectedStoragePayload protectedStoragePayload = protectedStorageEntry.getProtectedStoragePayload();
boolean doAdd = false;
if (protectedStoragePayload instanceof CapabilityRequiringPayload) {
if (shouldTransmitPayloadToPeer(peerCapabilities, protectedStoragePayload))
doAdd = true;
} else {
doAdd = true;
}
if (doAdd) {
filteredDataSet.add(protectedStorageEntry);
}
}
return filteredDataSet;
return filteredSet;
}