Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support a deep path when sampling geo_shape fields #2241

Open
wants to merge 1 commit into
base: 7.13
Choose a base branch
from
Open

Support a deep path when sampling geo_shape fields #2241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mr/src/main/java/org/elasticsearch/hadoop/rest/RestRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ public Map<String, GeoField> sampleGeoFields(Mapping mapping) {
Map<String, GeoField> geoInfo = new LinkedHashMap<String, GeoField>();
for (Entry<String, GeoType> geoEntry : fields.entrySet()) {
String fieldName = geoEntry.getKey();
geoInfo.put(fieldName, MappingUtils.parseGeoInfo(geoEntry.getValue(), geoMapping.get(fieldName)));
geoInfo.put(fieldName, MappingUtils.parseGeoInfo(geoEntry.getValue(), MappingUtils.getGeoMapping(geoMapping, fieldName)));
}

return geoInfo;
Expand Down
19 changes: 19 additions & 0 deletions mr/src/main/java/org/elasticsearch/hadoop/serialization/dto/mapping/MappingUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,25 @@ public abstract class MappingUtils {
"_parent", "_routing", "_index", "_size", "_timestamp", "_ttl", "_field_names", "_meta"));
}

public static Object getGeoMapping(Map<String, Object> map, String path) {
String[] keys = path.split("\\.");
Object currentValue = map;

for (String key : keys) {
if (currentValue instanceof ArrayList) {
currentValue = ((ArrayList)currentValue).get(0);
}

if (currentValue instanceof Map) {
currentValue = ((Map<String, Object>) currentValue).get(key);
} else {
return null;
}
}

return currentValue;
}

