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 #94

Merged
merged 8 commits into from
Oct 23, 2024
Merged

Updated the conversion query to force index #94

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0bd3270
Updated the conversion query to force index
snake14 Sep 5, 2024
9787b4e
Adding check for core version to avoid requiring minimum version incr…
snake14 Sep 9, 2024
2f55592
Switching to checking for core method instead of version
snake14 Sep 10, 2024
f81fc3e
Removing unused import statement
snake14 Oct 7, 2024
01d150e
Revert "Removing unused import statement"
snake14 Oct 18, 2024
2104d83
Revert "Switching to checking for core method instead of version"
snake14 Oct 18, 2024
5989c39
Increasing Matomo version
snake14 Oct 18, 2024
9f665db
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/CustomVariables.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
use Piwik\Plugins\CustomVariables\Archiver;
use Piwik\Plugins\CustomVariables\Model;
use Piwik\Tracker\GoalManager;
use Piwik\Version;

class CustomVariables extends RecordBuilder
{
Expand Down Expand Up @@ -95,7 +96,9 @@ protected function aggregateCustomVariable(DataTable $record, array &$metadata,
$query = $logAggregator->queryActionsByDimension($dimensions, $where, $additionalSelects);
$this->aggregateFromActions($record, $metadata, $metadataFlat, $query, $keyField, $valueField);

$query = $logAggregator->queryConversionsByDimension($dimensions, $where);
$query = version_compare(Version::VERSION, '5.2.0-b6', '>=')
? $logAggregator->queryConversionsByDimension($dimensions, $where, [], [], false, false, true)
: $logAggregator->queryConversionsByDimension($dimensions, $where);
$this->aggregateFromConversions($record, $query, $keyField, $valueField);
}

Expand Down
Loading