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.

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

Add new config datatable_archiving_maximum_rows_site_search #14112

Merged
merged 14 commits into from Apr 5, 2019
Merged

Conversation

katebutler
Copy link

Add new config datatable_archiving_maximum_rows_site_search to control number of rows archived for site search data table.

Fixes #14087

@@ -228,7 +228,8 @@ public static function getRankingQueryLimit()
$limit = $configLimit == 0 ? 0 : max(
$configLimit,
$configGeneral['datatable_archiving_maximum_rows_actions'],
$configGeneral['datatable_archiving_maximum_rows_subtable_actions']
$configGeneral['datatable_archiving_maximum_rows_subtable_actions'],
$configGeneral['datatable_archiving_maximum_rows_site_search']
Copy link
Member

@tsteur tsteur Feb 22, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@katebutler I wonder if we could leave the general rankingQueryLimit untouched and instead only for

$this->archiveDayActions($rankingQueryLimit); apply the possibly higher limit as in $this->archiveDayActions(max($rankingQueryLimit, $config['datatable_archiving_maximum_rows_site_search'] )); in https://github.com/matomo-org/matomo/blob/3.9.0-b1/plugins/Actions/Archiver.php#L60 ?

This way we would fetch only the needed rows for all other reports except for the one that generates site search. Eg all other "entry actions, exit actions, actions time, events, ... " would still use the correct limit directly and not fetch more than possibly needed.

@diosmosis diosmosis added this to the 3.10.0 milestone Mar 18, 2019
@diosmosis diosmosis added Needs Review PRs that need a code review not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org. labels Mar 18, 2019
@mattab mattab modified the milestones: 3.11.0, 3.10.0 Mar 19, 2019
@diosmosis
Copy link
Member

Can you add the new setting to BlobReportLimitingTest? Otherwise, this PR looks good.

@katebutler
Copy link
Author

@diosmosis have added to BlobReportLimitingTest

@diosmosis
Copy link
Member

👍 @katebutler merged

@diosmosis diosmosis merged commit 3140f5a into 3.x-dev Apr 5, 2019
@diosmosis diosmosis deleted the 10487 branch April 5, 2019 17:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Needs Review PRs that need a code review not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants