Index: trunk/phase3/maintenance/stats.php |
— | — | @@ -54,14 +54,12 @@ |
55 | 55 | |
56 | 56 | $this->output( "\nParser cache\n" ); |
57 | 57 | $hits = intval( $wgMemc->get( wfMemcKey( 'stats', 'pcache_hit' ) ) ); |
58 | | - $invalid = intval( $wgMemc->get( wfMemcKey( 'stats', 'pcache_miss_invalid' ) ) ); |
59 | 58 | $expired = intval( $wgMemc->get( wfMemcKey( 'stats', 'pcache_miss_expired' ) ) ); |
60 | 59 | $absent = intval( $wgMemc->get( wfMemcKey( 'stats', 'pcache_miss_absent' ) ) ); |
61 | 60 | $stub = intval( $wgMemc->get( wfMemcKey( 'stats', 'pcache_miss_stub' ) ) ); |
62 | | - $total = $hits + $invalid + $expired + $absent + $stub; |
| 61 | + $total = $hits + $expired + $absent + $stub; |
63 | 62 | if ( $total ) { |
64 | 63 | $this->output( sprintf( "hits: %-10d %6.2f%%\n", $hits, $hits / $total * 100 ) ); |
65 | | - $this->output( sprintf( "invalid: %-10d %6.2f%%\n", $invalid, $invalid / $total * 100 ) ); |
66 | 64 | $this->output( sprintf( "expired: %-10d %6.2f%%\n", $expired, $expired / $total * 100 ) ); |
67 | 65 | $this->output( sprintf( "absent: %-10d %6.2f%%\n", $absent, $absent / $total * 100 ) ); |
68 | 66 | $this->output( sprintf( "stub threshold: %-10d %6.2f%%\n", $stub, $stub / $total * 100 ) ); |
Index: trunk/phase3/maintenance/clear_stats.php |
— | — | @@ -36,7 +36,6 @@ |
37 | 37 | $wgMemc->delete( "$db:stats:request_with_session" ); |
38 | 38 | $wgMemc->delete( "$db:stats:request_without_session" ); |
39 | 39 | $wgMemc->delete( "$db:stats:pcache_hit" ); |
40 | | - $wgMemc->delete( "$db:stats:pcache_miss_invalid" ); |
41 | 40 | $wgMemc->delete( "$db:stats:pcache_miss_expired" ); |
42 | 41 | $wgMemc->delete( "$db:stats:pcache_miss_absent" ); |
43 | 42 | $wgMemc->delete( "$db:stats:pcache_miss_stub" ); |
— | — | @@ -46,6 +45,8 @@ |
47 | 46 | $wgMemc->delete( "$db:stats:diff_cache_hit" ); |
48 | 47 | $wgMemc->delete( "$db:stats:diff_cache_miss" ); |
49 | 48 | $wgMemc->delete( "$db:stats:diff_uncacheable" ); |
| 49 | + $wgMemc->delete( "$db:stats:job-insert" ); |
| 50 | + $wgMemc->delete( "$db:stats:job-pop" ); |
50 | 51 | } |
51 | 52 | } |
52 | 53 | } |
Index: trunk/phase3/includes/parser/ParserCache.php |
— | — | @@ -158,6 +158,7 @@ |
159 | 159 | |
160 | 160 | $parserOutputKey = $this->getKey( $article, $popts, $useOutdated ); |
161 | 161 | if ( $parserOutputKey === false ) { |
| 162 | + wfIncrStats( 'pcache_miss_absent' ); |
162 | 163 | wfProfileOut( __METHOD__ ); |
163 | 164 | return false; |
164 | 165 | } |
Index: trunk/phase3/includes/OutputPage.php |
— | — | @@ -1467,8 +1467,6 @@ |
1468 | 1468 | |
1469 | 1469 | wfProfileIn( __METHOD__ ); |
1470 | 1470 | |
1471 | | - wfIncrStats( 'pcache_not_possible' ); |
1472 | | - |
1473 | 1471 | $popts = $this->parserOptions(); |
1474 | 1472 | $oldTidy = $popts->setTidy( $tidy ); |
1475 | 1473 | $popts->setInterfaceMessage( (bool) $interface ); |