jenkins-bot has submitted this change and it was merged.
Change subject: Disable dynamic mapping
......................................................................
Disable dynamic mapping
This forces new fields to be manually added which is what we want because
the dynamic mapping is never right.
Bug: 58643
Change-Id: Ie3330ca88071778b8ca8c72e7d8acbcd24760931
---
M includes/CirrusSearchMappingConfigBuilder.php
M maintenance/updateOneSearchIndexConfig.php
2 files changed, 7 insertions(+), 1 deletion(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/CirrusSearchMappingConfigBuilder.php
b/includes/CirrusSearchMappingConfigBuilder.php
index f4de3f9..4584880 100644
--- a/includes/CirrusSearchMappingConfigBuilder.php
+++ b/includes/CirrusSearchMappingConfigBuilder.php
@@ -47,6 +47,7 @@
}
return array(
+ 'dynamic' => false,
'properties' => array(
'timestamp' => array(
'type' => 'date',
@@ -63,6 +64,7 @@
'text_bytes' => $this->buildLongField(),
'text_words' => $this->buildLongField(),
'redirect' => array(
+ 'dynamic' => false,
'properties' => array(
'namespace' =>
$this->buildLongField(),
'title' =>
$this->buildStringField( 'title', array( 'suggest' ) ),
diff --git a/maintenance/updateOneSearchIndexConfig.php
b/maintenance/updateOneSearchIndexConfig.php
index 489a1d1..0f98dc4 100644
--- a/maintenance/updateOneSearchIndexConfig.php
+++ b/maintenance/updateOneSearchIndexConfig.php
@@ -258,7 +258,7 @@
$this->output( $this->indent . "\tValidating mapping for page
type..." );
$requiredPageMappings =
CirrusSearchMappingConfigBuilder::build();
- if ( array_key_exists( 'page', $actualMappings) &&
+ if ( array_key_exists( 'page', $actualMappings ) &&
$this->vmActualMatchRequired( $actualMappings[
'page' ], $requiredPageMappings ) ) {
$this->output( "ok\n" );
} else {
@@ -298,6 +298,10 @@
}
continue;
}
+
+ if ( $actual[ $key ] === 'false' ) {
+ $actual[ $key ] = false;
+ }
// Note that I really mean !=, not !==. Coercion is
cool here.
if ( $actual[ $key ] != $value ) {
return false;
--
To view, visit https://gerrit.wikimedia.org/r/102572
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie3330ca88071778b8ca8c72e7d8acbcd24760931
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Manybubbles <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
