Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated the conversion query to force index #160

Merged
merged 8 commits into from
Oct 23, 2024
Merged

Updated the conversion query to force index #160

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
46e964a
Updated the conversion query to force index
snake14 Sep 5, 2024
05f0ab1
Adding check for core version to avoid requiring minimum version incr…
snake14 Sep 9, 2024
19c742f
Switching to checking for core method instead of version
snake14 Sep 10, 2024
6d9c38c
Removing unused import statement
snake14 Oct 7, 2024
ff55722
Revert "Removing unused import statement"
snake14 Oct 18, 2024
696b8e9
Revert "Switching to checking for core method instead of version"
snake14 Oct 18, 2024
ea75dd6
Increasing Matomo version
snake14 Oct 18, 2024
0443e66
Merge branch '5.x-dev' into PG-3720-allow-force-index
snake14 Oct 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion RecordBuilders/CampaignReporting.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
use Piwik\DataTable;
use Piwik\Metrics;
use Piwik\Plugins\MarketingCampaignsReporting\Archiver;
use Piwik\Version;

class CampaignReporting extends RecordBuilder
{
Expand Down Expand Up @@ -76,7 +77,9 @@ protected function aggregate(ArchiveProcessor $archiveProcessor): array
protected function aggregateFromLogs(LogAggregator $logAggregator, array $records, $dimensions, $table, $aggregatorMethod): void
{
$whereClause = $table . ".referer_type = " . Common::REFERRER_TYPE_CAMPAIGN;
$query = $logAggregator->$aggregatorMethod($dimensions, $whereClause);
$query = $aggregatorMethod === 'queryConversionsByDimension' && version_compare(Version::VERSION, '5.2.0-b1', '>=')
? $logAggregator->$aggregatorMethod($dimensions, $whereClause, [], [], false, false, true)
: $logAggregator->$aggregatorMethod($dimensions, $whereClause);

$recordToDimensions = $this->getRecordToDimensions();

Expand Down
Loading