r94498 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r94497‎ | r94498 | r94499 >
Date:10:23, 15 August 2011
Author:hashar
Status:ok
Tags:
Comment:
Fix space/tab indentation FU r94444
Modified paths:
  • /trunk/phase3/maintenance/purgeList.php (modified) (history)

Diff [purge]

Index: trunk/phase3/maintenance/purgeList.php
@@ -68,65 +68,64 @@
6969
7070 /** Purge a namespace given by --namespace */
7171 private function purgeNamespace() {
72 - $dbr = wfGetDB( DB_SLAVE );
73 - $ns = $dbr->addQuotes( $this->getOption( 'namespace') );
 72+ $dbr = wfGetDB( DB_SLAVE );
 73+ $ns = $dbr->addQuotes( $this->getOption( 'namespace') );
7474
75 - $result = $dbr->select(
76 - array( 'page' ),
77 - array( 'page_namespace', 'page_title' ),
78 - array( "page_namespace = $ns" ),
79 - __METHOD__,
80 - array( 'ORDER BY' => 'page_id' )
81 - );
 75+ $result = $dbr->select(
 76+ array( 'page' ),
 77+ array( 'page_namespace', 'page_title' ),
 78+ array( "page_namespace = $ns" ),
 79+ __METHOD__,
 80+ array( 'ORDER BY' => 'page_id' )
 81+ );
8282
83 - $start = 0;
84 - $end = $dbr->numRows( $result );
85 - $this->output( "Will purge $end pages from namespace $ns\n" );
 83+ $start = 0;
 84+ $end = $dbr->numRows( $result );
 85+ $this->output( "Will purge $end pages from namespace $ns\n" );
8686
87 - # Do remaining chunk
88 - $end += $this->mBatchSize - 1;
89 - $blockStart = $start;
90 - $blockEnd = $start + $this->mBatchSize - 1;
 87+ # Do remaining chunk
 88+ $end += $this->mBatchSize - 1;
 89+ $blockStart = $start;
 90+ $blockEnd = $start + $this->mBatchSize - 1;
9191
92 - while( $blockEnd <= $end ) {
93 - # Select pages we will purge:
94 - $result = $dbr->select(
95 - array( 'page' ),
96 - array( 'page_namespace', 'page_title' ),
97 - array( "page_namespace = $ns" ),
98 - __METHOD__,
99 - array( # conditions
100 - 'ORDER BY' => 'page_id',
101 - 'LIMIT' => $this->mBatchSize,
102 - 'OFFSET' => $blockStart,
103 - )
104 - );
105 - # Initialize/reset URLs to be purged
106 - $urls = array();
107 - foreach( $result as $row ) {
108 - $title = Title::makeTitle( $row->page_namespace, $row->page_title );
109 - $url = $title->getFullUrl();
110 - $urls[] = $url;
111 - }
 92+ while( $blockEnd <= $end ) {
 93+ # Select pages we will purge:
 94+ $result = $dbr->select(
 95+ array( 'page' ),
 96+ array( 'page_namespace', 'page_title' ),
 97+ array( "page_namespace = $ns" ),
 98+ __METHOD__,
 99+ array( # conditions
 100+ 'ORDER BY' => 'page_id',
 101+ 'LIMIT' => $this->mBatchSize,
 102+ 'OFFSET' => $blockStart,
 103+ )
 104+ );
 105+ # Initialize/reset URLs to be purged
 106+ $urls = array();
 107+ foreach( $result as $row ) {
 108+ $title = Title::makeTitle( $row->page_namespace, $row->page_title );
 109+ $url = $title->getFullUrl();
 110+ $urls[] = $url;
 111+ }
112112
113 - $this->sendPurgeRequest( $urls );
 113+ $this->sendPurgeRequest( $urls );
114114
115 - $blockStart += $this->mBatchSize;
116 - $blockEnd += $this->mBatchSize;
117 - }
118 - }
 115+ $blockStart += $this->mBatchSize;
 116+ $blockEnd += $this->mBatchSize;
 117+ }
 118+ }
119119
120120 /**
121121 * Helper to purge an array of $urls
122122 * @param $urls array List of URLS to purge from squids
123123 */
124 - private function sendPurgeRequest( $urls ) {
125 - $this->output( "Purging " . count( $urls ). " urls\n" );
126 - $u = new SquidUpdate( $urls );
127 - $u->doUpdate();
128 - }
 124+ private function sendPurgeRequest( $urls ) {
 125+ $this->output( "Purging " . count( $urls ). " urls\n" );
 126+ $u = new SquidUpdate( $urls );
 127+ $u->doUpdate();
 128+ }
129129
130 -
131130 }
132131
133132 $maintClass = "PurgeList";

Follow-up revisions

RevisionCommit summaryAuthorDate
r95607MFT to REL1_18...hashar19:28, 27 August 2011

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r94444(bug 28273) Merge purgeList and purgeNamespace scripts...hashar08:51, 14 August 2011

Status & tagging log