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

Fix %TOTALPAGES% caching #175

Merged
merged 10 commits into from
Feb 8, 2025
Merged

Fix %TOTALPAGES% caching #175

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
790e8f3
Update Query.php
Universal-Omega Apr 29, 2022
be5629d
Update Query.php
Universal-Omega Apr 29, 2022
df92ee8
Update Parse.php
Universal-Omega Apr 29, 2022
6a77870
Update Query.php
Universal-Omega Apr 29, 2022
68ba5fa
Merge branch 'master' into Universal-Omega-patch-5
Universal-Omega May 17, 2024
dfc4397
Merge branch 'master' into Universal-Omega-patch-5
Universal-Omega Feb 7, 2025
bf89760
Fix
Universal-Omega Feb 7, 2025
c3c7302
Update includes/Parse.php
Universal-Omega Feb 7, 2025
63dd441
CI: lint code to MediaWiki standards
Feb 7, 2025
3bccb04
Fix
Universal-Omega Feb 8, 2025
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
10 changes: 7 additions & 3 deletions includes/Parse.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,8 +201,7 @@ public function parse( $input, Parser $parser, &$reset, &$eliminate, $isParserTa
try {
$query = new Query( $this->parameters );

$foundRows = null;
$rows = $query->buildAndSelect( $calcRows, $foundRows );
$rows = $query->buildAndSelect( $calcRows );
if ( $rows === false ) {
// This error path is very fast (We exit immediately if poolcounter is full)
// Thus it should be safe to try again in ~5 minutes.
Expand All @@ -217,6 +216,11 @@ public function parse( $input, Parser $parser, &$reset, &$eliminate, $isParserTa
return $this->getFullOutput();
}

if ( isset( $rows['count'] ) ) {
$foundRows = $rows['count'];
unset( $rows['count'] );
}
Universal-Omega marked this conversation as resolved.
Show resolved Hide resolved

$numRows = count( $rows );
$articles = $this->processQueryResults( $rows, $parser );

Expand Down Expand Up @@ -260,7 +264,7 @@ public function parse( $input, Parser $parser, &$reset, &$eliminate, $isParserTa
}

// $this->addOutput($lister->format($articles));
if ( $foundRows === null ) {
if ( !isset( $foundRows ) ) {
// Get row count after calling format() otherwise the count will be inaccurate.
$foundRows = $lister->getRowCount();
}
Expand Down
21 changes: 9 additions & 12 deletions includes/Query.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,10 +166,9 @@ public function __construct( Parameters $parameters ) {
* Start a query build. Returns found rows.
*
* @param bool $calcRows
* @param ?int &$foundRows
* @return array|bool
*/
public function buildAndSelect( bool $calcRows = false, ?int &$foundRows = null ) {
public function buildAndSelect( bool $calcRows = false ) {
global $wgNonincludableNamespaces, $wgDebugDumpSql;

$options = [];
Expand Down Expand Up @@ -369,19 +368,17 @@ public function buildAndSelect( bool $calcRows = false, ?int &$foundRows = null
$qname = __METHOD__ . ' - ' . $pageName;
$where = $this->where;
$join = $this->join;
$db = $this->dbr;
$dbr = $this->dbr;

$doQuery = static function () use ( $qname, $db, $tables, $fields, $where, $options, $join, $calcRows, &$foundRows ) {
$res = $db->select( $tables, $fields, $where, $qname, $options, $join );
$doQuery = static function () use ( $qname, $dbr, $tables, $fields, $where, $options, $join, $calcRows ) {
$res = $dbr->select( $tables, $fields, $where, $qname, $options, $join );
$res = iterator_to_array( $res );

if ( $calcRows ) {
$calcRowsResult = $db->query( 'SELECT FOUND_ROWS() AS count;', $qname );
$total = $calcRowsResult->fetchRow();

$foundRows = (int)$total['count'];
$res['count'] = $dbr->selectField( $tables, 'FOUND_ROWS()', '', $qname );
}

return iterator_to_array( $res );
return $res;
};

$poolCounterKey = 'nowait:dpl3-query:' . WikiMap::getCurrentWikiId();
Expand All @@ -398,8 +395,8 @@ public function buildAndSelect( bool $calcRows = false, ?int &$foundRows = null
return $cache->getWithSetCallback(
$cache->makeKey( 'DPL3Query', hash( 'sha256', $query ) ),
$queryCacheTime,
static function ( $oldVal, &$ttl, &$setOpts ) use ( $worker, $db ){
$setOpts += Database::getCacheSetOptions( $db );
static function ( $oldVal, &$ttl, &$setOpts ) use ( $worker, $dbr ){
$setOpts += Database::getCacheSetOptions( $dbr );

Check warning

Code scanning / Phpmd (reported by Codacy)

Static access leads to hard to test code Warning

Avoid using static access to class '\Wikimedia\Rdbms\Database' in method 'buildAndSelect'.
$res = $worker->execute();
if ( $res === false ) {
// Do not cache errors.
Expand Down