From 98b8fde2f0bd0dff1fb375651b9869c265d9d6fd Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Thu, 11 May 2023 20:02:14 +0800 Subject: [PATCH] Remove unnecessary double declaration of namespace in bulkpropagatorjob Signed-off-by: Claudio Cambra --- src/libsync/bulkpropagatorjob.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/libsync/bulkpropagatorjob.cpp b/src/libsync/bulkpropagatorjob.cpp index f34fd8593..941c9c52b 100644 --- a/src/libsync/bulkpropagatorjob.cpp +++ b/src/libsync/bulkpropagatorjob.cpp @@ -33,12 +33,6 @@ #include #include -namespace OCC { - -Q_LOGGING_CATEGORY(lcBulkPropagatorJob, "nextcloud.sync.propagator.bulkupload", QtInfoMsg) - -} - namespace { QByteArray getEtagFromJsonReply(const QJsonObject &reply) @@ -65,14 +59,15 @@ QByteArray getHeaderFromJsonReply(const QJsonObject &reply, const QByteArray &he } constexpr auto batchSize = 100; - constexpr auto parallelJobsMaximumCount = 1; + } namespace OCC { -BulkPropagatorJob::BulkPropagatorJob(OwncloudPropagator *propagator, - const std::deque &items) +Q_LOGGING_CATEGORY(lcBulkPropagatorJob, "nextcloud.sync.propagator.bulkupload", QtInfoMsg) + +BulkPropagatorJob::BulkPropagatorJob(OwncloudPropagator *propagator, const std::deque &items) : PropagatorJob(propagator) , _items(items) { @@ -230,6 +225,7 @@ void BulkPropagatorJob::triggerUpload() adjustLastJobTimeout(job, timeout); _jobs.append(job); job->start(); + if (parallelism() == PropagatorJob::JobParallelism::FullParallelism && _jobs.size() < parallelJobsMaximumCount) { scheduleSelfOrChild(); } -- 2.30.2