honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16173 from javanna/enhancement/geoip_location_object 

Geoip processor: remove redundant latitude and longitude fields and make location an object with lat and lon subfields
This commit is contained in:
Luca Cavanna 2016-01-22 12:59:17 +01:00
parent 17a36aecff 4ad5e67433
commit 88e7830a53
3 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpProcessor.java
View File

@ -163,16 +163,11 @@ public final class GeoIpProcessor extends AbstractProcessor {
case TIMEZONE: case TIMEZONE:
geoData.put("timezone", location.getTimeZone()); geoData.put("timezone", location.getTimeZone());
break; break;
case LATITUDE:
geoData.put("latitude", location.getLatitude());
break;
case LONGITUDE:
geoData.put("longitude", location.getLongitude());
break;
case LOCATION: case LOCATION:
if (location.getLatitude() != null && location.getLongitude() != null) { Map<String, Object> locationObject = new HashMap<>();
geoData.put("location", Arrays.asList(location.getLongitude(), location.getLatitude())); locationObject.put("lat", location.getLatitude());
} locationObject.put("lon", location.getLongitude());
geoData.put("location", locationObject);
break; break;
} }
} }

12
plugins/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorTests.java
View File

@ -20,12 +20,11 @@
package org.elasticsearch.ingest.geoip; package org.elasticsearch.ingest.geoip;
import com.maxmind.geoip2.DatabaseReader; import com.maxmind.geoip2.DatabaseReader;
import org.elasticsearch.ingest.core.IngestDocument;
import org.elasticsearch.ingest.RandomDocumentPicks; import org.elasticsearch.ingest.RandomDocumentPicks;
import org.elasticsearch.ingest.core.IngestDocument;
import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.ESTestCase;
import java.io.InputStream; import java.io.InputStream;
import java.util.Arrays;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -47,7 +46,7 @@ public class GeoIpProcessorTests extends ESTestCase {
assertThat(ingestDocument.getSourceAndMetadata().get("source_field"), equalTo("82.170.213.79")); assertThat(ingestDocument.getSourceAndMetadata().get("source_field"), equalTo("82.170.213.79"));
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
Map<String, Object> geoData = (Map<String, Object>) ingestDocument.getSourceAndMetadata().get("target_field"); Map<String, Object> geoData = (Map<String, Object>) ingestDocument.getSourceAndMetadata().get("target_field");
assertThat(geoData.size(), equalTo(10)); assertThat(geoData.size(), equalTo(8));
assertThat(geoData.get("ip"), equalTo("82.170.213.79")); assertThat(geoData.get("ip"), equalTo("82.170.213.79"));
assertThat(geoData.get("country_iso_code"), equalTo("NL")); assertThat(geoData.get("country_iso_code"), equalTo("NL"));
assertThat(geoData.get("country_name"), equalTo("Netherlands")); assertThat(geoData.get("country_name"), equalTo("Netherlands"));
@ -55,9 +54,10 @@ public class GeoIpProcessorTests extends ESTestCase {
assertThat(geoData.get("region_name"), equalTo("North Holland")); assertThat(geoData.get("region_name"), equalTo("North Holland"));
assertThat(geoData.get("city_name"), equalTo("Amsterdam")); assertThat(geoData.get("city_name"), equalTo("Amsterdam"));
assertThat(geoData.get("timezone"), equalTo("Europe/Amsterdam")); assertThat(geoData.get("timezone"), equalTo("Europe/Amsterdam"));
assertThat(geoData.get("latitude"), equalTo(52.374)); Map<String, Object> location = new HashMap<>();
assertThat(geoData.get("longitude"), equalTo(4.8897)); location.put("lat", 52.374d);
assertThat(geoData.get("location"), equalTo(Arrays.asList(4.8897d, 52.374d))); location.put("lon", 4.8897d);
assertThat(geoData.get("location"), equalTo(location));
} }
public void testCountry() throws Exception { public void testCountry() throws Exception {

10
plugins/ingest-geoip/src/test/resources/rest-api-spec/test/ingest_geoip/20_geoip_processor.yaml
View File

@ -33,7 +33,8 @@
- length: { _source.geoip: 5 } - length: { _source.geoip: 5 }
- match: { _source.geoip.city_name: "Minneapolis" } - match: { _source.geoip.city_name: "Minneapolis" }
- match: { _source.geoip.country_iso_code: "US" } - match: { _source.geoip.country_iso_code: "US" }
- match: { _source.geoip.location: [-93.2166, 44.9759] } - match: { _source.geoip.location.lon: -93.2166 }
- match: { _source.geoip.location.lat: 44.9759 }
- match: { _source.geoip.region_name: "Minnesota" } - match: { _source.geoip.region_name: "Minnesota" }
- match: { _source.geoip.continent_name: "North America" } - match: { _source.geoip.continent_name: "North America" }
@ -74,13 +75,12 @@
type: test type: test
id: 1 id: 1
- match: { _source.field1: "128.101.101.101" } - match: { _source.field1: "128.101.101.101" }
- length: { _source.geoip: 10 } - length: { _source.geoip: 8 }
- match: { _source.geoip.city_name: "Minneapolis" } - match: { _source.geoip.city_name: "Minneapolis" }
- match: { _source.geoip.country_iso_code: "US" } - match: { _source.geoip.country_iso_code: "US" }
- match: { _source.geoip.ip: "128.101.101.101" } - match: { _source.geoip.ip: "128.101.101.101" }
- match: { _source.geoip.latitude: 44.9759 } - match: { _source.geoip.location.lon: -93.2166 }
- match: { _source.geoip.longitude: -93.2166 } - match: { _source.geoip.location.lat: 44.9759 }
- match: { _source.geoip.location: [-93.2166, 44.9759] }
- match: { _source.geoip.timezone: "America/Chicago" } - match: { _source.geoip.timezone: "America/Chicago" }
- match: { _source.geoip.country_name: "United States" } - match: { _source.geoip.country_name: "United States" }
- match: { _source.geoip.region_name: "Minnesota" } - match: { _source.geoip.region_name: "Minnesota" }