jenkins-bot has submitted this change and it was merged.
Change subject: Introduce HARD_LIMIT constant in TermIndexSearchInteractor
......................................................................
Introduce HARD_LIMIT constant in TermIndexSearchInteractor
Change-Id: I1239460a8dfc67ce3e0b80e8f1b6b2fedb016897
---
M repo/includes/Interactors/TermIndexSearchInteractor.php
1 file changed, 9 insertions(+), 7 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/Interactors/TermIndexSearchInteractor.php
b/repo/includes/Interactors/TermIndexSearchInteractor.php
index ef9890a..2dab260 100644
--- a/repo/includes/Interactors/TermIndexSearchInteractor.php
+++ b/repo/includes/Interactors/TermIndexSearchInteractor.php
@@ -20,6 +20,8 @@
*/
class TermIndexSearchInteractor implements TermSearchInteractor {
+ const HARD_LIMIT = 5000;
+
/**
* @var TermIndex
*/
@@ -63,7 +65,7 @@
/**
* @var int
*/
- private $limit = 5000;
+ private $limit = self::HARD_LIMIT;
/**
* @param TermIndex $termIndex Used to search the terms
@@ -122,8 +124,8 @@
public function setLimit( $limit ) {
Assert::parameterType( 'integer', $limit, '$limit' );
Assert::parameter( $limit > 0, '$limit', 'Must be positive' );
- if ( $limit > 5000 ) {
- $limit = 5000;
+ if ( $limit > self::HARD_LIMIT ) {
+ $limit = self::HARD_LIMIT;
}
$this->limit = $limit;
}
@@ -191,7 +193,7 @@
$this->getTermIndexOptions()
);
// Shortcut out if we already have enough TermIndexEntries
- if ( count( $matchedTermIndexEntries ) == $this->limit ||
!$this->useLanguageFallback ) {
+ if ( count( $matchedTermIndexEntries ) >= $this->limit ||
!$this->useLanguageFallback ) {
return $matchedTermIndexEntries;
}
@@ -297,9 +299,9 @@
}
/**
- * @param array $languageCodes
+ * @param string[] $languageCodes
*
- * @return array
+ * @return string[]
*/
private function addFallbackLanguageCodes( array $languageCodes ) {
$languageCodesWithFallback = array();
@@ -347,7 +349,7 @@
*
* @returns TermIndexEntry[]
*/
- private function makeTermIndexEntryTemplates( $text, $languageCodes,
$termTypes ) {
+ private function makeTermIndexEntryTemplates( $text, array
$languageCodes, array $termTypes ) {
$terms = array();
foreach ( $languageCodes as $languageCode ) {
foreach ( $termTypes as $termType ) {
--
To view, visit https://gerrit.wikimedia.org/r/233352
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1239460a8dfc67ce3e0b80e8f1b6b2fedb016897
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
