jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/324731 )
Change subject: Add PrefetchingTermLookup interface ...................................................................... Add PrefetchingTermLookup interface PrefetchingTermLookup interface combines TermBuffer and TermLookup, so classes needing implementation of both of those interface do not need to rely on specific implementation (e.g. BufferingTermLookup vs DispatchingTermBuffer). Change-Id: Id90b402dd11f58beefa29b16876e60683a3d69e4 --- M lib/includes/Interactors/TermIndexSearchInteractor.php M lib/includes/Store/BufferingTermLookup.php M lib/includes/Store/DispatchingTermBuffer.php A lib/includes/Store/PrefetchingTermLookup.php 4 files changed, 20 insertions(+), 6 deletions(-) Approvals: Daniel Kinzler: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/includes/Interactors/TermIndexSearchInteractor.php b/lib/includes/Interactors/TermIndexSearchInteractor.php index 10af713..a3a994f 100644 --- a/lib/includes/Interactors/TermIndexSearchInteractor.php +++ b/lib/includes/Interactors/TermIndexSearchInteractor.php @@ -6,6 +6,7 @@ use Wikibase\DataModel\Term\Term; use Wikibase\LanguageFallbackChainFactory; use Wikibase\Lib\Store\LanguageFallbackLabelDescriptionLookup; +use Wikibase\Lib\Store\PrefetchingTermLookup; use Wikibase\Lib\Store\TermIndexSearchCriteria; use Wikibase\Store\BufferingTermLookup; use Wikibase\TermIndex; @@ -31,7 +32,7 @@ private $languageFallbackChainFactory; /** - * @var BufferingTermLookup + * @var PrefetchingTermLookup */ private $bufferingTermLookup; @@ -53,13 +54,13 @@ /** * @param TermIndex $termIndex Used to search the terms * @param LanguageFallbackChainFactory $fallbackFactory - * @param BufferingTermLookup $bufferingTermLookup Provides the displayTerms + * @param PrefetchingTermLookup $bufferingTermLookup Provides the displayTerms * @param string $displayLanguageCode */ public function __construct( TermIndex $termIndex, LanguageFallbackChainFactory $fallbackFactory, - BufferingTermLookup $bufferingTermLookup, + PrefetchingTermLookup $bufferingTermLookup, $displayLanguageCode ) { Assert::parameterType( 'string', $displayLanguageCode, '$displayLanguageCode' ); diff --git a/lib/includes/Store/BufferingTermLookup.php b/lib/includes/Store/BufferingTermLookup.php index d14bf73..c5a0f3c 100644 --- a/lib/includes/Store/BufferingTermLookup.php +++ b/lib/includes/Store/BufferingTermLookup.php @@ -4,8 +4,8 @@ use MapCacheLRU; use Wikibase\DataModel\Entity\EntityId; -use Wikibase\DataModel\Services\Term\TermBuffer; use Wikibase\Lib\Store\EntityTermLookupBase; +use Wikibase\Lib\Store\PrefetchingTermLookup; use Wikibase\Lib\Store\StorageException; use Wikibase\TermIndexEntry; use Wikibase\TermIndex; @@ -16,7 +16,7 @@ * @license GPL-2.0+ * @author Daniel Kinzler */ -class BufferingTermLookup extends EntityTermLookupBase implements TermBuffer { +class BufferingTermLookup extends EntityTermLookupBase implements PrefetchingTermLookup { /** * @var MapCacheLRU diff --git a/lib/includes/Store/DispatchingTermBuffer.php b/lib/includes/Store/DispatchingTermBuffer.php index a1b29e6..1bb98fa 100644 --- a/lib/includes/Store/DispatchingTermBuffer.php +++ b/lib/includes/Store/DispatchingTermBuffer.php @@ -11,7 +11,7 @@ /** * @license GPL-2.0+ */ -class DispatchingTermBuffer extends EntityTermLookupBase implements TermBuffer { +class DispatchingTermBuffer extends EntityTermLookupBase implements PrefetchingTermLookup { /** * @var TermBuffer[] diff --git a/lib/includes/Store/PrefetchingTermLookup.php b/lib/includes/Store/PrefetchingTermLookup.php new file mode 100644 index 0000000..23e277d --- /dev/null +++ b/lib/includes/Store/PrefetchingTermLookup.php @@ -0,0 +1,13 @@ +<?php + +namespace Wikibase\Lib\Store; + +use Wikibase\DataModel\Services\Lookup\TermLookup; +use Wikibase\DataModel\Services\Term\TermBuffer; + +/** + * Interface for implementations of both TermLookup and TermBuffer + * @license GPL-2.0+ + */ +interface PrefetchingTermLookup extends TermBuffer, TermLookup { +} -- To view, visit https://gerrit.wikimedia.org/r/324731 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id90b402dd11f58beefa29b16876e60683a3d69e4 Gerrit-PatchSet: 8 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: WMDE-leszek <leszek.mani...@wikimedia.de> Gerrit-Reviewer: Daniel Kinzler <daniel.kinz...@wikimedia.de> Gerrit-Reviewer: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de> Gerrit-Reviewer: WMDE-leszek <leszek.mani...@wikimedia.de> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits