Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/235459
Change subject: Fix/clarify some comments
......................................................................
Fix/clarify some comments
Change-Id: I272e6a48346370b27e3c42b4f8241ab2b1b3f73a
---
M includes/Data/Compactor/FeatureCompactor.php
M includes/Data/Index/FeatureIndex.php
2 files changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/59/235459/1
diff --git a/includes/Data/Compactor/FeatureCompactor.php
b/includes/Data/Compactor/FeatureCompactor.php
index 426ee3a..cc2dda9 100644
--- a/includes/Data/Compactor/FeatureCompactor.php
+++ b/includes/Data/Compactor/FeatureCompactor.php
@@ -59,7 +59,7 @@
* The $keyToQuery array maps from cache key to the values that were
used to build the cache key.
* These values are re-added to the results found in memcache.
*
- * @param array $cached Array of results from BagOStuff::multiGet each
containg a list of rows
+ * @param array $cached Array of results from BagOStuff::multiGet each
containing a list of rows
* @param array $keyToQuery Map from key in $cached to the values used
to generate that key
* @return array The $cached array with the queried values merged in
* @throws DataModelException
diff --git a/includes/Data/Index/FeatureIndex.php
b/includes/Data/Index/FeatureIndex.php
index adda6c1..52a3600 100644
--- a/includes/Data/Index/FeatureIndex.php
+++ b/includes/Data/Index/FeatureIndex.php
@@ -400,6 +400,7 @@
// figure out what queries were resolved in cache
// $keysFromCache will be an array where values are cache keys
and keys
// are the same index as their corresponding $queries
+ // (intersect with $cacheKeys to guarantee order)
$keysFromCache = array_intersect( $cacheKeys, array_keys(
$fromCache ) );
// filter out all queries that have been resolved from cache
and fetch
--
To view, visit https://gerrit.wikimedia.org/r/235459
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I272e6a48346370b27e3c42b4f8241ab2b1b3f73a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
