Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Simplify the query to calculate lifetime emails

Browse Source 
Also rename email_counts to email_count and update tests

[MAILPOET-4177]
This commit is contained in:
Brezo Cordero
2022-03-30 14:17:24 -05:00
committed by Veljko V
parent 9e8aaec6c9
commit 8077322a29
7 changed files with 59 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
mailpoet/lib/Subscribers/SubscribersEmailCountsController.php
View File

@@ -4,14 +4,11 @@ namespace MailPoet\Subscribers;
use MailPoet\Entities\ScheduledTaskEntity;
use MailPoet\Entities\ScheduledTaskSubscriberEntity;
use MailPoet\Entities\SendingQueueEntity;
use MailPoet\Entities\SubscriberEntity;
use MailPoetVendor\Carbon\Carbon;
use MailPoetVendor\Doctrine\ORM\EntityManager;
class SubscribersEmailCountsController {
private $processedTaskIdsTableCreated = false;
/** @var EntityManager */
private $entityManager;
@@ -26,7 +23,6 @@ class SubscribersEmailCountsController {
}
public function updateSubscribersEmailCounts(?\DateTimeInterface $dateLastProcessed, int $batchSize, ?int $startId = null): array {
$sendingQueuesTable = $this->entityManager->getClassMetadata(SendingQueueEntity::class)->getTableName();
$scheduledTasksTable = $this->entityManager->getClassMetadata(ScheduledTaskEntity::class)->getTableName();
$scheduledTaskSubscribersTable = $this->entityManager->getClassMetadata(ScheduledTaskSubscriberEntity::class)->getTableName();
@@ -42,66 +38,39 @@ class SubscribersEmailCountsController {
return [0, 0];
}
// Temporary table with processed tasks from threshold date up to yesterday
$processedTaskIdsTable = 'processed_task_ids';
if (!$this->processedTaskIdsTableCreated) {
$queryParams = [];
$processedTaskIdsTableSql = "
CREATE TEMPORARY TABLE IF NOT EXISTS {$processedTaskIdsTable}
(INDEX task_id_ids (id))
SELECT DISTINCT task_id as id FROM {$sendingQueuesTable} as sq
JOIN {$scheduledTasksTable} as st ON sq.task_id = st.id
WHERE st.processed_at IS NOT NULL
AND st.processed_at < :dayAgo";
$queryParams['dayAgo'] = $dayAgoIso;
if ($dateLastProcessed) {
$processedTaskIdsTableSql .= " AND st.processed_at >= :dateFrom";
$carbonDateLastProcessed = Carbon::createFromTimestamp($dateLastProcessed->getTimestamp());
$dateFromIso = ($carbonDateLastProcessed->subDay())->toDateTimeString();
$queryParams['dateFrom'] = $dateFromIso;
}
$resultQuery = $connection->executeQuery($processedTaskIdsTableSql, $queryParams);
$this->processedTaskIdsTableCreated = true;
if ($resultQuery->rowCount() === 0) return [0,0];
$queryParams = [
'startId' => $startId,
'endId' => $endId,
'dayAgo' => $dayAgoIso,
];
if ($dateLastProcessed) {
$carbonDateLastProcessed = Carbon::createFromTimestamp($dateLastProcessed->getTimestamp());
$dateFromIso = ($carbonDateLastProcessed->subDay())->toDateTimeString();
$queryParams['dateFrom'] = $dateFromIso;
}
// Temporary table needed for UPDATE query
// mySQL does not allow to modify the same table used in the select
$subscriberIdsEmailsCountTmpTable = 'subscribers_ids_email_counts';
$connection->executeQuery("
CREATE TEMPORARY TABLE IF NOT EXISTS {$subscriberIdsEmailsCountTmpTable}
(UNIQUE subscriber_id (id))
SELECT s.id, count(task_ids.id) as emails_count from {$this->subscribersTable} s
JOIN {$scheduledTaskSubscribersTable} sts ON s.id = sts.subscriber_id
JOIN {$processedTaskIdsTable} task_ids ON task_ids.id = sts.task_id
WHERE s.id >= :startId
AND s.id <= :endId
GROUP BY s.id
",
[
'startId' => $startId,
'endId' => $endId,
]
);
// If $dateLastProcessed provided, increment value, otherwise count all and reset value
$initUpdateValue = $dateLastProcessed ? 's.emails_count' : '';
$updateQuery = $connection->executeQuery("
$initUpdateValue = $dateLastProcessed ? 's.email_count' : '';
$dateLastProcessedSql = $dateLastProcessed ? ' AND st.processed_at >= :dateFrom' : '';
$connection->executeQuery("
UPDATE {$this->subscribersTable} as s
JOIN {$subscriberIdsEmailsCountTmpTable} as sc ON s.id = sc.id
SET s.emails_count = {$initUpdateValue} + IFNULL(sc.emails_count, 0)
WHERE s.id >= :startId
AND s.id <= :endId
JOIN (
SELECT s.id, COUNT(st.id) as email_count
FROM {$this->subscribersTable} as s
JOIN {$scheduledTaskSubscribersTable} as sts ON s.id = sts.subscriber_id
JOIN {$scheduledTasksTable} as st ON st.id = sts.task_id
WHERE s.id >= :startId
AND s.id <= :endId
AND st.type = 'sending'
AND st.processed_at IS NOT NULL
AND st.processed_at < :dayAgo
{$dateLastProcessedSql}
GROUP BY s.id
) counts ON counts.id = s.id
SET s.email_count = {$initUpdateValue} + IFNULL(counts.email_count, 0)
",
[
'startId' => $startId,
'endId' => $endId,
]
$queryParams
);
$connection->executeQuery("DROP TABLE {$subscriberIdsEmailsCountTmpTable}");
return [$countSubscribersToUpdate, $endId];
}