Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154251
Change subject: Fix SqlEntityInfoBuilder(Factory) constructor parameters
......................................................................
Fix SqlEntityInfoBuilder(Factory) constructor parameters
Please backport this to test.wikidata.org.
Change-Id: Ic5add9def5bcc84a99ce82a03488b7cc305f4076
---
M lib/includes/store/sql/SqlEntityInfoBuilder.php
M lib/includes/store/sql/SqlEntityInfoBuilderFactory.php
M repo/includes/store/sql/SqlStore.php
3 files changed, 10 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/51/154251/1
diff --git a/lib/includes/store/sql/SqlEntityInfoBuilder.php
b/lib/includes/store/sql/SqlEntityInfoBuilder.php
index 98ef85d..bfad64f 100644
--- a/lib/includes/store/sql/SqlEntityInfoBuilder.php
+++ b/lib/includes/store/sql/SqlEntityInfoBuilder.php
@@ -87,7 +87,7 @@
* @var array[] map of entity types to maps of id-strings to numeric
ids:
* type => id-string => id-int
*/
- private $numericIdsByType = null;
+ private $numericIdsByType = array();
/**
* Maps of id strings to page info records, grouped by entity type.
@@ -560,7 +560,6 @@
? 'epp_redirect_target'
: 'NULL AS epp_redirect_target'
);
-
$res = $dbw->select(
$this->entityPerPageTable,
diff --git a/lib/includes/store/sql/SqlEntityInfoBuilderFactory.php
b/lib/includes/store/sql/SqlEntityInfoBuilderFactory.php
index c04fa7a..c052469 100644
--- a/lib/includes/store/sql/SqlEntityInfoBuilderFactory.php
+++ b/lib/includes/store/sql/SqlEntityInfoBuilderFactory.php
@@ -6,7 +6,6 @@
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\Lib\Store\EntityInfoBuilder;
use Wikibase\Lib\Store\EntityInfoBuilderFactory;
-use Wikibase\Lib\Store\EntityRevisionLookup;
/**
* A factory for SqlEntityInfoBuilder instances.
@@ -21,9 +20,9 @@
class SqlEntityInfoBuilderFactory implements EntityInfoBuilderFactory {
/**
- * @var EntityRevisionLookup
+ * @var bool
*/
- private $entityRevisionLookup;
+ private $useRedirectTargetColumn;
/**
* @var bool
@@ -31,18 +30,18 @@
private $wiki;
/**
- * @param EntityRevisionLookup $entityRevisionLookup
+ * @param bool $useRedirectTargetColumn
* @param string|bool $wiki The wiki's database to connect to.
* Must be a value LBFactory understands. Defaults to false,
which is the local wiki.
*
* @throws InvalidArgumentException
*/
- public function __construct( EntityRevisionLookup
$entityRevisionLookup, $wiki = false ) {
+ public function __construct( $useRedirectTargetColumn = true, $wiki =
false ) {
if ( !is_string( $wiki ) && $wiki !== false ) {
throw new InvalidArgumentException( '$wiki must be a
string or false.' );
}
- $this->entityRevisionLookup = $entityRevisionLookup;
+ $this->useRedirectTargetColumn = $useRedirectTargetColumn;
$this->wiki = $wiki;
}
@@ -54,6 +53,7 @@
* @return EntityInfoBuilder
*/
public function newEntityInfoBuilder( array $ids ) {
- return new SqlEntityInfoBuilder( $ids,
$this->entityRevisionLookup, $this->wiki );
+ return new SqlEntityInfoBuilder( $ids,
$this->useRedirectTargetColumn, $this->wiki );
}
+
}
diff --git a/repo/includes/store/sql/SqlStore.php
b/repo/includes/store/sql/SqlStore.php
index 8536947..41d4b77 100644
--- a/repo/includes/store/sql/SqlStore.php
+++ b/repo/includes/store/sql/SqlStore.php
@@ -10,7 +10,6 @@
use ObjectCache;
use Revision;
use Wikibase\Lib\Reporting\ObservableMessageReporter;
-use Wikibase\DataModel\Entity\BasicEntityIdParser;
use Wikibase\Lib\Store\CachingEntityRevisionLookup;
use Wikibase\Lib\Store\EntityContentDataCodec;
use Wikibase\Lib\Store\EntityInfoBuilderFactory;
@@ -18,13 +17,12 @@
use Wikibase\Lib\Store\EntityRevisionLookup;
use Wikibase\Lib\Store\EntityStore;
use Wikibase\Lib\Store\EntityStoreWatcher;
-use Wikibase\Lib\Store\RevisionBasedEntityLookup;
use Wikibase\Lib\Store\RedirectResolvingEntityLookup;
+use Wikibase\Lib\Store\RevisionBasedEntityLookup;
use Wikibase\Lib\Store\SiteLinkCache;
use Wikibase\Lib\Store\SiteLinkTable;
use Wikibase\Lib\Store\Sql\SqlEntityInfoBuilderFactory;
use Wikibase\Lib\Store\WikiPageEntityRevisionLookup;
-use Wikibase\Lib\Test\Store\RedirectResolvingEntityLookupTest;
use Wikibase\Repo\Store\DispatchingEntityStoreWatcher;
use Wikibase\Repo\Store\WikiPageEntityStore;
use Wikibase\Repo\WikibaseRepo;
@@ -606,7 +604,7 @@
* @return EntityInfoBuilderFactory
*/
protected function newEntityInfoBuilderFactory() {
- return new SqlEntityInfoBuilderFactory(
$this->getEntityRevisionLookup() );
+ return new SqlEntityInfoBuilderFactory(
$this->useRedirectTargetColumn );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/154251
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic5add9def5bcc84a99ce82a03488b7cc305f4076
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: mw1.24-wmf17
Gerrit-Owner: Aude <[email protected]>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
