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

Fix refcounts

This commit is contained in:
Andrea Cavalli 2021-05-16 14:59:12 +02:00
parent d6c591d397
commit bce04a20a4
1 changed files with 84 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/main/lombok/org/warp/filesponge/DiskCache.java
View File

@ -32,6 +32,7 @@ import it.cavallium.dbengine.database.LLDictionaryResultType;
import it.cavallium.dbengine.database.LLKeyValueDatabase; import it.cavallium.dbengine.database.LLKeyValueDatabase;
import it.cavallium.dbengine.database.UpdateMode; import it.cavallium.dbengine.database.UpdateMode;
import it.cavallium.dbengine.database.UpdateReturnMode; import it.cavallium.dbengine.database.UpdateReturnMode;
import it.cavallium.dbengine.database.disk.LLLocalDictionary.ReleasableSlice;
import it.unimi.dsi.fastutil.booleans.BooleanArrayList; import it.unimi.dsi.fastutil.booleans.BooleanArrayList;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Arrays; import java.util.Arrays;
@ -76,8 +77,11 @@ public class DiskCache implements URLsDiskHandler, URLsWriter {
@Override @Override
public Mono<Void> writeMetadata(URL url, Metadata metadata) { public Mono<Void> writeMetadata(URL url, Metadata metadata) {
return fileMetadata return Mono
.update(url.getSerializer(db.getAllocator()).serialize(url), oldValue -> { .using(
() -> url.getSerializer(db.getAllocator()).serialize(url),
key -> fileMetadata
.update(key.retain(), oldValue -> {
if (oldValue != null) { if (oldValue != null) {
return oldValue; return oldValue;
} else { } else {
@ -86,7 +90,9 @@ public class DiskCache implements URLsDiskHandler, URLsWriter {
BooleanArrayList.wrap(new boolean[DiskMetadata.getBlocksCount(metadata.getSize(), BLOCK_SIZE)]) BooleanArrayList.wrap(new boolean[DiskMetadata.getBlocksCount(metadata.getSize(), BLOCK_SIZE)])
)); ));
} }
}, UpdateReturnMode.NOTHING) }, UpdateReturnMode.NOTHING),
ReferenceCounted::release
)
.then(); .then();
} }
@ -95,12 +101,20 @@ public class DiskCache implements URLsDiskHandler, URLsWriter {
return Mono return Mono
.fromCallable(dataBlock::getData) .fromCallable(dataBlock::getData)
.subscribeOn(Schedulers.boundedElastic()) .subscribeOn(Schedulers.boundedElastic())
.flatMap(bytes -> fileContent .flatMap(bytes -> Mono
.put(getBlockKey(url, dataBlock.getId()), bytes, LLDictionaryResultType.VOID) .using(
() -> getBlockKey(url, dataBlock.getId()),
key -> fileContent
.put(key.retain(), bytes, LLDictionaryResultType.VOID),
ReferenceCounted::release
)
.doOnNext(ReferenceCounted::release) .doOnNext(ReferenceCounted::release)
.then() .then()
) )
.then(fileMetadata.update(url.getSerializer(db.getAllocator()).serialize(url), prevBytes -> { .then(Mono
.using(
() -> url.getSerializer(db.getAllocator()).serialize(url),
key -> fileMetadata.update(key.retain(), prevBytes -> {
@Nullable DiskMetadata result; @Nullable DiskMetadata result;
if (prevBytes != null) { if (prevBytes != null) {
DiskMetadata prevMeta = diskMetadataSerializer.deserialize(prevBytes); DiskMetadata prevMeta = diskMetadataSerializer.deserialize(prevBytes);
@ -119,7 +133,10 @@ public class DiskCache implements URLsDiskHandler, URLsWriter {
} else { } else {
return null; return null;
} }
}, UpdateReturnMode.NOTHING)) }, UpdateReturnMode.NOTHING),
ReferenceCounted::release
)
)
.then(); .then();
} }
@ -137,7 +154,13 @@ public class DiskCache implements URLsDiskHandler, URLsWriter {
if (!downloaded) { if (!downloaded) {
return Mono.<DataBlock>empty(); return Mono.<DataBlock>empty();
} }
return fileContent.get(null, getBlockKey(url, blockId)).map(data -> { return Mono
.using(
() -> getBlockKey(url, blockId),
key -> fileContent.get(null, key.retain()),
ReferenceCounted::release
)
.map(data -> {
try { try {
int blockOffset = getBlockOffset(blockId); int blockOffset = getBlockOffset(blockId);
int blockLength = data.readableBytes(); int blockLength = data.readableBytes();
@ -170,8 +193,12 @@ public class DiskCache implements URLsDiskHandler, URLsWriter {
@Override @Override
public Mono<DiskMetadata> requestDiskMetadata(URL url) { public Mono<DiskMetadata> requestDiskMetadata(URL url) {
return fileMetadata return Mono
.get(null, url.getSerializer(db.getAllocator()).serialize(url)) .using(
() -> url.getSerializer(db.getAllocator()).serialize(url),
key -> fileMetadata.get(null, key.retain()),
ReferenceCounted::release
)
.map(diskMetadataSerializer::deserialize); .map(diskMetadataSerializer::deserialize);
} }
@ -183,8 +210,12 @@ public class DiskCache implements URLsDiskHandler, URLsWriter {
@Override @Override
public Mono<Tuple2<Metadata, Flux<DataBlock>>> request(URL url) { public Mono<Tuple2<Metadata, Flux<DataBlock>>> request(URL url) {
return fileMetadata return Mono
.get(null, url.getSerializer(db.getAllocator()).serialize(url)) .using(
() -> url.getSerializer(db.getAllocator()).serialize(url),
key -> fileMetadata.get(null, key.retain()),
ReferenceCounted::release
)
.map(diskMetadataSerializer::deserialize) .map(diskMetadataSerializer::deserialize)
.map(diskMeta -> { .map(diskMeta -> {
var meta = diskMeta.asMetadata(); var meta = diskMeta.asMetadata();