jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/333129 )
Change subject: Update search mappings for elasticsearch 5.x
......................................................................
Update search mappings for elasticsearch 5.x
Bug: T155671
Change-Id: Iaa68cadd80e8d17433dada59c6677661ea13c266
---
M .gitreview
M includes/Search/GeoPointIndexField.php
2 files changed, 1 insertion(+), 13 deletions(-)
Approvals:
jenkins-bot: Verified
DCausse: Looks good to me, approved
diff --git a/.gitreview b/.gitreview
index 168953d..b1b211f 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,3 +3,4 @@
port=29418
project=mediawiki/extensions/GeoData.git
track=1
+defaultbranch=es5
diff --git a/includes/Search/GeoPointIndexField.php
b/includes/Search/GeoPointIndexField.php
index b9c7bff..bed162f 100644
--- a/includes/Search/GeoPointIndexField.php
+++ b/includes/Search/GeoPointIndexField.php
@@ -22,18 +22,5 @@
public function __construct( $name, SearchConfig $config ) {
parent::__construct( $name, $this->typeName, $config );
}
-
- /**
- * @param SearchConfig $engine
- * @return array elasticsearch mapping
- */
- public function getMapping( SearchEngine $engine ) {
- $fields = parent::getMapping( $engine );
- // Used by the geo distance query to run bounding box
- // optimization query
- // @fixme: lat_lon will be removed in elastic 5x
- $fields['lat_lon'] = true;
- return $fields;
- }
}
--
To view, visit https://gerrit.wikimedia.org/r/333129
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaa68cadd80e8d17433dada59c6677661ea13c266
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GeoData
Gerrit-Branch: es5
Gerrit-Owner: EBernhardson <[email protected]>
Gerrit-Reviewer: DCausse <[email protected]>
Gerrit-Reviewer: EBernhardson <[email protected]>
Gerrit-Reviewer: MaxSem <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
