OilfieldToolsNet/shlink
4
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2024-11-22 08:56:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Move join on short URLs to tags sub-query

Browse Source
This commit is contained in:
Alejandro Celaya 2023-03-03 12:10:41 +01:00
parent f4d10df0f3
commit 7289833928
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
module/Core/src/Tag/Repository/TagRepository.php
View File

@ -47,7 +47,12 @@ class TagRepository extends EntitySpecificationRepository implements TagReposito
$conn = $this->getEntityManager()->getConnection(); $conn = $this->getEntityManager()->getConnection();
$tagsSubQb = $conn->createQueryBuilder(); $tagsSubQb = $conn->createQueryBuilder();
$tagsSubQb->select('t.id', 't.name')->from('tags', 't'); $tagsSubQb
->select('t.id', 't.name', 'COUNT(DISTINCT s.id) AS short_urls_count')
->from('tags', 't')
->leftJoin('t', 'short_urls_in_tags', 'st', $tagsSubQb->expr()->eq('st.tag_id', 't.id'))
->leftJoin('st', 'short_urls', 's', $tagsSubQb->expr()->eq('st.short_url_id', 's.id'))
->groupBy('t.id', 't.name');
if (! $orderMainQuery) { if (! $orderMainQuery) {
$tagsSubQb $tagsSubQb
@ -95,11 +100,6 @@ class TagRepository extends EntitySpecificationRepository implements TagReposito
}); });
// Apply API key specification to all sub-queries // Apply API key specification to all sub-queries
if ($apiKey && ! $apiKey->isAdmin()) {
$tagsSubQb
->join('t', 'short_urls_in_tags', 'st', $tagsSubQb->expr()->eq('st.tag_id', 't.id'))
->join('st', 'short_urls', 's', $tagsSubQb->expr()->eq('st.short_url_id', 's.id'));
}
$applyApiKeyToNativeQb($apiKey, $tagsSubQb); $applyApiKeyToNativeQb($apiKey, $tagsSubQb);
$applyApiKeyToNativeQb($apiKey, $allVisitsSubQb); $applyApiKeyToNativeQb($apiKey, $allVisitsSubQb);
$applyApiKeyToNativeQb($apiKey, $nonBotVisitsSubQb); $applyApiKeyToNativeQb($apiKey, $nonBotVisitsSubQb);
@ -113,21 +113,15 @@ class TagRepository extends EntitySpecificationRepository implements TagReposito
't.id AS id', 't.id AS id',
't.name AS name', 't.name AS name',
'COALESCE(v.visits, 0) AS visits', // COALESCE required for postgres to properly order 'COALESCE(v.visits, 0) AS visits', // COALESCE required for postgres to properly order
'COALESCE(v2.non_bot_visits, 0) AS non_bot_visits', // COALESCE required for postgres to properly order 'COALESCE(v2.non_bot_visits, 0) AS non_bot_visits',
'COUNT(DISTINCT s.id) AS short_urls_count', 'COALESCE(t.short_urls_count, 0) AS short_urls_count',
) )
->from('(' . $tagsSubQb->getSQL() . ')', 't') ->from('(' . $tagsSubQb->getSQL() . ')', 't')
->leftJoin('t', 'short_urls_in_tags', 'st', $mainQb->expr()->eq('t.id', 'st.tag_id'))
->leftJoin('st', 'short_urls', 's', $mainQb->expr()->eq('s.id', 'st.short_url_id'))
->leftJoin('t', '(' . $allVisitsSubQb->getSQL() . ')', 'v', $mainQb->expr()->eq('t.id', 'v.tag_id')) ->leftJoin('t', '(' . $allVisitsSubQb->getSQL() . ')', 'v', $mainQb->expr()->eq('t.id', 'v.tag_id'))
->leftJoin('t', '(' . $nonBotVisitsSubQb->getSQL() . ')', 'v2', $mainQb->expr()->eq( ->leftJoin('t', '(' . $nonBotVisitsSubQb->getSQL() . ')', 'v2', $mainQb->expr()->eq(
't.id', 't.id',
'v2.tag_id', 'v2.tag_id',
)) ));
->groupBy('t.id', 't.name', 'v.visits', 'v2.non_bot_visits');
// Apply API key role conditions to the native query too, as they will affect the amounts on the aggregates
$applyApiKeyToNativeQb($apiKey, $mainQb);
if ($orderMainQuery) { if ($orderMainQuery) {
$mainQb $mainQb