jenkins-bot has submitted this change and it was merged.
Change subject: Replace extractColumn functions by using
Database::selectFieldValues
......................................................................
Replace extractColumn functions by using Database::selectFieldValues
Change-Id: I40692a99f0873058aa9c37ae1aeb52259eb578e8
---
M client/includes/Usage/Sql/SqlSubscriptionManager.php
M repo/includes/Store/Sql/SqlSubscriptionLookup.php
2 files changed, 3 insertions(+), 42 deletions(-)
Approvals:
Ladsgroup: Looks good to me, approved
jenkins-bot: Verified
diff --git a/client/includes/Usage/Sql/SqlSubscriptionManager.php
b/client/includes/Usage/Sql/SqlSubscriptionManager.php
index e02f5b2..18381c0 100644
--- a/client/includes/Usage/Sql/SqlSubscriptionManager.php
+++ b/client/includes/Usage/Sql/SqlSubscriptionManager.php
@@ -126,7 +126,7 @@
*/
private function querySubscriptions( DatabaseBase $db, $subscriber,
array $subscriptions ) {
if ( $subscriptions ) {
- $rows = $db->select(
+ $subscriptions = $db->selectFieldValues(
'wb_changes_subscription',
'cs_entity_id',
array(
@@ -135,8 +135,6 @@
),
__METHOD__
);
-
- $subscriptions = $this->extractField( $rows,
'cs_entity_id' );
}
return $subscriptions;
@@ -200,22 +198,6 @@
}
return $rows;
- }
-
- /**
- * @param object[]|ResultWrapper $rows Plain objects
- * @param string $field The name of the field to extract from each
plain object
- *
- * @return array
- */
- private function extractField( $rows, $field ) {
- $values = array();
-
- foreach ( $rows as $row ) {
- $values[] = $row->$field;
- }
-
- return $values;
}
}
diff --git a/repo/includes/Store/Sql/SqlSubscriptionLookup.php
b/repo/includes/Store/Sql/SqlSubscriptionLookup.php
index acc95e4..bad3eee 100644
--- a/repo/includes/Store/Sql/SqlSubscriptionLookup.php
+++ b/repo/includes/Store/Sql/SqlSubscriptionLookup.php
@@ -74,14 +74,13 @@
$where = [ 'cs_entity_id' => $idToCheck->getSerialization() ];
$dbr = $this->dbLoadBalancer->getConnection( DB_REPLICA );
- $rows = $dbr->select(
+ $subscriptions = $dbr->selectFieldValues(
'wb_changes_subscription',
'cs_subscriber_id',
$where,
__METHOD__
);
- $subscriptions = $this->extractColumn( $rows,
'cs_subscriber_id' );
$this->dbLoadBalancer->reuseConnection( $dbr );
return $subscriptions;
@@ -105,16 +104,12 @@
$where['cs_entity_id'] = $idsToCheck;
}
- $rows = $db->select(
+ return $db->selectFieldValues(
'wb_changes_subscription',
'cs_entity_id',
$where,
__METHOD__
);
-
- $subscriptions = $this->extractColumn( $rows, 'cs_entity_id' );
-
- return $subscriptions;
}
/**
@@ -131,22 +126,6 @@
}
return $reindexed;
- }
-
- /**
- * @param object[]|ResultWrapper $rows Plain objects
- * @param string $field The name of the field to extract from each
plain object
- *
- * @return array
- */
- private function extractColumn( $rows, $field ) {
- $values = array();
-
- foreach ( $rows as $row ) {
- $values[] = $row->$field;
- }
-
- return $values;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/312965
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I40692a99f0873058aa9c37ae1aeb52259eb578e8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man <h...@online.de>
Gerrit-Reviewer: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: Daniel Kinzler <daniel.kinz...@wikimedia.de>
Gerrit-Reviewer: Ladsgroup <ladsgr...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
