Merge "Apply $wgMaxArticleSize more exactly"

[lhc/web/wiklou.git] / includes / jobqueue / jobs / HTMLCacheUpdateJob.php

diff --git a/includes/jobqueue/jobs/HTMLCacheUpdateJob.php b/includes/jobqueue/jobs/HTMLCacheUpdateJob.php
index 0d48cb3..a14cdd7 100644 (file)
--- a/includes/jobqueue/jobs/HTMLCacheUpdateJob.php
+++ b/includes/jobqueue/jobs/HTMLCacheUpdateJob.php
@@ -48,10 +48,10 @@ class HTMLCacheUpdateJob extends Job {
        public static function newForBacklinks( Title $title, $table ) {
                return new self(
                        $title,
-                       array(
+                       [
                                'table' => $table,
                                'recursive' => true
-                       ) + Job::newRootJobParams( // "overall" refresh links job info
+                       ] + Job::newRootJobParams( // "overall" refresh links job info
                                "htmlCacheUpdate:{$table}:{$title->getPrefixedText()}"
                        )
                );
@@ -73,7 +73,7 @@ class HTMLCacheUpdateJob extends Job {
                                $wgUpdateRowsPerJob,
                                $wgUpdateRowsPerQuery, // jobs-per-title
                                // Carry over information for de-duplication
-                               array( 'params' => $this->getRootJobParams() )
+                               [ 'params' => $this->getRootJobParams() ]
                        );
                        JobQueueGroup::singleton()->push( $jobs );
                // Job to purge pages for a set of titles
@@ -82,9 +82,9 @@ class HTMLCacheUpdateJob extends Job {
                // Job to update a single title
                } else {
                        $t = $this->title;
-                       $this->invalidateTitles( array(
-                               $t->getArticleID() => array( $t->getNamespace(), $t->getDBkey() )
-                       ) );
+                       $this->invalidateTitles( [
+                               $t->getArticleID() => [ $t->getNamespace(), $t->getDBkey() ]
+                       ] );
                }
 
                return true;
@@ -102,18 +102,15 @@ class HTMLCacheUpdateJob extends Job {
                        return;
                }
 
-               // The page_touched field will need to be bumped for these pages.
-               // Only bump it to the present time if no "rootJobTimestamp" was known.
-               // If it is known, it can be used instead, which avoids invalidating output
-               // that was in fact generated *after* the relevant dependency change time
-               // (e.g. template edit). This is particularily useful since refreshLinks jobs
-               // save back parser output and usually run along side htmlCacheUpdate jobs;
-               // their saved output would be invalidated by using the current timestamp.
-               if ( isset( $this->params['rootJobTimestamp'] ) ) {
-                       $touchTimestamp = $this->params['rootJobTimestamp'];
-               } else {
-                       $touchTimestamp = wfTimestampNow();
-               }
+               // Bump page_touched to the current timestamp. This used to use the root job timestamp
+               // (e.g. template/file edit time), which was a bit more efficient when template edits are
+               // rare and don't effect the same pages much. However, this way allows for better
+               // de-duplication, which is much more useful for wikis with high edit rates. Note that
+               // RefreshLinksJob, which is enqueued alongside HTMLCacheUpdateJob, saves the parser output
+               // since it has to parse anyway. We assume that vast majority of the cache jobs finish
+               // before the link jobs, so using the current timestamp instead of the root timestamp is
+               // not expected to invalidate these cache entries too often.
+               $touchTimestamp = wfTimestampNow();
 
                $dbw = wfGetDB( DB_MASTER );
                // Update page_touched (skipping pages already touched since the root job).
@@ -123,19 +120,19 @@ class HTMLCacheUpdateJob extends Job {
                        wfGetLBFactory()->waitForReplication();
 
                        $dbw->update( 'page',
-                               array( 'page_touched' => $dbw->timestamp( $touchTimestamp ) ),
-                               array( 'page_id' => $batch,
+                               [ 'page_touched' => $dbw->timestamp( $touchTimestamp ) ],
+                               [ 'page_id' => $batch,
                                        // don't invalidated pages that were already invalidated
                                        "page_touched < " . $dbw->addQuotes( $dbw->timestamp( $touchTimestamp ) )
-                               ),
+                               ],
                                __METHOD__
                        );
                }
                // Get the list of affected pages (races only mean something else did the purge)
                $titleArray = TitleArray::newFromResult( $dbw->select(
                        'page',
-                       array( 'page_namespace', 'page_title' ),
-                       array( 'page_id' => $pageIds, 'page_touched' => $dbw->timestamp( $touchTimestamp ) ),
+                       [ 'page_namespace', 'page_title' ],
+                       [ 'page_id' => $pageIds, 'page_touched' => $dbw->timestamp( $touchTimestamp ) ],
                        __METHOD__
                ) );