Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/230744
Change subject: Use (Null)?EntityPrefetcher from DataModelServices
......................................................................
Use (Null)?EntityPrefetcher from DataModelServices
Change-Id: Ib081642797b8f035570ee3399e29ccfb2092b825
---
M client/includes/store/ClientStore.php
M client/tests/phpunit/MockClientStore.php
D lib/includes/store/EntityPrefetcher.php
D lib/includes/store/NullEntityPrefetcher.php
M lib/includes/store/sql/PrefetchingWikiPageEntityMetaDataAccessor.php
M repo/includes/Dumpers/DumpGenerator.php
M repo/includes/Dumpers/JsonDumpGenerator.php
M repo/includes/Dumpers/RdfDumpGenerator.php
M repo/includes/api/GetEntities.php
M repo/includes/store/Store.php
M repo/includes/store/sql/ItemsPerSiteBuilder.php
M repo/maintenance/dumpJson.php
M repo/maintenance/dumpRdf.php
M repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php
M repo/tests/phpunit/includes/Dumpers/RdfDumpGeneratorTest.php
M repo/tests/phpunit/includes/store/sql/ItemsPerSiteBuilderTest.php
M repo/tests/phpunit/maintenance/dumpJsonTest.php
M repo/tests/phpunit/maintenance/dumpRdfTest.php
18 files changed, 16 insertions(+), 92 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/44/230744/1
diff --git a/client/includes/store/ClientStore.php
b/client/includes/store/ClientStore.php
index 51d052f..fbda221 100644
--- a/client/includes/store/ClientStore.php
+++ b/client/includes/store/ClientStore.php
@@ -7,8 +7,8 @@
use Wikibase\Client\Usage\SubscriptionManager;
use Wikibase\Client\Usage\UsageLookup;
use Wikibase\Client\Usage\UsageTracker;
+use Wikibase\DataModel\Services\Entity\EntityPrefetcher;
use Wikibase\Lib\Store\EntityLookup;
-use Wikibase\Lib\Store\EntityPrefetcher;
use Wikibase\Lib\Store\EntityRevisionLookup;
use Wikibase\Lib\Store\SiteLinkLookup;
use Wikibase\Store\EntityIdLookup;
diff --git a/client/tests/phpunit/MockClientStore.php
b/client/tests/phpunit/MockClientStore.php
index 7167089..08ded61 100644
--- a/client/tests/phpunit/MockClientStore.php
+++ b/client/tests/phpunit/MockClientStore.php
@@ -7,7 +7,7 @@
use Wikibase\Client\Usage\NullSubscriptionManager;
use Wikibase\Client\Usage\NullUsageTracker;
use Wikibase\ClientStore;
-use Wikibase\Lib\Store\NullEntityPrefetcher;
+use Wikibase\DataModel\Services\Entity\NullEntityPrefetcher;
use Wikibase\PropertyInfoStore;
use Wikibase\Store\EntityIdLookup;
use Wikibase\TermIndex;
diff --git a/lib/includes/store/EntityPrefetcher.php
b/lib/includes/store/EntityPrefetcher.php
deleted file mode 100644
index 2544c6a..0000000
--- a/lib/includes/store/EntityPrefetcher.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-namespace Wikibase\Lib\Store;
-
-use Wikibase\DataModel\Entity\EntityId;
-
-/**
- * A service interface for prefetching entities or data about them in order
- * to make subsequent loading of them faster.
- *
- * @since 0.5
- *
- * @license GNU GPL v2+
- * @author Marius Hoch < h...@online.de >
- */
-interface EntityPrefetcher {
-
- /**
- * Prefetches data for a list of entity ids.
- *
- * @param EntityId[] $entityIds
- */
- public function prefetch( array $entityIds );
-
- /**
- * Purges prefetched data about a given entity.
- *
- * @param EntityId $entityId
- */
- public function purge( EntityId $entityId );
-
- /**
- * Purges all prefetched data.
- */
- public function purgeAll();
-
-}
diff --git a/lib/includes/store/NullEntityPrefetcher.php
b/lib/includes/store/NullEntityPrefetcher.php
deleted file mode 100644
index 07be0f3..0000000
--- a/lib/includes/store/NullEntityPrefetcher.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace Wikibase\Lib\Store;
-
-use Wikibase\DataModel\Entity\EntityId;
-
-/**
- * No-op EntityPrefetcher
- *
- * @since 0.5
- *
- * @license GNU GPL v2+
- * @author Marius Hoch < h...@online.de >
- */
-class NullEntityPrefetcher implements EntityPrefetcher {
-
- /**
- * Prefetches data for a list of entity ids.
- *
- * @param EntityId[] $entityIds
- */
- public function prefetch( array $entityIds ) {
- }
-
- /**
- * Purges prefetched data about a given entity.
- *
- * @param EntityId $entityId
- */
- public function purge( EntityId $entityId ) {
- }
-
- /**
- * Purges all prefetched data.
- */
- public function purgeAll() {
- }
-
-}
diff --git
a/lib/includes/store/sql/PrefetchingWikiPageEntityMetaDataAccessor.php
b/lib/includes/store/sql/PrefetchingWikiPageEntityMetaDataAccessor.php
index e9f8ac9..eca11d2 100644
--- a/lib/includes/store/sql/PrefetchingWikiPageEntityMetaDataAccessor.php
+++ b/lib/includes/store/sql/PrefetchingWikiPageEntityMetaDataAccessor.php
@@ -4,9 +4,9 @@
use MapCacheLRU;
use Wikibase\DataModel\Entity\EntityId;
+use Wikibase\DataModel\Services\Entity\EntityPrefetcher;
use Wikibase\EntityRevision;
use Wikibase\Lib\Store\EntityRevisionLookup;
-use Wikibase\Lib\Store\EntityPrefetcher;
use Wikibase\Lib\Store\EntityRedirect;
use Wikibase\Lib\Store\EntityStoreWatcher;
diff --git a/repo/includes/Dumpers/DumpGenerator.php
b/repo/includes/Dumpers/DumpGenerator.php
index efd8ca1..30df61b 100644
--- a/repo/includes/Dumpers/DumpGenerator.php
+++ b/repo/includes/Dumpers/DumpGenerator.php
@@ -4,11 +4,11 @@
use InvalidArgumentException;
use Wikibase\DataModel\Entity\EntityId;
+use Wikibase\DataModel\Services\Entity\EntityPrefetcher;
use Wikibase\Lib\Reporting\ExceptionHandler;
use Wikibase\Lib\Reporting\MessageReporter;
use Wikibase\Lib\Reporting\NullMessageReporter;
use Wikibase\Lib\Reporting\RethrowingExceptionHandler;
-use Wikibase\Lib\Store\EntityPrefetcher;
use Wikibase\Lib\Store\StorageException;
use Wikibase\Repo\Store\EntityIdPager;
diff --git a/repo/includes/Dumpers/JsonDumpGenerator.php
b/repo/includes/Dumpers/JsonDumpGenerator.php
index b61375e..48c7ecd 100644
--- a/repo/includes/Dumpers/JsonDumpGenerator.php
+++ b/repo/includes/Dumpers/JsonDumpGenerator.php
@@ -8,11 +8,11 @@
use Serializers\Serializer;
use stdClass;
use Wikibase\DataModel\Entity\EntityId;
+use Wikibase\DataModel\Services\Entity\EntityPrefetcher;
use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookup;
use Wikibase\Lib\Serialization\CallbackFactory;
use Wikibase\Lib\Serialization\SerializationModifier;
use Wikibase\Lib\Store\EntityLookup;
-use Wikibase\Lib\Store\EntityPrefetcher;
use Wikibase\Lib\Store\RedirectResolvingEntityLookup;
use Wikibase\Lib\Store\StorageException;
use Wikibase\Lib\Store\UnresolvedRedirectException;
diff --git a/repo/includes/Dumpers/RdfDumpGenerator.php
b/repo/includes/Dumpers/RdfDumpGenerator.php
index ec0fd6d..991ce9d 100644
--- a/repo/includes/Dumpers/RdfDumpGenerator.php
+++ b/repo/includes/Dumpers/RdfDumpGenerator.php
@@ -7,8 +7,8 @@
use MWException;
use SiteList;
use Wikibase\DataModel\Entity\EntityId;
+use Wikibase\DataModel\Services\Entity\EntityPrefetcher;
use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookup;
-use Wikibase\Lib\Store\EntityPrefetcher;
use Wikibase\Lib\Store\EntityRevisionLookup;
use Wikibase\Lib\Store\RedirectResolvingEntityLookup;
use Wikibase\Lib\Store\StorageException;
diff --git a/repo/includes/api/GetEntities.php
b/repo/includes/api/GetEntities.php
index 8e8c794..78ebe4c 100644
--- a/repo/includes/api/GetEntities.php
+++ b/repo/includes/api/GetEntities.php
@@ -5,11 +5,11 @@
use ApiBase;
use ApiMain;
use Wikibase\DataModel\Entity\EntityId;
+use Wikibase\DataModel\Services\Entity\EntityPrefetcher;
use Wikibase\DataModel\Services\EntityId\EntityIdParser;
use Wikibase\DataModel\Services\EntityId\EntityIdParsingException;
use Wikibase\EntityRevision;
use Wikibase\LanguageFallbackChainFactory;
-use Wikibase\Lib\Store\EntityPrefetcher;
use Wikibase\Lib\Store\EntityRevisionLookup;
use Wikibase\Lib\Store\UnresolvedRedirectException;
use Wikibase\Repo\SiteLinkTargetProvider;
diff --git a/repo/includes/store/Store.php b/repo/includes/store/Store.php
index 073fb8d..57c6aba 100644
--- a/repo/includes/store/Store.php
+++ b/repo/includes/store/Store.php
@@ -2,9 +2,9 @@
namespace Wikibase;
+use Wikibase\DataModel\Services\Entity\EntityPrefetcher;
use Wikibase\Lib\Store\EntityInfoBuilderFactory;
use Wikibase\Lib\Store\EntityLookup;
-use Wikibase\Lib\Store\EntityPrefetcher;
use Wikibase\Lib\Store\EntityRedirectLookup;
use Wikibase\Lib\Store\EntityRevisionLookup;
use Wikibase\Lib\Store\EntityStore;
diff --git a/repo/includes/store/sql/ItemsPerSiteBuilder.php
b/repo/includes/store/sql/ItemsPerSiteBuilder.php
index 2bb79c8..4072602 100644
--- a/repo/includes/store/sql/ItemsPerSiteBuilder.php
+++ b/repo/includes/store/sql/ItemsPerSiteBuilder.php
@@ -3,9 +3,9 @@
namespace Wikibase\Repo\Store\SQL;
use Wikibase\DataModel\Entity\ItemId;
+use Wikibase\DataModel\Services\Entity\EntityPrefetcher;
use Wikibase\Lib\Reporting\MessageReporter;
use Wikibase\Lib\Store\EntityLookup;
-use Wikibase\Lib\Store\EntityPrefetcher;
use Wikibase\Lib\Store\SiteLinkTable;
use Wikibase\Repo\Store\EntityIdPager;
diff --git a/repo/maintenance/dumpJson.php b/repo/maintenance/dumpJson.php
index 2a52fe7..8acbe54 100644
--- a/repo/maintenance/dumpJson.php
+++ b/repo/maintenance/dumpJson.php
@@ -4,11 +4,11 @@
use DataValues\Serializers\DataValueSerializer;
use Wikibase\DataModel\SerializerFactory;
+use Wikibase\DataModel\Services\Entity\EntityPrefetcher;
use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookup;
use Wikibase\Dumpers\DumpGenerator;
use Wikibase\Dumpers\JsonDumpGenerator;
use Wikibase\Lib\Store\EntityLookup;
-use Wikibase\Lib\Store\EntityPrefetcher;
use Wikibase\Lib\Store\RevisionBasedEntityLookup;
use Wikibase\Repo\Store\EntityPerPage;
use Wikibase\Repo\WikibaseRepo;
diff --git a/repo/maintenance/dumpRdf.php b/repo/maintenance/dumpRdf.php
index d42d1b8..e6b4ff8 100644
--- a/repo/maintenance/dumpRdf.php
+++ b/repo/maintenance/dumpRdf.php
@@ -4,10 +4,10 @@
use SiteStore;
use Title;
+use Wikibase\DataModel\Services\Entity\EntityPrefetcher;
use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookup;
use Wikibase\Dumpers\DumpGenerator;
use Wikibase\Dumpers\RdfDumpGenerator;
-use Wikibase\Lib\Store\EntityPrefetcher;
use Wikibase\Lib\Store\EntityRevisionLookup;
use Wikibase\Repo\Store\EntityPerPage;
use Wikibase\Repo\WikibaseRepo;
diff --git a/repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php
b/repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php
index 003b274..6dfee38 100644
--- a/repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php
+++ b/repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php
@@ -13,11 +13,11 @@
use Wikibase\DataModel\Entity\Property;
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\DataModel\SerializerFactory;
+use Wikibase\DataModel\Services\Entity\NullEntityPrefetcher;
use Wikibase\DataModel\Services\EntityId\BasicEntityIdParser;
use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookup;
use Wikibase\Dumpers\JsonDumpGenerator;
use Wikibase\Lib\Store\EntityLookup;
-use Wikibase\Lib\Store\NullEntityPrefetcher;
use Wikibase\Lib\Store\UnresolvedRedirectException;
use Wikibase\Repo\Store\EntityIdPager;
use Wikibase\Repo\WikibaseRepo;
diff --git a/repo/tests/phpunit/includes/Dumpers/RdfDumpGeneratorTest.php
b/repo/tests/phpunit/includes/Dumpers/RdfDumpGeneratorTest.php
index 51c1243..b5bf3a8 100644
--- a/repo/tests/phpunit/includes/Dumpers/RdfDumpGeneratorTest.php
+++ b/repo/tests/phpunit/includes/Dumpers/RdfDumpGeneratorTest.php
@@ -10,10 +10,10 @@
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\PropertyId;
+use Wikibase\DataModel\Services\Entity\NullEntityPrefetcher;
use Wikibase\Dumpers\RdfDumpGenerator;
use Wikibase\EntityRevision;
use Wikibase\Lib\Store\EntityLookup;
-use Wikibase\Lib\Store\NullEntityPrefetcher;
use Wikibase\Lib\Store\UnresolvedRedirectException;
use Wikibase\Test\Rdf\RdfBuilderTest;
diff --git a/repo/tests/phpunit/includes/store/sql/ItemsPerSiteBuilderTest.php
b/repo/tests/phpunit/includes/store/sql/ItemsPerSiteBuilderTest.php
index 9fe9600..f8a4b06 100644
--- a/repo/tests/phpunit/includes/store/sql/ItemsPerSiteBuilderTest.php
+++ b/repo/tests/phpunit/includes/store/sql/ItemsPerSiteBuilderTest.php
@@ -4,8 +4,8 @@
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
+use Wikibase\DataModel\Services\Entity\NullEntityPrefetcher;
use Wikibase\Lib\Store\EntityLookup;
-use Wikibase\Lib\Store\NullEntityPrefetcher;
use Wikibase\Lib\Store\SiteLinkTable;
use Wikibase\Repo\Store\EntityIdPager;
use Wikibase\Repo\Store\SQL\ItemsPerSiteBuilder;
diff --git a/repo/tests/phpunit/maintenance/dumpJsonTest.php
b/repo/tests/phpunit/maintenance/dumpJsonTest.php
index 455c84a..8bf2931 100644
--- a/repo/tests/phpunit/maintenance/dumpJsonTest.php
+++ b/repo/tests/phpunit/maintenance/dumpJsonTest.php
@@ -11,6 +11,7 @@
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\DataModel\Reference;
use Wikibase\DataModel\ReferenceList;
+use Wikibase\DataModel\Services\Entity\NullEntityPrefetcher;
use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookup;
use Wikibase\DataModel\Services\Lookup\PropertyNotFoundException;
use Wikibase\DataModel\SiteLink;
@@ -27,7 +28,6 @@
use Wikibase\DataModel\Term\Term;
use Wikibase\DataModel\Term\TermList;
use Wikibase\DumpJson;
-use Wikibase\Lib\Store\NullEntityPrefetcher;
use Wikibase\Repo\Test\MockEntityPerPage;
/**
diff --git a/repo/tests/phpunit/maintenance/dumpRdfTest.php
b/repo/tests/phpunit/maintenance/dumpRdfTest.php
index b060ab7..8b90eaf 100644
--- a/repo/tests/phpunit/maintenance/dumpRdfTest.php
+++ b/repo/tests/phpunit/maintenance/dumpRdfTest.php
@@ -12,6 +12,7 @@
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\DataModel\Reference;
use Wikibase\DataModel\ReferenceList;
+use Wikibase\DataModel\Services\Entity\NullEntityPrefetcher;
use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookup;
use Wikibase\DataModel\Services\Lookup\PropertyNotFoundException;
use Wikibase\DataModel\SiteLink;
@@ -28,7 +29,6 @@
use Wikibase\DataModel\Term\Term;
use Wikibase\DataModel\Term\TermList;
use Wikibase\DumpRdf;
-use Wikibase\Lib\Store\NullEntityPrefetcher;
use Wikibase\Repo\Test\MockEntityPerPage;
/**
--
To view, visit https://gerrit.wikimedia.org/r/230744
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib081642797b8f035570ee3399e29ccfb2092b825
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore <addshorew...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
