jenkins-bot has submitted this change and it was merged.
Change subject: Remove unused searchSuggest experiment
......................................................................
Remove unused searchSuggest experiment
This is now a beta feature, the 1:10000 test of users
is no longer necessary.
Change-Id: I859f7c11188d869e33a4b7b5c5ce92422180274f
---
M WikimediaEvents.php
M WikimediaEventsHooks.php
D modules/ext.wikimediaEvents.searchSuggest.js
3 files changed, 2 insertions(+), 83 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/WikimediaEvents.php b/WikimediaEvents.php
index 79fee68..83411df 100644
--- a/WikimediaEvents.php
+++ b/WikimediaEvents.php
@@ -37,11 +37,6 @@
*/
$wgWMEStatsdBaseUri = false;
-/**
- * @var bool Whether the completion suggestion experiment is enabled.
- */
-$wgWMEEnableCompletionExperiment = false;
-
// Messages
$wgMessagesDirs['WikimediaEvents'] = __DIR__ . '/i18n';
@@ -99,14 +94,13 @@
// Loaded globally for all users (including logged-out)
// Don't remove if empty!
'scripts' => array(
- 'ext.wikimediaEvents.searchSuggest.js',
'ext.wikimediaEvents.statsd.js',
'ext.wikimediaEvents.searchSatisfaction.js',
'ext.wikimediaEvents.search.js',
'ext.wikimediaEvents.geoFeatures.js',
),
'dependencies' => array(
- 'mediawiki.user', // needed by search.js,
searchSuggest.js
+ 'mediawiki.user', // needed by search.js
'mediawiki.Uri', // needed by searchSatisfaction.js
'mediawiki.storage', // needed by searchSatisfaction.js
'schema.GeoFeatures', // needed by geoFeatures.js
diff --git a/WikimediaEventsHooks.php b/WikimediaEventsHooks.php
index 6d2cb47..898a572 100644
--- a/WikimediaEventsHooks.php
+++ b/WikimediaEventsHooks.php
@@ -374,9 +374,8 @@
}
public static function onResourceLoaderGetConfigVars( &$vars ) {
- global $wgWMEStatsdBaseUri, $wgWMEEnableCompletionExperiment;
+ global $wgWMEStatsdBaseUri;
$vars['wgWMEStatsdBaseUri'] = $wgWMEStatsdBaseUri;
- $vars['wgWMEEnableCompletionExperiment'] =
$wgWMEEnableCompletionExperiment;
}
/**
diff --git a/modules/ext.wikimediaEvents.searchSuggest.js
b/modules/ext.wikimediaEvents.searchSuggest.js
deleted file mode 100644
index f10cb79..0000000
--- a/modules/ext.wikimediaEvents.searchSuggest.js
+++ /dev/null
@@ -1,74 +0,0 @@
-/*!
- * Javacsript module for testing the experimental cirrus
- * suggestions api.
- *
- * @license GNU GPL v2 or later
- * @author Erik Bernhardson <[email protected]>
- */
-( function ( mw, $ ) {
- // Unique random identifier used to correlate multiple
- // events that occur within the same page load.
- var pageViewToken = mw.user.generateRandomSessionId();
-
- function oneIn( populationSize ) {
- // extract a number with the first 52 bits of pageId.
- // max js int holds 53 bits, 13 hex chars = 6.5 bytes = 52 bits.
- var rand = parseInt( pageViewToken.slice( 0, 13 ), 16 );
- return rand % populationSize === 0;
- }
-
- function logEvent( bucket, numResults ) {
- mw.eventLog.logEvent( 'CompletionSuggestions', {
- bucket: bucket,
- // The number of suggestions provided to the user
- numResults: numResults,
- // used to correlate actions that happen on the same
page view.
- pageViewToken: pageViewToken
- } );
- }
-
- $( document ).ready( function () {
- var bucket, callback, deferred,
- sampleSize = 10000; // .01% sampling rate per bucket
-
- if ( !mw.config.get( 'wgWMEEnableCompletionExperiment' ) ) {
- return;
- }
-
- if ( oneIn( sampleSize ) ) {
- bucket = 'opensearch';
- callback = mw.searchSuggest.request;
- } else if ( oneIn( sampleSize - 1 ) ) {
- bucket = 'cirrus-suggest';
- callback = function ( api, query, response, maxRows ) {
- return api.get( {
- action: 'cirrus-suggest',
- text: query,
- limit: maxRows
- } ).done( function ( data ) {
- response( $.map( data.suggest, function
( suggestion ) {
- return suggestion.title;
- } ) );
- } );
- };
- } else {
- return;
- }
-
- mw.searchSuggest.request = function ( api, query, response,
maxRows ) {
- deferred = deferred || mw.loader.using( [
- 'ext.eventLogging',
- 'schema.CompletionSuggestions'
- ] );
-
- return callback( api, query, function ( data ) {
- response( data );
- deferred.then( function () {
- logEvent( bucket, data.length );
- } );
- }, maxRows );
- };
-
- } );
-
-}( mediaWiki, jQuery ) );
--
To view, visit https://gerrit.wikimedia.org/r/260175
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I859f7c11188d869e33a4b7b5c5ce92422180274f
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: master
Gerrit-Owner: EBernhardson <[email protected]>
Gerrit-Reviewer: EBernhardson <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
