aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private
diff options
context:
space:
mode:
authorRobin Appelman <robin@icewind.nl>2024-09-09 16:59:59 +0200
committerRobin Appelman <robin@icewind.nl>2024-09-09 16:59:59 +0200
commitda59fd4389bedd6b643f277b5e411872137569b3 (patch)
tree89a6c3cac4b2f066d104e633439a3709cd0797ad /lib/private
parent0f732199d22cf85d991f48389c33fb6e76b7eefc (diff)
downloadnextcloud-server-da59fd4389bedd6b643f277b5e411872137569b3.tar.gz
nextcloud-server-da59fd4389bedd6b643f277b5e411872137569b3.zip
fix: misc code fixes around db shardingsharding-code-fixes
Signed-off-by: Robin Appelman <robin@icewind.nl>
Diffstat (limited to 'lib/private')
-rw-r--r--lib/private/DB/QueryBuilder/ExtendedQueryBuilder.php4
-rw-r--r--lib/private/DB/QueryBuilder/QueryBuilder.php6
-rw-r--r--lib/private/DB/QueryBuilder/Sharded/ShardedQueryBuilder.php4
-rw-r--r--lib/private/Files/Cache/Cache.php2
-rw-r--r--lib/private/Memcache/Factory.php5
-rw-r--r--lib/private/Preview/BackgroundCleanupJob.php1
6 files changed, 11 insertions, 11 deletions
diff --git a/lib/private/DB/QueryBuilder/ExtendedQueryBuilder.php b/lib/private/DB/QueryBuilder/ExtendedQueryBuilder.php
index c40cadfbdb5..f928132a123 100644
--- a/lib/private/DB/QueryBuilder/ExtendedQueryBuilder.php
+++ b/lib/private/DB/QueryBuilder/ExtendedQueryBuilder.php
@@ -289,12 +289,12 @@ abstract class ExtendedQueryBuilder implements IQueryBuilder {
return $this->builder->executeStatement($connection);
}
- public function hintShardKey(string $column, mixed $value, bool $overwrite = false) {
+ public function hintShardKey(string $column, mixed $value, bool $overwrite = false): self {
$this->builder->hintShardKey($column, $value, $overwrite);
return $this;
}
- public function runAcrossAllShards() {
+ public function runAcrossAllShards(): self {
$this->builder->runAcrossAllShards();
return $this;
}
diff --git a/lib/private/DB/QueryBuilder/QueryBuilder.php b/lib/private/DB/QueryBuilder/QueryBuilder.php
index 5c7e273c9ec..e975d4907ef 100644
--- a/lib/private/DB/QueryBuilder/QueryBuilder.php
+++ b/lib/private/DB/QueryBuilder/QueryBuilder.php
@@ -560,7 +560,7 @@ class QueryBuilder implements IQueryBuilder {
return $this;
}
- private function addOutputColumns(array $columns) {
+ private function addOutputColumns(array $columns): void {
foreach ($columns as $column) {
if (is_array($column)) {
$this->addOutputColumns($column);
@@ -1370,11 +1370,11 @@ class QueryBuilder implements IQueryBuilder {
return $this->connection->escapeLikeParameter($parameter);
}
- public function hintShardKey(string $column, mixed $value, bool $overwrite = false) {
+ public function hintShardKey(string $column, mixed $value, bool $overwrite = false): self {
return $this;
}
- public function runAcrossAllShards() {
+ public function runAcrossAllShards(): self {
// noop
return $this;
}
diff --git a/lib/private/DB/QueryBuilder/Sharded/ShardedQueryBuilder.php b/lib/private/DB/QueryBuilder/Sharded/ShardedQueryBuilder.php
index e7bc70ce440..e5b66470de0 100644
--- a/lib/private/DB/QueryBuilder/Sharded/ShardedQueryBuilder.php
+++ b/lib/private/DB/QueryBuilder/Sharded/ShardedQueryBuilder.php
@@ -296,7 +296,7 @@ class ShardedQueryBuilder extends ExtendedQueryBuilder {
];
}
- public function hintShardKey(string $column, mixed $value, bool $overwrite = false) {
+ public function hintShardKey(string $column, mixed $value, bool $overwrite = false): self {
if ($overwrite) {
$this->primaryKeys = [];
$this->shardKeys = [];
@@ -310,7 +310,7 @@ class ShardedQueryBuilder extends ExtendedQueryBuilder {
return $this;
}
- public function runAcrossAllShards() {
+ public function runAcrossAllShards(): self {
$this->allShards = true;
return $this;
}
diff --git a/lib/private/Files/Cache/Cache.php b/lib/private/Files/Cache/Cache.php
index a8d9067050d..ab6ba2d64d6 100644
--- a/lib/private/Files/Cache/Cache.php
+++ b/lib/private/Files/Cache/Cache.php
@@ -1207,7 +1207,7 @@ class Cache implements ICache {
}
}
- private function moveFromStorageSharded(ShardDefinition $shardDefinition, ICache $sourceCache, ICacheEntry $sourceEntry, $targetPath) {
+ private function moveFromStorageSharded(ShardDefinition $shardDefinition, ICache $sourceCache, ICacheEntry $sourceEntry, $targetPath): void {
if ($sourceEntry->getMimeType() === ICacheEntry::DIRECTORY_MIMETYPE) {
$fileIds = $this->getChildIds($sourceCache->getNumericStorageId(), $sourceEntry->getPath());
} else {
diff --git a/lib/private/Memcache/Factory.php b/lib/private/Memcache/Factory.php
index 931c871d0f1..370130912d6 100644
--- a/lib/private/Memcache/Factory.php
+++ b/lib/private/Memcache/Factory.php
@@ -6,6 +6,7 @@
*/
namespace OC\Memcache;
+use Closure;
use OCP\Cache\CappedMemoryCache;
use OCP\ICache;
use OCP\ICacheFactory;
@@ -40,7 +41,7 @@ class Factory implements ICacheFactory {
private IProfiler $profiler;
/**
- * @param callable $globalPrefixClosure
+ * @param Closure $globalPrefixClosure
* @param LoggerInterface $logger
* @param ?class-string<ICache> $localCacheClass
* @param ?class-string<ICache> $distributedCacheClass
@@ -48,7 +49,7 @@ class Factory implements ICacheFactory {
* @param string $logFile
*/
public function __construct(
- private $globalPrefixClosure,
+ private Closure $globalPrefixClosure,
LoggerInterface $logger,
IProfiler $profiler,
?string $localCacheClass = null,
diff --git a/lib/private/Preview/BackgroundCleanupJob.php b/lib/private/Preview/BackgroundCleanupJob.php
index acf7bf22f52..44832a78eb9 100644
--- a/lib/private/Preview/BackgroundCleanupJob.php
+++ b/lib/private/Preview/BackgroundCleanupJob.php
@@ -16,7 +16,6 @@ use OCP\Files\IMimeTypeLoader;
use OCP\Files\NotFoundException;
use OCP\Files\NotPermittedException;
use OCP\IDBConnection;
-use function Symfony\Component\Translation\t;
class BackgroundCleanupJob extends TimedJob {
/** @var IDBConnection */