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
Use $revQuery['joins'] in query in populateSearchIndex
[lhc/web/wiklou.git]
/
maintenance
/
rebuildtextindex.php
diff --git
a/maintenance/rebuildtextindex.php
b/maintenance/rebuildtextindex.php
index
c786925
..
900a52a
100644
(file)
--- a/
maintenance/rebuildtextindex.php
+++ b/
maintenance/rebuildtextindex.php
@@
-56,17
+56,17
@@
class RebuildTextIndex extends Maintenance {
// Shouldn't be needed for Postgres
$this->db = $this->getDB( DB_MASTER );
if ( $this->db->getType() == 'postgres' ) {
// Shouldn't be needed for Postgres
$this->db = $this->getDB( DB_MASTER );
if ( $this->db->getType() == 'postgres' ) {
- $this->
error( "This script is not needed when using Postgres.\n", true
);
+ $this->
fatalError( "This script is not needed when using Postgres.\n"
);
}
if ( $this->db->getType() == 'sqlite' ) {
if ( !DatabaseSqlite::getFulltextSearchModule() ) {
}
if ( $this->db->getType() == 'sqlite' ) {
if ( !DatabaseSqlite::getFulltextSearchModule() ) {
- $this->
e
rror( "Your version of SQLite module for PHP doesn't "
- . "support full-text search (FTS3).\n"
, true
);
+ $this->
fatalE
rror( "Your version of SQLite module for PHP doesn't "
+ . "support full-text search (FTS3).\n" );
}
if ( !$this->db->checkForEnabledSearch() ) {
}
if ( !$this->db->checkForEnabledSearch() ) {
- $this->
e
rror( "Your database schema is not configured for "
- . "full-text search support. Run update.php.\n"
, true
);
+ $this->
fatalE
rror( "Your database schema is not configured for "
+ . "full-text search support. Run update.php.\n" );
}
}
}
}
@@
-93,11
+93,7
@@
class RebuildTextIndex extends Maintenance {
$this->output( "Rebuilding index fields for {$count} pages...\n" );
$n = 0;
$this->output( "Rebuilding index fields for {$count} pages...\n" );
$n = 0;
- $fields = array_merge(
- Revision::selectPageFields(),
- Revision::selectFields(),
- Revision::selectTextFields()
- );
+ $revQuery = Revision::getQueryInfo( [ 'page', 'text' ] );
while ( $n < $count ) {
if ( $n ) {
while ( $n < $count ) {
if ( $n ) {
@@
-105,9
+101,13
@@
class RebuildTextIndex extends Maintenance {
}
$end = $n + self::RTI_CHUNK_SIZE - 1;
}
$end = $n + self::RTI_CHUNK_SIZE - 1;
- $res = $this->db->select( [ 'page', 'revision', 'text' ], $fields,
+ $res = $this->db->select(
+ $revQuery['tables'],
+ $revQuery['fields'],
[ "page_id BETWEEN $n AND $end", 'page_latest = rev_id', 'rev_text_id = old_id' ],
[ "page_id BETWEEN $n AND $end", 'page_latest = rev_id', 'rev_text_id = old_id' ],
- __METHOD__
+ __METHOD__,
+ [],
+ $revQuery['joins']
);
foreach ( $res as $s ) {
);
foreach ( $res as $s ) {
@@
-161,5
+161,5
@@
class RebuildTextIndex extends Maintenance {
}
}
}
}
-$maintClass =
"RebuildTextIndex"
;
+$maintClass =
RebuildTextIndex::class
;
require_once RUN_MAINTENANCE_IF_MAIN;
require_once RUN_MAINTENANCE_IF_MAIN;