eliseuamaro
/
gnu-social
forked from GNUsocial/gnu-social
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[CACHE][ENTITY][Actor] Refactor Actor so that all cache keys are kept in one cacheKeys function, so that we can more easily be certain there are no mismatches in cache keys between gets and deletes

This commit is contained in:
Hugo Sales 2021-12-09 21:59:49 +00:00
parent 4d2230ff43
commit ab9dd1db77
Signed by untrusted user: someonewithpc
GPG Key ID: 7D0C7EAFC9D835A0
1 changed files with 47 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
src/Entity/Actor.php
View File

@ -230,6 +230,19 @@ class Actor extends Entity
// @codeCoverageIgnoreEnd // @codeCoverageIgnoreEnd
// }}} Autocode // }}} Autocode
public static function cacheKeys(int $actor_id, mixed $other = null): array
{
return [
'id' => "actor-id-{$actor_id}",
'nickname' => "actor-nickname-id-{$actor_id}",
'fullname' => "actor-fullname-id-{$actor_id}",
'tags' => \is_null($other) ? "actor-circles-and-tags-{$actor_id}" : "actor-circles-and-tags-{$actor_id}-by-{$other}", // $other is $context_id
'subscriber' => "subscriber-{$actor_id}",
'subscribed' => "subscribed-{$actor_id}",
'relative-nickname' => "actor-{$actor_id}-relative-nickname-{$other}", // $other is $nickname
];
}
public function getLocalUser() public function getLocalUser()
{ {
if ($this->getIsLocal()) { if ($this->getIsLocal()) {
@ -257,17 +270,17 @@ class Actor extends Entity
public static function getById(int $id): ?self public static function getById(int $id): ?self
{ {
return Cache::get('actor-id-' . $id, fn () => DB::find('actor', ['id' => $id])); return Cache::get(self::cacheKeys($id)['id'], fn () => DB::find('actor', ['id' => $id]));
} }
public static function getNicknameById(int $id): string public static function getNicknameById(int $id): string
{ {
return Cache::get('actor-nickname-id-' . $id, fn () => self::getById($id)->getNickname()); return Cache::get(self::cacheKeys($id)['nickname'], fn () => self::getById($id)->getNickname());
} }
public static function getFullnameById(int $id): ?string public static function getFullnameById(int $id): ?string
{ {
return Cache::get('actor-fullname-id-' . $id, fn () => self::getById($id)->getFullname()); return Cache::get(self::cacheKeys($id)['fullname'], fn () => self::getById($id)->getFullname());
} }
/** /**
@ -285,26 +298,26 @@ class Actor extends Entity
*/ */
public function getSelfTags(bool $_test_force_recompute = false): array public function getSelfTags(bool $_test_force_recompute = false): array
{ {
return $this->getOtherTags(scoped: $this->getId(), _test_force_recompute: $_test_force_recompute); return $this->getOtherTags(context: $this->getId(), _test_force_recompute: $_test_force_recompute);
} }
/** /**
* Get tags that other people put on this actor, in reverse-chron order * Get tags that other people put on this actor, in reverse-chron order
* *
* @param null|Actor|int $scoped Actor we are requesting as: * @param null|Actor|int $context Actor we are requesting as:
* - If null = All tags attributed to self by other actors (excludes self tags) * - If null = All tags attributed to self by other actors (excludes self tags)
* - If self = Same as getSelfTags * - If self = Same as getSelfTags
* - otherwise = Tags that $scoped attributed to $this * - otherwise = Tags that $context attributed to $this
* @param null|int $offset Offset from latest * @param null|int $offset Offset from latest
* @param null|int $limit Max number to get * @param null|int $limit Max number to get
* *
* @return array<int, array> [ActorCircle[], ActorTag[]] resulting lists * @return array<int, array> [ActorCircle[], ActorTag[]] resulting lists
*/ */
public function getOtherTags(self|int|null $scoped = null, ?int $offset = null, ?int $limit = null, bool $_test_force_recompute = false): array public function getOtherTags(self|int|null $context = null, ?int $offset = null, ?int $limit = null, bool $_test_force_recompute = false): array
{ {
if (\is_null($scoped)) { if (\is_null($context)) {
return Cache::get( return Cache::get(
"actor-circles-and-tags-{$this->getId()}", self::cacheKeys($this->getId())['tags'],
fn () => DB::dql( fn () => DB::dql(
<<< 'EOQ' <<< 'EOQ'
SELECT circle, tag SELECT circle, tag
@ -320,9 +333,9 @@ class Actor extends Entity
), ),
); );
} else { } else {
$scoped_id = \is_int($scoped) ? $scoped : $scoped->getId(); $context_id = \is_int($context) ? $context : $context->getId();
return Cache::get( return Cache::get(
"actor-circles-and-tags-{$this->getId()}-by-{$scoped_id}", self::cacheKeys($this->getId(), $context_id)['tags'],
fn () => DB::dql( fn () => DB::dql(
<<< 'EOQ' <<< 'EOQ'
SELECT circle, tag SELECT circle, tag
@ -339,7 +352,7 @@ class Actor extends Entity
) )
ORDER BY tag.modified DESC, tag.tagged DESC ORDER BY tag.modified DESC, tag.tagged DESC
EOQ, EOQ,
['id' => $this->getId(), 'scoped' => $scoped_id], ['id' => $this->getId(), 'scoped' => $context_id],
options: ['offset' => $offset, 'limit' => $limit], options: ['offset' => $offset, 'limit' => $limit],
), ),
); );
@ -374,35 +387,30 @@ class Actor extends Entity
DB::removeBy('actor_tag', ['tagger' => $this->getId(), 'tagged' => $this->getId(), 'canonical' => $canonical_tag]); DB::removeBy('actor_tag', ['tagger' => $this->getId(), 'tagged' => $this->getId(), 'canonical' => $canonical_tag]);
DB::removeBy('actor_circle', ['tagger' => $this->getId(), 'tag' => $canonical_tag]); // TODO only remove if unused DB::removeBy('actor_circle', ['tagger' => $this->getId(), 'tag' => $canonical_tag]); // TODO only remove if unused
} }
Cache::delete("selftags-{$this->getId()}"); Cache::delete(self::cacheKeys($this->getId())['tags']);
Cache::delete("othertags-{$this->getId()}-by-{$this->getId()}"); Cache::delete(self::cacheKeys($this->getId(), $this->getId())['tags']);
return $this; return $this;
} }
public function getSubscribersCount() private function getSubCount(string $which, string $column): int
{ {
return Cache::get( return Cache::get(
'subscribers-' . $this->id, self::cacheKeys($this->getId())[$which],
function () { fn () => DB::dql(
return DB::dql( "select count(s) from subscription s where s.{$column} = :{$column}", // Not injecting the parameter value
'select count(f) from App\Entity\Subscription f where f.subscribed = :subscribed', [$column => $this->getId()],
['subscribed' => $this->id], )[0][1] - ($this->getIsLocal() ? 1 : 0), // Remove self subscription if local
)[0][1] - 1; // Remove self subscription
},
); );
} }
public function getSubscribersCount(): int
{
return $this->getSubCount(which: 'subscriber', column: 'subscribed');
}
public function getSubscribedCount() public function getSubscribedCount()
{ {
return Cache::get( return $this->getSubCount(which: 'subscribed', column: 'subscriber');
'subscribed-' . $this->id,
function () {
return DB::dql(
'select count(f) from App\Entity\Subscription f where f.subscriber = :subscriber',
['subscriber' => $this->id],
)[0][1] - 1; // Remove self subscription
},
);
} }
public function isPerson(): bool public function isPerson(): bool
@ -425,12 +433,12 @@ class Actor extends Entity
// Will throw exception on invalid input. // Will throw exception on invalid input.
$nickname = Nickname::normalize($nickname, check_already_used: false); $nickname = Nickname::normalize($nickname, check_already_used: false);
return Cache::get( return Cache::get(
'relative-nickname-' . $nickname . '-' . $this->getId(), self::cacheKeys($this->getId(), $nickname)['relative-nickname'],
fn () => DB::dql( fn () => DB::dql(
<<<'EOF' <<<'EOF'
select a from actor a where select a from actor a where
a.id in (select fa.subscribed from subscription fa join actor aa with fa.subscribed = aa.id where fa.subscriber = :actor_id and aa.nickname = :nickname) or a.id in (select fa.subscribed from subscription fa join actor aa with fa.subscribed = aa.id where fa.subscriber = :actor_id and aa.nickname = :nickname) or
a.id in (select fb.subscriber from subscription fb join actor ab with fb.subscriber = ab.id where fb.subscribed = :actor_id and ab.nickname = :nickname) or a.id in (select fb.subscriber from subscription fb join actor ab with fb.subscriber = ab.id where fb.subscribed = :actor_id and ab.nickname = :nickname) or
a.nickname = :nickname a.nickname = :nickname
EOF, EOF,
['nickname' => $nickname, 'actor_id' => $this->getId()], ['nickname' => $nickname, 'actor_id' => $this->getId()],