jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/368626 )
Change subject: Simplify TermSqlIndexBuilder's setter for the read full entity
id column flag
......................................................................
Simplify TermSqlIndexBuilder's setter for the read full entity id column flag
For consistency with other boolean flag setters of this class.
Change-Id: Ic832bad7e692f019ece2823f622f9afacb884192
---
M repo/includes/Store/Sql/TermSqlIndexBuilder.php
M repo/maintenance/rebuildTermSqlIndex.php
M repo/tests/phpunit/includes/Store/Sql/TermSqlIndexBuilderTest.php
3 files changed, 7 insertions(+), 12 deletions(-)
Approvals:
Aleksey Bekh-Ivanov (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/Store/Sql/TermSqlIndexBuilder.php
b/repo/includes/Store/Sql/TermSqlIndexBuilder.php
index 1de3c4a..fcd7fb3 100644
--- a/repo/includes/Store/Sql/TermSqlIndexBuilder.php
+++ b/repo/includes/Store/Sql/TermSqlIndexBuilder.php
@@ -130,12 +130,11 @@
$this->batchSize = $size;
}
- public function setReadFullEntityIdColumn() {
- $this->readFullEntityIdColumn = true;
- }
-
- public function setDoNotReadFullEntityIdColumn() {
- $this->readFullEntityIdColumn = false;
+ /**
+ * @param bool $readFullEntityIdColumn
+ */
+ public function setReadFullEntityIdColumn( $readFullEntityIdColumn ) {
+ $this->readFullEntityIdColumn = $readFullEntityIdColumn;
}
public function rebuild() {
diff --git a/repo/maintenance/rebuildTermSqlIndex.php
b/repo/maintenance/rebuildTermSqlIndex.php
index 72b7fd0..b99e8de 100644
--- a/repo/maintenance/rebuildTermSqlIndex.php
+++ b/repo/maintenance/rebuildTermSqlIndex.php
@@ -93,11 +93,7 @@
$builder->setProgressReporter( $this->getReporter() );
$builder->setErrorReporter( $this->getErrorReporter() );
$builder->setBatchSize( $batchSize );
- if ( $repoSettings->getSetting( 'readFullEntityIdColumn' ) ) {
- $builder->setReadFullEntityIdColumn();
- } else {
- $builder->setDoNotReadFullEntityIdColumn();
- }
+ $builder->setReadFullEntityIdColumn( $repoSettings->getSetting(
'readFullEntityIdColumn' ) );
if ( $fromId !== null ) {
$builder->setFromId( (int)$fromId );
diff --git a/repo/tests/phpunit/includes/Store/Sql/TermSqlIndexBuilderTest.php
b/repo/tests/phpunit/includes/Store/Sql/TermSqlIndexBuilderTest.php
index c56ca37..0d2ca11 100644
--- a/repo/tests/phpunit/includes/Store/Sql/TermSqlIndexBuilderTest.php
+++ b/repo/tests/phpunit/includes/Store/Sql/TermSqlIndexBuilderTest.php
@@ -194,7 +194,7 @@
);
$builder->setBatchSize( 2 );
- $builder->setDoNotReadFullEntityIdColumn();
+ $builder->setReadFullEntityIdColumn( false );
return $builder;
}
--
To view, visit https://gerrit.wikimedia.org/r/368626
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic832bad7e692f019ece2823f622f9afacb884192
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: WMDE-leszek <[email protected]>
Gerrit-Reviewer: Aleksey Bekh-Ivanov (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
