andreacavalli/CavalliumDBEngine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use flatMapIterable when possible

Browse Source
This commit is contained in:
Andrea Cavalli 2021-07-31 18:00:53 +02:00
parent 7597e54bac
commit d411675c2b
4 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapDictionaryHashed.java
View File

@ -201,7 +201,7 @@ public class DatabaseMapDictionaryHashed<T, U, TH> implements DatabaseStageMap<T
.getAllValues(snapshot)
.map(Entry::getValue)
.map(Collections::unmodifiableSet)
.flatMap(Flux::fromIterable);
.concatMapIterable(list -> list);
}
@Override

90
src/main/java/it/cavallium/dbengine/database/disk/LLLocalDictionary.java
View File

@ -980,54 +980,54 @@ public class LLLocalDictionary implements LLDictionary {
keyBufsWindow.add(objects.getT2());
}
return Mono
.fromCallable(() -> {
Iterable<StampedLock> locks;
ArrayList<Long> stamps;
if (updateMode == UpdateMode.ALLOW) {
locks = itemsLock.bulkGetAt(getLockIndices(keyBufsWindow));
stamps = new ArrayList<>();
for (var lock : locks) {
.fromCallable(() -> {
Iterable<StampedLock> locks;
ArrayList<Long> stamps;
if (updateMode == UpdateMode.ALLOW) {
locks = itemsLock.bulkGetAt(getLockIndices(keyBufsWindow));
stamps = new ArrayList<>();
for (var lock : locks) {
stamps.add(lock.readLock());
}
stamps.add(lock.readLock());
}
} else {
locks = null;
stamps = null;
}
try {
var columnFamilyHandles = new RepeatedElementList<>(cfh, keysWindow.size());
var results = db.multiGetAsList(resolveSnapshot(snapshot), columnFamilyHandles, LLUtils.toArray(keyBufsWindow));
var mappedResults = new ArrayList<Tuple3<K, ByteBuf, Optional<ByteBuf>>>(results.size());
for (int i = 0; i < results.size(); i++) {
byte[] val = results.get(i);
Optional<ByteBuf> valueOpt;
if (val != null) {
results.set(i, null);
valueOpt = Optional.of(wrappedBuffer(val));
} else {
locks = null;
stamps = null;
valueOpt = Optional.empty();
}
try {
var columnFamilyHandles = new RepeatedElementList<>(cfh, keysWindow.size());
var results = db.multiGetAsList(resolveSnapshot(snapshot), columnFamilyHandles, LLUtils.toArray(keyBufsWindow));
var mappedResults = new ArrayList<Tuple3<K, ByteBuf, Optional<ByteBuf>>>(results.size());
for (int i = 0; i < results.size(); i++) {
byte[] val = results.get(i);
Optional<ByteBuf> valueOpt;
if (val != null) {
results.set(i, null);
valueOpt = Optional.of(wrappedBuffer(val));
} else {
valueOpt = Optional.empty();
}
mappedResults.add(Tuples.of(keysWindow.get(i).getT1(),
keyBufsWindow.get(i).retain(),
valueOpt
));
}
return mappedResults;
} finally {
if (updateMode == UpdateMode.ALLOW) {
int index = 0;
for (var lock : locks) {
lock.unlockRead(stamps.get(index));
index++;
}
}
mappedResults.add(Tuples.of(keysWindow.get(i).getT1(),
keyBufsWindow.get(i).retain(),
valueOpt
));
}
return mappedResults;
} finally {
if (updateMode == UpdateMode.ALLOW) {
int index = 0;
for (var lock : locks) {
lock.unlockRead(stamps.get(index));
index++;
}
})
.subscribeOn(dbScheduler)
.flatMapMany(Flux::fromIterable)
.onErrorMap(cause -> new IOException("Failed to read keys "
+ Arrays.deepToString(keyBufsWindow.toArray(ByteBuf[]::new)), cause))
.doAfterTerminate(() -> keyBufsWindow.forEach(ReferenceCounted::release));
}
}
})
.subscribeOn(dbScheduler)
.flatMapIterable(list -> list)
.onErrorMap(cause -> new IOException("Failed to read keys "
+ Arrays.deepToString(keyBufsWindow.toArray(ByteBuf[]::new)), cause))
.doAfterTerminate(() -> keyBufsWindow.forEach(ReferenceCounted::release));
}, 2) // Max concurrency is 2 to read data while preparing the next segment
.doOnDiscard(Entry.class, discardedEntry -> {
//noinspection unchecked
@ -1243,7 +1243,7 @@ public class LLLocalDictionary implements LLDictionary {
}
})
.subscribeOn(dbScheduler)
.flatMapMany(Flux::fromIterable);
.concatMapIterable(list -> list);
},
entriesWindow -> {
for (Tuple2<ByteBuf, X> entry : entriesWindow) {

6
src/test/java/it/cavallium/dbengine/TestDictionaryMap.java
View File

@ -477,7 +477,7 @@ public class TestDictionaryMap {
.flatMapMany(map -> Flux
.concat(map.setAndGetPrevious(entries), map.setAndGetPrevious(entries))
.map(Map::entrySet)
.flatMap(Flux::fromIterable)
.concatMapIterable(list -> list)
.doAfterTerminate(map::release)
)
));
@ -502,7 +502,7 @@ public class TestDictionaryMap {
.flatMapMany(map -> Flux
.concat(map.set(entries).then(Mono.empty()), map.clearAndGetPrevious(), map.get(null))
.map(Map::entrySet)
.flatMap(Flux::fromIterable)
.concatMapIterable(list -> list)
.doAfterTerminate(map::release)
)
));
@ -555,7 +555,7 @@ public class TestDictionaryMap {
map.putMulti(Flux.fromIterable(entries.entrySet())).then(Mono.empty()),
map.get(null)
.map(Map::entrySet)
.flatMapMany(Flux::fromIterable)
.flatMapIterable(list -> list)
)
.doAfterTerminate(map::release)
)

6
src/test/java/it/cavallium/dbengine/TestDictionaryMapDeep.java
View File

@ -822,7 +822,7 @@ public class TestDictionaryMapDeep {
map.setAndGetPrevious(entries)
)
.map(Map::entrySet)
.flatMap(Flux::fromIterable)
.concatMapIterable(list -> list)
.doAfterTerminate(map::release)
)
));
@ -847,7 +847,7 @@ public class TestDictionaryMapDeep {
.flatMapMany(map -> Flux
.concat(map.set(entries).then(Mono.empty()), map.clearAndGetPrevious(), map.get(null))
.map(Map::entrySet)
.flatMap(Flux::fromIterable)
.concatMapIterable(list -> list)
.doAfterTerminate(map::release)
)
));
@ -900,7 +900,7 @@ public class TestDictionaryMapDeep {
map.putMulti(Flux.fromIterable(entries.entrySet())).then(Mono.empty()),
map.get(null)
.map(Map::entrySet)
.flatMapMany(Flux::fromIterable)
.flatMapIterable(list -> list)
)
.doAfterTerminate(map::release)
)