[MediaWiki-commits] [Gerrit] mediawiki...ArticleFeedbackv5[master]: wfMemcKey (deprecated in MW 1.30) -> makeKey() on a BagOStuf...

2018-01-13 Thread SamanthaNguyen (Code Review) 
SamanthaNguyen has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/403842 )

Change subject: wfMemcKey (deprecated in MW 1.30) -> makeKey() on a BagOStuff 
instance
..


wfMemcKey (deprecated in MW 1.30) -> makeKey() on a BagOStuff instance

Change-Id: Ib40ec6ec8e148c8f60e6bfd8a740a783b202a648
---
M ArticleFeedbackv5.activity.php
M ArticleFeedbackv5.hooks.php
M ArticleFeedbackv5.model.php
M api/ApiAddFlagNoteArticleFeedbackv5.php
M data/DataModel.php
M data/maintenance/DataModelPurgeCache.php
M data/tests/DataModelSampleTests.php
M maintenance/purgeCache.php
M tests/ArticleFeedbackv5ModelTest.php
9 files changed, 29 insertions(+), 28 deletions(-)

Approvals:
  SamanthaNguyen: Verified; Looks good to me, approved



diff --git a/ArticleFeedbackv5.activity.php b/ArticleFeedbackv5.activity.php
index a7dbbd8..7a2af83 100644
--- a/ArticleFeedbackv5.activity.php
+++ b/ArticleFeedbackv5.activity.php
@@ -188,7 +188,7 @@
 * data in cache may be out of date.
 */
global $wgMemc;
-   $key = wfMemcKey( get_called_class(), 
'getLastEditorActivity', $itemId );
+   $key = $wgMemc->makeKey( get_called_class(), 
'getLastEditorActivity', $itemId );
$wgMemc->delete( $key );
}
 
