Thiemo Mättig (WMDE) has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330161 )
Change subject: Use EntityIdPager interface from DataModel Services
......................................................................
Use EntityIdPager interface from DataModel Services
This is a 100% copy-paste job. We already require the Services
version needed for this.
Change-Id: I7d522ef949f6980961cba3da48ab350d00134cd7
---
M repo/includes/Dumpers/DumpGenerator.php
M repo/includes/IO/EntityIdReader.php
D repo/includes/Store/EntityIdPager.php
M repo/includes/Store/Sql/ItemsPerSiteBuilder.php
M repo/includes/Store/Sql/SqlEntityIdPager.php
M repo/includes/Store/Sql/SqlEntityIdPagerFactory.php
M repo/maintenance/dumpEntities.php
M repo/maintenance/dumpRdf.php
M repo/tests/phpunit/MockEntityIdPager.php
M repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php
M repo/tests/phpunit/includes/Store/Sql/ItemsPerSiteBuilderTest.php
M repo/tests/phpunit/includes/Store/Sql/SqlEntityIdPagerTest.php
M repo/tests/phpunit/maintenance/dumpJsonTest.php
M repo/tests/phpunit/maintenance/dumpRdfTest.php
14 files changed, 13 insertions(+), 62 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/61/330161/1
diff --git a/repo/includes/Dumpers/DumpGenerator.php
b/repo/includes/Dumpers/DumpGenerator.php
index 65f6323..a827959 100644
--- a/repo/includes/Dumpers/DumpGenerator.php
+++ b/repo/includes/Dumpers/DumpGenerator.php
@@ -12,7 +12,7 @@
use Wikibase\Lib\Reporting\NullMessageReporter;
use Wikibase\Lib\Reporting\RethrowingExceptionHandler;
use Wikibase\Lib\Store\StorageException;
-use Wikibase\Repo\Store\EntityIdPager;
+use Wikibase\DataModel\Services\EntityId\EntityIdPager;
/**
* DumpGenerator generates a dump of a given set of entities, excluding
diff --git a/repo/includes/IO/EntityIdReader.php
b/repo/includes/IO/EntityIdReader.php
index f76f933..3f8dbca 100644
--- a/repo/includes/IO/EntityIdReader.php
+++ b/repo/includes/IO/EntityIdReader.php
@@ -8,7 +8,7 @@
use Wikibase\Lib\Reporting\ExceptionHandler;
use Wikibase\Lib\Reporting\RethrowingExceptionHandler;
use Wikibase\Repo\Disposable;
-use Wikibase\Repo\Store\EntityIdPager;
+use Wikibase\DataModel\Services\EntityId\EntityIdPager;
/**
* EntityIdReader reads entity IDs from a file, one per line.
diff --git a/repo/includes/Store/EntityIdPager.php
b/repo/includes/Store/EntityIdPager.php
deleted file mode 100644
index a16dab3..0000000
--- a/repo/includes/Store/EntityIdPager.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-namespace Wikibase\Repo\Store;
-
-use Wikibase\DataModel\Entity\EntityId;
-
-/**
- * A cursor for paging through EntityIds.
- *
- * @since 0.5
- *
- * @license GPL-2.0+
- * @author Daniel Kinzler
- */
-interface EntityIdPager {
-
- /**
- * Omit redirects from entity listing.
- */
- const NO_REDIRECTS = 'no';
-
- /**
- * Include redirects in entity listing.
- */
- const INCLUDE_REDIRECTS = 'include';
-
- /**
- * Include only redirects in listing.
- */
- const ONLY_REDIRECTS = 'only';
-
- /**
- * Fetches the next batch of IDs. Calling this has the side effect of
advancing the
- * internal state of the page, typically implemented by some underlying
resource
- * such as a file pointer or a database connection.
- *
- * @note: After some finite number of calls, this method should
eventually return
- * an empty list of IDs, indicating that no more IDs are available.
- *
- * @since 0.5
- *
- * @param int $limit The maximum number of IDs to return.
- *
- * @return EntityId[] A list of EntityIds matching the given
parameters. Will
- * be empty if there are no more entities to list from the given offset.
- */
- public function fetchIds( $limit );
-
-}
diff --git a/repo/includes/Store/Sql/ItemsPerSiteBuilder.php
b/repo/includes/Store/Sql/ItemsPerSiteBuilder.php
index 9fd8e83..e39d2ef 100644
--- a/repo/includes/Store/Sql/ItemsPerSiteBuilder.php
+++ b/repo/includes/Store/Sql/ItemsPerSiteBuilder.php
@@ -8,7 +8,7 @@
use Wikibase\DataModel\Services\Lookup\EntityLookup;
use Wikibase\Lib\Reporting\MessageReporter;
use Wikibase\Lib\Store\SiteLinkTable;
-use Wikibase\Repo\Store\EntityIdPager;
+use Wikibase\DataModel\Services\EntityId\EntityIdPager;
/**
* Utility class for rebuilding the wb_items_per_site table.
diff --git a/repo/includes/Store/Sql/SqlEntityIdPager.php
b/repo/includes/Store/Sql/SqlEntityIdPager.php
index 10b5173..da36d81 100644
--- a/repo/includes/Store/Sql/SqlEntityIdPager.php
+++ b/repo/includes/Store/Sql/SqlEntityIdPager.php
@@ -7,7 +7,7 @@
use Wikibase\DataModel\Entity\EntityIdParser;
use Wikibase\DataModel\Entity\EntityIdParsingException;
use Wikibase\Lib\Store\EntityNamespaceLookup;
-use Wikibase\Repo\Store\EntityIdPager;
+use Wikibase\DataModel\Services\EntityId\EntityIdPager;
use Wikimedia\Assert\Assert;
/**
diff --git a/repo/includes/Store/Sql/SqlEntityIdPagerFactory.php
b/repo/includes/Store/Sql/SqlEntityIdPagerFactory.php
index 8e1bff9..d8a6769 100644
--- a/repo/includes/Store/Sql/SqlEntityIdPagerFactory.php
+++ b/repo/includes/Store/Sql/SqlEntityIdPagerFactory.php
@@ -4,7 +4,7 @@
use Wikibase\DataModel\Entity\EntityIdParser;
use Wikibase\Lib\Store\EntityNamespaceLookup;
-use Wikibase\Repo\Store\EntityIdPager;
+use Wikibase\DataModel\Services\EntityId\EntityIdPager;
/**
* Factory for SqlEntityIdPager objects.
diff --git a/repo/maintenance/dumpEntities.php
b/repo/maintenance/dumpEntities.php
index 6aa3a8c..72436ff 100644
--- a/repo/maintenance/dumpEntities.php
+++ b/repo/maintenance/dumpEntities.php
@@ -11,7 +11,7 @@
use Wikibase\Repo\Disposable;
use Wikibase\Repo\IO\EntityIdReader;
use Wikibase\Repo\IO\LineReader;
-use Wikibase\Repo\Store\EntityIdPager;
+use Wikibase\DataModel\Services\EntityId\EntityIdPager;
use Wikibase\Repo\Store\Sql\SqlEntityIdPagerFactory;
use Wikibase\Repo\WikibaseRepo;
diff --git a/repo/maintenance/dumpRdf.php b/repo/maintenance/dumpRdf.php
index d836c80..f0d120a 100644
--- a/repo/maintenance/dumpRdf.php
+++ b/repo/maintenance/dumpRdf.php
@@ -11,7 +11,7 @@
use Wikibase\Lib\Store\EntityTitleLookup;
use Wikibase\Rdf\RdfVocabulary;
use Wikibase\Rdf\ValueSnakRdfBuilderFactory;
-use Wikibase\Repo\Store\EntityIdPager;
+use Wikibase\DataModel\Services\EntityId\EntityIdPager;
use Wikibase\Repo\Store\Sql\SqlEntityIdPagerFactory;
use Wikibase\Repo\WikibaseRepo;
diff --git a/repo/tests/phpunit/MockEntityIdPager.php
b/repo/tests/phpunit/MockEntityIdPager.php
index 91d2bb7..04c8dcb 100644
--- a/repo/tests/phpunit/MockEntityIdPager.php
+++ b/repo/tests/phpunit/MockEntityIdPager.php
@@ -6,7 +6,7 @@
use InvalidArgumentException;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\Repo\Store\EntityPerPage;
-use Wikibase\Repo\Store\EntityIdPager;
+use Wikibase\DataModel\Services\EntityId\EntityIdPager;
/**
* @author Addshore
diff --git a/repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php
b/repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php
index d38c2ad..d5c7085 100644
--- a/repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php
+++ b/repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php
@@ -23,7 +23,7 @@
use Wikibase\Lib\Reporting\ExceptionHandler;
use Wikibase\Lib\Reporting\MessageReporter;
use Wikibase\Lib\Store\RevisionedUnresolvedRedirectException;
-use Wikibase\Repo\Store\EntityIdPager;
+use Wikibase\DataModel\Services\EntityId\EntityIdPager;
use Wikibase\Repo\WikibaseRepo;
/**
diff --git a/repo/tests/phpunit/includes/Store/Sql/ItemsPerSiteBuilderTest.php
b/repo/tests/phpunit/includes/Store/Sql/ItemsPerSiteBuilderTest.php
index 819a836..276b379 100644
--- a/repo/tests/phpunit/includes/Store/Sql/ItemsPerSiteBuilderTest.php
+++ b/repo/tests/phpunit/includes/Store/Sql/ItemsPerSiteBuilderTest.php
@@ -7,7 +7,7 @@
use Wikibase\DataModel\Services\Entity\NullEntityPrefetcher;
use Wikibase\DataModel\Services\Lookup\EntityLookup;
use Wikibase\Lib\Store\SiteLinkTable;
-use Wikibase\Repo\Store\EntityIdPager;
+use Wikibase\DataModel\Services\EntityId\EntityIdPager;
use Wikibase\Repo\Store\Sql\ItemsPerSiteBuilder;
/**
diff --git a/repo/tests/phpunit/includes/Store/Sql/SqlEntityIdPagerTest.php
b/repo/tests/phpunit/includes/Store/Sql/SqlEntityIdPagerTest.php
index 6b14585..132b44d 100644
--- a/repo/tests/phpunit/includes/Store/Sql/SqlEntityIdPagerTest.php
+++ b/repo/tests/phpunit/includes/Store/Sql/SqlEntityIdPagerTest.php
@@ -10,7 +10,7 @@
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\Property;
use Wikibase\DataModel\Entity\PropertyId;
-use Wikibase\Repo\Store\EntityIdPager;
+use Wikibase\DataModel\Services\EntityId\EntityIdPager;
use Wikibase\Repo\Store\Sql\SqlEntityIdPager;
use Wikibase\Repo\WikibaseRepo;
diff --git a/repo/tests/phpunit/maintenance/dumpJsonTest.php
b/repo/tests/phpunit/maintenance/dumpJsonTest.php
index 3cdce79..f17092e 100644
--- a/repo/tests/phpunit/maintenance/dumpJsonTest.php
+++ b/repo/tests/phpunit/maintenance/dumpJsonTest.php
@@ -31,7 +31,7 @@
use Wikibase\DataModel\Term\TermList;
use Wikibase\DumpJson;
use Wikibase\Lib\Tests\MockRepository;
-use Wikibase\Repo\Store\EntityIdPager;
+use Wikibase\DataModel\Services\EntityId\EntityIdPager;
use Wikibase\Repo\Store\Sql\SqlEntityIdPagerFactory;
use Wikibase\Repo\Tests\MockEntityIdPager;
diff --git a/repo/tests/phpunit/maintenance/dumpRdfTest.php
b/repo/tests/phpunit/maintenance/dumpRdfTest.php
index b54a527..0493bfc 100644
--- a/repo/tests/phpunit/maintenance/dumpRdfTest.php
+++ b/repo/tests/phpunit/maintenance/dumpRdfTest.php
@@ -35,7 +35,7 @@
use Wikibase\Lib\Store\EntityTitleLookup;
use Wikibase\Lib\Tests\MockRepository;
use Wikibase\Rdf\RdfVocabulary;
-use Wikibase\Repo\Store\EntityIdPager;
+use Wikibase\DataModel\Services\EntityId\EntityIdPager;
use Wikibase\Repo\Store\Sql\SqlEntityIdPagerFactory;
use Wikibase\Repo\Tests\MockEntityIdPager;
use Wikibase\Repo\WikibaseRepo;
--
To view, visit https://gerrit.wikimedia.org/r/330161
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7d522ef949f6980961cba3da48ab350d00134cd7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