public static void validateMapping(String fields, Mapping mapping, FieldPresenceValidation validation, Log log) {
if (StringUtils.hasText(fields)) {
validateMapping(StringUtils.tokenize(fields), mapping, validation, log);
Expand Down
50 changes: 50 additions & 0 deletions .../sql-13/src/itest/scala/org/elasticsearch/spark/integration/AbstractScalaEsSparkSQL.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1819,6 +1819,56 @@ class AbstractScalaEsScalaSparkSQL(prefix: String, readMetadata: jl.Boolean, pus
assertThat(array(1), is(0.0d))
}

@Test
def testGeoShapePointDeep() {
val mapping = wrapMapping("data", s"""{
| "properties": {
| "name": {
| "type": "$keyword"
| },
| "location": {
| "properties": {
| "deep": {
| "type": "geo_shape"
| }
| }
| }
| }
| }
""".stripMargin)

val index = wrapIndex("sparksql-test-geoshape-point-geoshape-deep")
val typed = "data"
val (target, _) = makeTargets(index, typed)
RestUtils.touch(index)
RestUtils.putMapping(index, typed, mapping.getBytes(StringUtils.UTF_8))

val point = """{"name":"point", "location": { "deep":{ "type" : "point", "coordinates": [100.0, 0.0] } }}""".stripMargin

sc.makeRDD(Seq(point)).saveJsonToEs(target)
val df = sqc.read.format("es").load(index)

println(df.schema.treeString)

val dataType = df.schema("location").dataType.asInstanceOf[StructType]("deep").dataType
assertEquals("struct", dataType.typeName)

val struct = dataType.asInstanceOf[StructType]
assertTrue(struct.fieldNames.contains("type"))
var coords = struct("coordinates").dataType
assertEquals("array", coords.typeName)
coords = coords.asInstanceOf[ArrayType].elementType
assertEquals("double", coords.typeName)

val head = df.select("location.*").head()

val obj = head.getStruct(0)
assertThat(obj.getString(0), is("point"))
val array = obj.getSeq[Double](1)
assertThat(array(0), is(100.0d))
assertThat(array(1), is(0.0d))
}

@Test
def testGeoShapeLine() {
val mapping = wrapMapping("data", s"""{
Expand Down
52 changes: 51 additions & 1 deletion .../sql-20/src/itest/scala/org/elasticsearch/spark/integration/AbstractScalaEsSparkSQL.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1881,6 +1881,56 @@ class AbstractScalaEsScalaSparkSQL(prefix: String, readMetadata: jl.Boolean, pus
assertThat(array(1), is(0.0d))
}

@Test
def testGeoShapePointDeep() {
val mapping = wrapMapping("data", s"""{
| "properties": {
| "name": {
| "type": "$keyword"
| },
| "location": {
| "properties": {
| "deep": {
| "type": "geo_shape"
| }
| }
| }
| }
| }
""".stripMargin)

val index = wrapIndex("sparksql-test-geoshape-point-geoshape-deep")
val typed = "data"
val (target, _) = makeTargets(index, typed)
RestUtils.touch(index)
RestUtils.putMapping(index, typed, mapping.getBytes(StringUtils.UTF_8))

val point = """{"name":"point", "location": { "deep":{ "type" : "point", "coordinates": [100.0, 0.0] } }}""".stripMargin

sc.makeRDD(Seq(point)).saveJsonToEs(target)
val df = sqc.read.format("es").load(index)

println(df.schema.treeString)

val dataType = df.schema("location").dataType.asInstanceOf[StructType]("deep").dataType
assertEquals("struct", dataType.typeName)

val struct = dataType.asInstanceOf[StructType]
assertTrue(struct.fieldNames.contains("type"))
var coords = struct("coordinates").dataType
assertEquals("array", coords.typeName)
coords = coords.asInstanceOf[ArrayType].elementType
assertEquals("double", coords.typeName)

val head = df.select("location.*").head()

val obj = head.getStruct(0)
assertThat(obj.getString(0), is("point"))
val array = obj.getSeq[Double](1)
assertThat(array(0), is(100.0d))
assertThat(array(1), is(0.0d))
}

@Test
def testGeoShapeLine() {
val mapping = wrapMapping("data", s"""{
Expand All @@ -1905,7 +1955,7 @@ class AbstractScalaEsScalaSparkSQL(prefix: String, readMetadata: jl.Boolean, pus

sc.makeRDD(Seq(line)).saveJsonToEs(target)
val df = sqc.read.format("es").load(index)

val dataType = df.schema("location").dataType
assertEquals("struct", dataType.typeName)

Expand Down
50 changes: 50 additions & 0 deletions .../sql-30/src/itest/scala/org/elasticsearch/spark/integration/AbstractScalaEsSparkSQL.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1881,6 +1881,56 @@ class AbstractScalaEsScalaSparkSQL(prefix: String, readMetadata: jl.Boolean, pus
assertThat(array(1), is(0.0d))
}

@Test
def testGeoShapePointDeep() {
val mapping = wrapMapping("data", s"""{
| "properties": {
| "name": {
| "type": "$keyword"
| },
| "location": {
| "properties": {
| "deep": {
| "type": "geo_shape"
| }
| }
| }
| }
| }
""".stripMargin)

val index = wrapIndex("sparksql-test-geoshape-point-geoshape-deep")
val typed = "data"
val (target, _) = makeTargets(index, typed)
RestUtils.touch(index)
RestUtils.putMapping(index, typed, mapping.getBytes(StringUtils.UTF_8))

val point = """{"name":"point", "location": { "deep":{ "type" : "point", "coordinates": [100.0, 0.0] } }}""".stripMargin

sc.makeRDD(Seq(point)).saveJsonToEs(target)
val df = sqc.read.format("es").load(index)

println(df.schema.treeString)

val dataType = df.schema("location").dataType.asInstanceOf[StructType]("deep").dataType
assertEquals("struct", dataType.typeName)

val struct = dataType.asInstanceOf[StructType]
assertTrue(struct.fieldNames.contains("type"))
var coords = struct("coordinates").dataType
assertEquals("array", coords.typeName)
coords = coords.asInstanceOf[ArrayType].elementType
assertEquals("double", coords.typeName)

val head = df.select("location.*").head()

val obj = head.getStruct(0)
assertThat(obj.getString(0), is("point"))
val array = obj.getSeq[Double](1)
assertThat(array(0), is(100.0d))
assertThat(array(1), is(0.0d))
}

@Test
def testGeoShapeLine() {
val mapping = wrapMapping("data", s"""{
Expand Down