Thiemo Mättig (WMDE) has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/369602 )
Change subject: Remove minor unused code snippets and variables
......................................................................
Remove minor unused code snippets and variables
Change-Id: Iee868cf288814ff87aa15c899daa794897ae12b5
---
M includes/Maintenance/MetaStoreIndex.php
M includes/Searcher.php
M tests/jenkins/nukeAllIndexes.php
M tests/unit/Search/TeamDraftInterleaverTest.php
4 files changed, 5 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/02/369602/1
diff --git a/includes/Maintenance/MetaStoreIndex.php
b/includes/Maintenance/MetaStoreIndex.php
index 21b4775..69593eb 100644
--- a/includes/Maintenance/MetaStoreIndex.php
+++ b/includes/Maintenance/MetaStoreIndex.php
@@ -469,14 +469,6 @@
}
/**
- * Get the internal index type
- * @return \Elastica\Type $type
- */
- private function internalType() {
- return self::getInternalType( $this->connection );
- }
-
- /**
* Get the version tracking index type
* @param Connection $connection
* @return \Elastica\Type $type
diff --git a/includes/Searcher.php b/includes/Searcher.php
index f66a89c..766cb38 100644
--- a/includes/Searcher.php
+++ b/includes/Searcher.php
@@ -1177,9 +1177,6 @@
return $this->searchOne();
}
- private function buildInterleaveConfig( array $interleave ) {
- }
-
/**
* Tests if two search objects are equivalent
*
diff --git a/tests/jenkins/nukeAllIndexes.php b/tests/jenkins/nukeAllIndexes.php
index ec7d07a..2c1a93f 100644
--- a/tests/jenkins/nukeAllIndexes.php
+++ b/tests/jenkins/nukeAllIndexes.php
@@ -37,7 +37,7 @@
if ( !isset( $wgCirrusSearchDevelOptions['allow_nuke'] ) ||
!$wgCirrusSearchDevelOptions['allow_nuke'] ) {
$this->output( "Nuke not enabled. Please set
\$wgCirrusSearchDevelOptions['allow_nuke'] = true" );
- return 1;
+ return;
}
$client = $this->getConnection()->getClient();
diff --git a/tests/unit/Search/TeamDraftInterleaverTest.php
b/tests/unit/Search/TeamDraftInterleaverTest.php
index 1c574f6..5ae1fbf 100644
--- a/tests/unit/Search/TeamDraftInterleaverTest.php
+++ b/tests/unit/Search/TeamDraftInterleaverTest.php
@@ -40,7 +40,7 @@
$a = array_combine( $a, $a );
$b = array_combine( $b, $b );
- list( $interleave, $teamA, $teamB, $aOffset ) =
TeamDraftInterleaver::interleaveResults( $a, $b, 15 );
+ list( $interleave, $teamA, $teamB, ) =
TeamDraftInterleaver::interleaveResults( $a, $b, 15 );
$this->assertCount( 15, $interleave );
$this->assertCount( 5, $teamA );
$this->assertCount( 10, $teamB );
@@ -52,7 +52,7 @@
$a = array_combine( $a, $a );
$b = array_combine( $b, $b );
- list( $interleave, $teamA, $teamB, $aOffset ) =
TeamDraftInterleaver::interleaveResults( $a, $b, 11 );
+ list( $interleave, $teamA, $teamB, ) =
TeamDraftInterleaver::interleaveResults( $a, $b, 11 );
$this->assertCount( 11, $interleave );
$this->assertCount( 6, $teamA );
$this->assertCount( 5, $teamB );
@@ -64,7 +64,7 @@
$a = array_combine( $a, $a );
$b = array_combine( $b, $b );
- list( $interleave, $teamA, $teamB, $aOffset ) =
TeamDraftInterleaver::interleaveResults( $a, $b, 20 );
+ list( $interleave, $teamA, $teamB, ) =
TeamDraftInterleaver::interleaveResults( $a, $b, 20 );
$this->assertCount( 8, $interleave );
$this->assertCount( 3, $teamA );
$this->assertCount( 5, $teamB );
@@ -76,7 +76,7 @@
$a = array_combine( $a, $a );
$b = array_combine( $b, $b );
- list( $interleave, $teamA, $teamB, $aOffset ) =
TeamDraftInterleaver::interleaveResults( $a, $b, 20 );
+ list( $interleave, $teamA, $teamB, ) =
TeamDraftInterleaver::interleaveResults( $a, $b, 20 );
$this->assertCount( 10, $interleave );
$this->assertCount( 5, $teamA );
$this->assertCount( 5, $teamB );
--
To view, visit https://gerrit.wikimedia.org/r/369602
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iee868cf288814ff87aa15c899daa794897ae12b5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