@@ -285,7 +285,7 @@
foreach( $wgArticleFeedbackv5Permissions as $permission 
) {
if ( $user->isAllowed( $permission ) ) {
// get count for this specific 
permission level from cache
-   $key = wfMemcKey( 'articlefeedbackv5', 
'getActivityCount', $permission, $feedback->aft_id );
+   $key = $wgMemc->makeKey( 
'articlefeedbackv5', 'getActivityCount', $permission, $feedback->aft_id );
$count = $wgMemc->get( $key );
 
if ( $count === false ) {
@@ -322,7 +322,7 @@
// get permission level that should be updated
$permission = self::$actions[$action]['permissions'];
 
-   $key = wfMemcKey( 'articlefeedbackv5', 'getActivityCount', 
$permission, $feedbackId );
+   $key = $wgMemc->makeKey( 'articlefeedbackv5', 
'getActivityCount', $permission, $feedbackId );
$count = $wgMemc->get( $key );
 
/*
@@ -389,7 +389,7 @@
continue;
}
 
-   $key = wfMemcKey( get_called_class(), 
'getLastEditorActivity', $feedback->aft_id );
+   $key = $wgMemc->makeKey( get_called_class(), 
'getLastEditorActivity', $feedback->aft_id );
$cache = $wgMemc->get( $key );
if ( $cache !== false ) {
$activity[$feedback->aft_id] = $cache;
@@ -487,7 +487,7 @@
}
 
// cache, per feedback entry
-   $key = wfMemcKey( get_called_class(), 
'getLastEditorActivity', $params['feedbackId'] );
+   $key = $wgMemc->makeKey( get_called_class(), 
'getLastEditorActivity', $params['feedbackId'] );
$wgMemc->set( $key, $action, 60 * 60 );
 
$activity[$params['feedbackId']] = $action;
diff --git a/ArticleFeedbackv5.hooks.php b/ArticleFeedbackv5.hooks.php
index e3f268e..01b50fe 100644
--- a/ArticleFeedbackv5.hooks.php
+++ b/ArticleFeedbackv5.hooks.php
@@ -518,7 +518,7 @@
if ( $pager->contribs == 'newbie' ) {
// fetch max user id from cache (if present)
global $wgMemc;
-   $key = wfMemcKey( 'articlefeedbackv5', 'maxUserId' );
+   $key = $wgMemc->makeKey( 'articlefeedbackv5', 
'maxUserId' );
$max = $wgMemc->get( $key );
if ( $max === false ) {
// max user id not present in cache; fetch from 
db & save to cache for 1h
diff --git a/ArticleFeedbackv5.model.php b/ArticleFeedbackv5.model.php
index 5f29276..9cc0f34 100644
--- a/ArticleFeedbackv5.model.php
+++ b/ArticleFeedbackv5.model.php
@@ -245,7 +245,7 @@
return $existingValue + $difference;
};
 
-   $key = wfMemcKey( get_called_class(), 'getCountFound', 
$shard );
+   $key = static::getCache()->makeKey( get_called_class(), 
'getCountFound', $shard );
static::getCache()->merge( $key, $callback );
}
}
@@ -261,7 +261,7 @@
 * @return float
 */
public static function getCountFound( $pageId = null ) {
-

[MediaWiki-commits] [Gerrit] mediawiki...ArticleFeedbackv5[master]: wfMemcKey (deprecated in MW 1.30) -> makeKey() on a BagOStuf...

2018-01-11 Thread Jack Phoenix (Code Review) 
Jack Phoenix has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403842 )

Change subject: wfMemcKey (deprecated in MW 1.30) -> makeKey() on a BagOStuff 
instance
..

wfMemcKey (deprecated in MW 1.30) -> makeKey() on a BagOStuff instance

Change-Id: Ib40ec6ec8e148c8f60e6bfd8a740a783b202a648
---
M ArticleFeedbackv5.activity.php
M ArticleFeedbackv5.hooks.php
M ArticleFeedbackv5.model.php
M api/ApiAddFlagNoteArticleFeedbackv5.php
M data/DataModel.php
M data/maintenance/DataModelPurgeCache.php
M data/tests/DataModelSampleTests.php
M maintenance/purgeCache.php
M tests/ArticleFeedbackv5ModelTest.php
9 files changed, 29 insertions(+), 28 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleFeedbackv5 
refs/changes/42/403842/1

diff --git a/ArticleFeedbackv5.activity.php b/ArticleFeedbackv5.activity.php
index a7dbbd8..7a2af83 100644
--- a/ArticleFeedbackv5.activity.php
+++ b/ArticleFeedbackv5.activity.php
@@ -188,7 +188,7 @@
 * data in cache may be out of date.
 */
global $wgMemc;
-   $key = wfMemcKey( get_called_class(), 
'getLastEditorActivity', $itemId );
+   $key = $wgMemc->makeKey( get_called_class(), 
'getLastEditorActivity', $itemId );
$wgMemc->delete( $key );
}
 
@@ -285,7 +285,7 @@
foreach( $wgArticleFeedbackv5Permissions as $permission 
) {
if ( $user->isAllowed( $permission ) ) {
// get count for this specific 
permission level from cache
-   $key = wfMemcKey( 'articlefeedbackv5', 
'getActivityCount', $permission, $feedback->aft_id );
+   $key = $wgMemc->makeKey( 
'articlefeedbackv5', 'getActivityCount', $permission, $feedback->aft_id );
$count = $wgMemc->get( $key );
 
if ( $count === false ) {
@@ -322,7 +322,7 @@
// get permission level that should be updated
$permission = self::$actions[$action]['permissions'];
 
-   $key = wfMemcKey( 'articlefeedbackv5', 'getActivityCount', 
$permission, $feedbackId );
+   $key = $wgMemc->makeKey( 'articlefeedbackv5', 
'getActivityCount', $permission, $feedbackId );
$count = $wgMemc->get( $key );
 
/*
@@ -389,7 +389,7 @@
continue;
}
 
-   $key = wfMemcKey( get_called_class(), 
'getLastEditorActivity', $feedback->aft_id );
+   $key = $wgMemc->makeKey( get_called_class(), 
'getLastEditorActivity', $feedback->aft_id );
$cache = $wgMemc->get( $key );
if ( $cache !== false ) {
$activity[$feedback->aft_id] = $cache;
@@ -487,7 +487,7 @@
}
 
// cache, per feedback entry
-   $key = wfMemcKey( get_called_class(), 
'getLastEditorActivity', $params['feedbackId'] );
+   $key = $wgMemc->makeKey( get_called_class(), 
'getLastEditorActivity', $params['feedbackId'] );
$wgMemc->set( $key, $action, 60 * 60 );
 
$activity[$params['feedbackId']] = $action;
diff --git a/ArticleFeedbackv5.hooks.php b/ArticleFeedbackv5.hooks.php
index e3f268e..01b50fe 100644
--- a/ArticleFeedbackv5.hooks.php
+++ b/ArticleFeedbackv5.hooks.php
@@ -518,7 +518,7 @@
if ( $pager->contribs == 'newbie' ) {
// fetch max user id from cache (if present)
global $wgMemc;
-   $key = wfMemcKey( 'articlefeedbackv5', 'maxUserId' );
+   $key = $wgMemc->makeKey( 'articlefeedbackv5', 
'maxUserId' );
$max = $wgMemc->get( $key );
if ( $max === false ) {
// max user id not present in cache; fetch from 
db & save to cache for 1h
diff --git a/ArticleFeedbackv5.model.php b/ArticleFeedbackv5.model.php
index 5f29276..9cc0f34 100644
--- a/ArticleFeedbackv5.model.php
+++ b/ArticleFeedbackv5.model.php
@@ -245,7 +245,7 @@
return $existingValue + $difference;
};
 
-   $key = wfMemcKey( get_called_class(), 'getCountFound', 
$shard );
+   $key = static::getCache()->makeKey( get_called_class(), 
'getCountFound', $shard );
static::getCache()->merge( $key, $callback );
}
}
@@ -261,7 +261,7 @@
 * @return float
 */
public static function