quantranhong1999 commented on code in PR #1705:
URL: https://github.com/apache/james-project/pull/1705#discussion_r1307371035
##########
server/data/data-jmap/src/main/java/org/apache/james/jmap/api/upload/UploadServiceDefaultImpl.java:
##########
@@ -20,34 +20,106 @@
package org.apache.james.jmap.api.upload;
import java.io.InputStream;
+import java.security.SecureRandom;
+import java.util.Comparator;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Predicate;
import javax.inject.Inject;
import javax.inject.Singleton;
import org.apache.james.core.Username;
+import org.apache.james.core.quota.QuotaSizeUsage;
import org.apache.james.jmap.api.model.Upload;
import org.apache.james.jmap.api.model.UploadId;
import org.apache.james.jmap.api.model.UploadMetaData;
import org.apache.james.mailbox.model.ContentType;
+import org.apache.james.util.ReactorUtils;
import org.reactivestreams.Publisher;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
public class UploadServiceDefaultImpl implements UploadService {
+ private static final int LOW_CONCURRENCY = 4;
- private final UploadRepository repository;
+ private final UploadRepository uploadRepository;
+ private final UploadUsageRepository uploadUsageRepository;
+ private final JmapUploadQuotaConfiguration jmapUploadQuotaConfiguration;
+ private final SecureRandom secureRandom;
@Inject
@Singleton
- public UploadServiceDefaultImpl(UploadRepository repository) {
- this.repository = repository;
+ public UploadServiceDefaultImpl(UploadRepository uploadRepository,
+ UploadUsageRepository
uploadUsageRepository,
+ JmapUploadQuotaConfiguration
jmapUploadQuotaConfiguration) {
+ this.uploadRepository = uploadRepository;
+ this.uploadUsageRepository = uploadUsageRepository;
+ this.jmapUploadQuotaConfiguration = jmapUploadQuotaConfiguration;
+ this.secureRandom = new SecureRandom();
}
@Override
public Publisher<UploadMetaData> upload(InputStream data, ContentType
contentType, Username user) {
- return repository.upload(data, contentType, user);
+ return Mono.from(uploadRepository.upload(data, contentType, user))
+ .flatMap(upload ->
Mono.from(uploadUsageRepository.increaseSpace(user,
QuotaSizeUsage.size(upload.sizeAsLong())))
+ .thenReturn(upload))
+ .doOnSuccess(uploaded -> cleanupUploadIfNeeded(user)
+ .subscribeOn(ReactorUtils.BLOCKING_CALL_WRAPPER)
+ .subscribe());
}
@Override
public Publisher<Upload> retrieve(UploadId id, Username user) {
- return repository.retrieve(id, user);
+ return uploadRepository.retrieve(id, user);
+ }
+
+ private Mono<Void> cleanupUploadIfNeeded(Username username) {
+ return Mono.from(uploadUsageRepository.getSpaceUsage(username))
+ .map(QuotaSizeUsage::asLong)
+ .filter(quotaExceededPredicate())
+ .switchIfEmpty(Mono.empty())
+ .flatMap(quotaExceeded -> cleanupUpload(username, quotaExceeded));
+ }
+
+ private Predicate<Long> quotaExceededPredicate() {
+ return currentUploadUsage -> currentUploadUsage >
jmapUploadQuotaConfiguration.getUploadQuotaLimitInBytes();
+ }
+
+ private Mono<Void> cleanupUpload(Username username, long
currentUploadUsage) {
+ long minimumSpaceToClean = currentUploadUsage -
jmapUploadQuotaConfiguration.getUploadQuotaLimitInBytes() / 2;
+ AtomicLong cleanedSpace = new AtomicLong(0L);
+
+ if (shouldPerformReadRepair()) {
+ return Flux.from(uploadRepository.listUploads(username))
+ .sort(Comparator.comparing(UploadMetaData::uploadDate))
+ .flatMap(upload -> {
+ if (cleanedSpace.get() < minimumSpaceToClean) {
+ return
Mono.from(uploadRepository.delete(upload.uploadId(), username))
+
.then(Mono.from(uploadUsageRepository.decreaseSpace(username,
QuotaSizeUsage.size(upload.sizeAsLong()))))
+ .then(Mono.fromCallable(() ->
cleanedSpace.addAndGet(upload.sizeAsLong())))
+ .then(Mono.empty());
+ } else {
+ return Mono.fromCallable(() -> upload);
+ }
+ }, LOW_CONCURRENCY)
+ .map(UploadMetaData::sizeAsLong)
+ .reduce(Long::sum)
+ .filter(totalSpaceUsed -> totalSpaceUsed != currentUploadUsage)
+ .flatMap(totalSpaceUsed ->
Mono.from(uploadUsageRepository.resetSpace(username,
+ QuotaSizeUsage.size(totalSpaceUsed))))
+ .then();
+ } else {
+ return Flux.from(uploadRepository.listUploads(username))
+ .sort(Comparator.comparing(UploadMetaData::uploadDate))
Review Comment:
I think the code WITHOUT read repair is somehow still better. Because it
will terminate iterating the uploads list as soon as the 50% space condition is
met. Meanwhile, the code WITH read repair still needs to iterate through all
the uploads list to calculate the usage sum.
I will try to write a perf unit test to see if there is any diff.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
