Bsitu has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/102569


Change subject: The batch query for rev_id is not working as it's supposed to
......................................................................

The batch query for rev_id is not working as it's supposed to

Instead of firing one batch query, it's still firing individual queries

Change-Id: Ic913ea15a099ead430dd1114d739609c67a49a56
---
M includes/Data/RevisionStorage.php
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow 
refs/changes/69/102569/1

diff --git a/includes/Data/RevisionStorage.php 
b/includes/Data/RevisionStorage.php
index 4349bd4..5f86473 100644
--- a/includes/Data/RevisionStorage.php
+++ b/includes/Data/RevisionStorage.php
@@ -103,7 +103,7 @@
                if ( $options['LIMIT'] === 1 &&
                        !isset( $options['OFFSET'] ) &&
                        count( $queriedKeys ) === 1 &&
-                       in_array( reset( $queriedKeys ), array( 'rev_id', 
$this->joinField() ) ) &&
+                       in_array( reset( $queriedKeys ), array( 'rev_id', 
$this->joinField(), $this->relatedPk() ) ) &&
                        isset( $options['ORDER BY'] ) && count( $options['ORDER 
BY'] ) === 1 &&
                        in_array( reset( $options['ORDER BY'] ), array( 'rev_id 
DESC', "{$this->joinField()} DESC" ) )
                ) {
@@ -130,8 +130,9 @@
                //               ) max ON max.tree_rev_id = rev.tree_rev_id
                //
                $duplicator = new ResultDuplicator( array_keys( reset( $queries 
) ), 1 );
+               $joinField = $this->joinField();
                foreach ( $queries as $idx => $query ) {
-                       $duplicator->add( $query, $idx );
+                       $duplicator->add( UUID::convertUUIDs( $query ), $idx );
                }
 
                $dbr = $this->dbFactory->getDB( DB_MASTER );

-- 
To view, visit https://gerrit.wikimedia.org/r/102569
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic913ea15a099ead430dd1114d739609c67a49a56
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Bsitu <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to