jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/343210 )

Change subject: Make mapping dump return all mappings, not just page mapping
......................................................................


Make mapping dump return all mappings, not just page mapping

Change-Id: I4fc24116c4afcf6f2b01e6477fb77e28fad29ce9
---
M includes/Api/MappingDump.php
1 file changed, 4 insertions(+), 2 deletions(-)

Approvals:
  Cindy-the-browser-test-bot: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  DCausse: Looks good to me, approved



diff --git a/includes/Api/MappingDump.php b/includes/Api/MappingDump.php
index 76c23c5..e82edff 100644
--- a/includes/Api/MappingDump.php
+++ b/includes/Api/MappingDump.php
@@ -2,6 +2,7 @@
 
 namespace CirrusSearch\Api;
 
+use CirrusSearch\Connection;
 use CirrusSearch\SearchConfig;
 
 /**
@@ -27,9 +28,10 @@
                $conn = $this->getCirrusConnection();
                $indexPrefix = $this->getSearchConfig()->get( 
SearchConfig::INDEX_BASE_NAME );
                foreach( $conn->getAllIndexTypes() as $index ) {
-                       $mapping = $conn->getPageType( $indexPrefix, $index 
)->getMapping();
+                       $mapping = $conn->getIndex( $indexPrefix, $index 
)->getMapping();
                        $this->getResult()->addValue( null, $index, $mapping );
-                       $this->getResult()->addPreserveKeysList( [ $index, 
'page' ], '_all' );
+                       $this->getResult()->addPreserveKeysList( [ $index, 
Connection::PAGE_TYPE_NAME ], '_all' );
+                       $this->getResult()->addPreserveKeysList( [ $index, 
Connection::NAMESPACE_TYPE_NAME ], '_all' );
                }
        }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4fc24116c4afcf6f2b01e6477fb77e28fad29ce9
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Smalyshev <[email protected]>
Gerrit-Reviewer: Cindy-the-browser-test-bot <[email protected]>
Gerrit-Reviewer: DCausse <[email protected]>
Gerrit-Reviewer: EBernhardson <[email protected]>
Gerrit-Reviewer: Gehel <[email protected]>
Gerrit-Reviewer: Smalyshev <[email protected]>
Gerrit-Reviewer: Tjones <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to