EBernhardson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/338032 )
Change subject: [DNM] Convert GeoData for elasticsearch 5 update
......................................................................
[DNM] Convert GeoData for elasticsearch 5 update
Once elasticsearch 5 is shipped out the configuration of geo_point
fields slightly changes. It will no longer be necessary to specify what
type of input will be provided, instead the field just accepts all
possible inputs and figures out what was provided at index time.
Don't merge this until after the elasticsearch 5 upgrade. Indices
created before we switch to es 5 need this config in the mapping.
Bug: T158143
Change-Id: I68b6fd8929cd76c79388086587e8eabe62b9feb2
---
M includes/Search/GeoPointIndexField.php
1 file changed, 0 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GeoData
refs/changes/32/338032/1
diff --git a/includes/Search/GeoPointIndexField.php
b/includes/Search/GeoPointIndexField.php
index b9c7bff..261f487 100644
--- a/includes/Search/GeoPointIndexField.php
+++ b/includes/Search/GeoPointIndexField.php
@@ -14,26 +14,12 @@
*/
protected $typeName = 'geo_point';
-
/**
* @param string $name name of the field
* @param SearchConfig $config CirrusSearch config
*/
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/338032
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I68b6fd8929cd76c79388086587e8eabe62b9feb2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GeoData
Gerrit-Branch: master
Gerrit-Owner: EBernhardson <ebernhard...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
