dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add tests for parser tag hooks.
[lhc/web/wiklou.git]
/
maintenance
/
nextJobDB.php
diff --git
a/maintenance/nextJobDB.php
b/maintenance/nextJobDB.php
index
6e634b2
..
7f6aa40
100644
(file)
--- a/
maintenance/nextJobDB.php
+++ b/
maintenance/nextJobDB.php
@@
-17,10
+17,11
@@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* http://www.gnu.org/copyleft/gpl.html
*
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* http://www.gnu.org/copyleft/gpl.html
*
+ * @todo Make this work on PostgreSQL and maybe other database servers
* @ingroup Maintenance
*/
* @ingroup Maintenance
*/
-require_once( dirname(
__FILE__
) . '/Maintenance.php' );
+require_once( dirname(
__FILE__
) . '/Maintenance.php' );
class nextJobDB extends Maintenance {
public function __construct() {
class nextJobDB extends Maintenance {
public function __construct() {
@@
-28,6
+29,7
@@
class nextJobDB extends Maintenance {
$this->mDescription = "Pick a database that has pending jobs";
$this->addOption( 'type', "The type of job to search for", false, true );
}
$this->mDescription = "Pick a database that has pending jobs";
$this->addOption( 'type', "The type of job to search for", false, true );
}
+
public function execute() {
global $wgMemc;
$type = $this->getOption( 'type', false );
public function execute() {
global $wgMemc;
$type = $this->getOption( 'type', false );
@@
-35,18
+37,18
@@
class nextJobDB extends Maintenance {
? "jobqueue:dbs"
: "jobqueue:dbs:$type";
$pendingDBs = $wgMemc->get( $mckey );
? "jobqueue:dbs"
: "jobqueue:dbs:$type";
$pendingDBs = $wgMemc->get( $mckey );
-
+
# If we didn't get it from the cache
# If we didn't get it from the cache
- if( !$pendingDBs ) {
+ if
( !$pendingDBs ) {
$pendingDBs = $this->getPendingDbs( $type );
$pendingDBs = $this->getPendingDbs( $type );
- $wgMemc->
g
et( $mckey, $pendingDBs, 300 );
+ $wgMemc->
s
et( $mckey, $pendingDBs, 300 );
}
}
- # If we've got a pending job in a db, display it.
+ # If we've got a pending job in a db, display it.
if ( $pendingDBs ) {
if ( $pendingDBs ) {
- $this->output( $pendingDBs[mt_rand(
0, count( $pendingDBs ) - 1
)] );
+ $this->output( $pendingDBs[mt_rand(
0, count( $pendingDBs ) - 1
)] );
}
}
}
}
-
+
/**
* Get all databases that have a pending job
* @param $type String Job type
/**
* Get all databases that have a pending job
* @param $type String Job type
@@
-59,24
+61,28
@@
class nextJobDB extends Maintenance {
$dbsByMaster = array();
foreach ( $wgLocalDatabases as $db ) {
$lb = wfGetLB( $db );
$dbsByMaster = array();
foreach ( $wgLocalDatabases as $db ) {
$lb = wfGetLB( $db );
- $dbsByMaster[$lb->getServerName(
0
)][] = $db;
+ $dbsByMaster[$lb->getServerName(
0
)][] = $db;
}
}
-
- foreach ( $dbsByMaster as $
master => $
dbs ) {
+
+ foreach ( $dbsByMaster as $dbs ) {
$dbConn = wfGetDB( DB_MASTER, array(), $dbs[0] );
$dbConn = wfGetDB( DB_MASTER, array(), $dbs[0] );
- $stype = $dbConn->addQuotes($type);
- $jobTable = $dbConn->tableName( 'job' );
-
+ $stype = $dbConn->addQuotes( $type );
+
# Padding row for MySQL bug
$sql = "(SELECT '-------------------------------------------' as db)";
# Padding row for MySQL bug
$sql = "(SELECT '-------------------------------------------' as db)";
- foreach ( $dbs as $
dbName
) {
+ foreach ( $dbs as $
wikiId
) {
if ( $sql != '' ) {
$sql .= ' UNION ';
}
if ( $sql != '' ) {
$sql .= ' UNION ';
}
- if ($type === false)
- $sql .= "(SELECT '$dbName' as db FROM `$dbName`.$jobTable LIMIT 1)";
+
+ list( $dbName, $tablePrefix ) = wfSplitWikiID( $wikiId );
+ $dbConn->tablePrefix( $tablePrefix );
+ $jobTable = $dbConn->tableName( 'job' );
+
+ if ( $type === false )
+ $sql .= "(SELECT '$wikiId' as db FROM $dbName.$jobTable LIMIT 1)";
else
else
- $sql .= "(SELECT '$
dbName' as db FROM `$dbName`
.$jobTable WHERE job_cmd=$stype LIMIT 1)";
+ $sql .= "(SELECT '$
wikiId' as db FROM $dbName
.$jobTable WHERE job_cmd=$stype LIMIT 1)";
}
$res = $dbConn->query( $sql, __METHOD__ );
$first = true;
}
$res = $dbConn->query( $sql, __METHOD__ );
$first = true;