Skip to content

Expand tests for geo_grid aggregations #94747

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

Merged
merged 2 commits into from
Mar 27, 2023
Merged

Expand tests for geo_grid aggregations #94747

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f98294
Expand tests for geo_grid aggregations
craigtaverner Mar 24, 2023
2e6011d
Additional tests for geohash/geotile on geo_point
craigtaverner Mar 27, 2023
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
130 changes: 102 additions & 28 deletions x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/spatial/30_geotile_grid.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
---
"Test geotile_grid aggregation on geo_shape field":
setup:
- do:
indices.create:
index: locations
body:
settings:
number_of_shards: 3
mappings:
properties:
location:
Expand All @@ -12,35 +13,48 @@
- do:
bulk:
refresh: true
index: locations
body: |
{"index":{}}
{"location": "POINT(4.912350 52.374081)", "city": "Amsterdam", "name": "NEMO Science Museum"}
{"index":{}}
{"location": "POINT(4.901618 52.369219)", "city": "Amsterdam", "name": "Museum Het Rembrandthuis"}
{"index":{}}
{"location": "POINT(4.914722 52.371667)", "city": "Amsterdam", "name": "Nederlands Scheepvaartmuseum"}
{"index":{}}
{"location": "POINT(4.405200 51.222900)", "city": "Antwerp", "name": "Letterenhuis"}
{"index":{}}
{"location": "POINT(2.336389 48.861111)", "city": "Paris", "name": "Musée du Louvre"}
{"index":{}}
{"location": "POINT(2.327000 48.860000)", "city": "Paris", "name": "Musée dOrsay"}

- do:
indices.refresh: { }

---
"Test geotile_grid on geo_shape field with defaults":

- do:
search:
index: locations
size: 0
body:
- index:
_index: locations
_id: "1"
- '{"location": "POINT(4.912350 52.374081)", "city": "Amsterdam", "name": "NEMO Science Museum"}'
- index:
_index: locations
_id: "2"
- '{"location": "POINT(4.901618 52.369219)", "city": "Amsterdam", "name": "Museum Het Rembrandthuis"}'
- index:
_index: locations
_id: "3"
- '{"location": "POINT(4.914722 52.371667)", "city": "Amsterdam", "name": "Nederlands Scheepvaartmuseum"}'
- index:
_index: locations
_id: "4"
- '{"location": "POINT(4.405200 51.222900)", "city": "Antwerp", "name": "Letterenhuis"}'
- index:
_index: locations
_id: "5"
- '{"location": "POINT(2.336389 48.861111)", "city": "Paris", "name": "Musée du Louvre"}'
- index:
_index: locations
_id: "6"
- '{"location": "POINT(2.327000 48.860000)", "city": "Paris", "name": "Musée dOrsay"}'
aggs:
grid:
geotile_grid:
field: location
- match: { hits.total.value: 6 }
- length: { aggregations.grid.buckets: 2 }
- match: { aggregations.grid.buckets.0.key: "7/65/42" }
- match: { aggregations.grid.buckets.0.doc_count: 4 }
- match: { aggregations.grid.buckets.1.key: "7/64/44" }
- match: { aggregations.grid.buckets.1.doc_count: 2 }

---
"Test geotile_grid on geo_shape field with precision":

- do:
search:
rest_total_hits_as_int: true
index: locations
size: 0
body:
Expand All @@ -49,9 +63,69 @@
geotile_grid:
precision: 5
field: location
- match: {hits.total: 6 }
- match: { hits.total.value: 6 }
- length: { aggregations.grid.buckets: 2 }
- match: { aggregations.grid.buckets.0.key: "5/16/10" }
- match: { aggregations.grid.buckets.0.doc_count: 4 }
- match: { aggregations.grid.buckets.1.key: "5/16/11" }
- match: { aggregations.grid.buckets.1.doc_count: 2 }

---
"Test geotile_grid on geo_shape field with size":

- do:
search:
index: locations
size: 0
body:
aggs:
grid:
geotile_grid:
field: location
size: 1
- match: { hits.total.value: 6 }
- length: { aggregations.grid.buckets: 1 }
- match: { aggregations.grid.buckets.0.key: "7/65/42" }
- match: { aggregations.grid.buckets.0.doc_count: 4 }


---
"Test geotile_grid on geo_shape field with shard_size":

- do:
search:
index: locations
size: 0
body:
aggs:
grid:
geotile_grid:
field: location
shard_size: 10
- match: { hits.total.value: 6 }
- length: { aggregations.grid.buckets: 2 }
- match: { aggregations.grid.buckets.0.key: "7/65/42" }
- match: { aggregations.grid.buckets.0.doc_count: 4 }
- match: { aggregations.grid.buckets.1.key: "7/64/44" }
- match: { aggregations.grid.buckets.1.doc_count: 2 }


---
"Test geotile_grid on geo_shape field with bounds":

- do:
search:
index: locations
size: 0
body:
aggs:
grid:
geotile_grid:
field: location
bounds:
top_left: "POINT (4.9 52.4)"
bottom_right: "POINT (5.0 52.3)"
- match: { hits.total.value: 6 }
- length: { aggregations.grid.buckets: 1 }
- match: { aggregations.grid.buckets.0.key: "7/65/42" }
- match: { aggregations.grid.buckets.0.doc_count: 4 }
138 changes: 109 additions & 29 deletions x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/spatial/40_geohash_grid.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
---
"Test geohash_grid aggregation on geo_shape field":
setup:
- do:
indices.create:
index: locations
body:
settings:
number_of_shards: 3
mappings:
properties:
location:
Expand All @@ -12,48 +13,127 @@
- do:
bulk:
refresh: true
index: locations
body: |
{"index":{}}
{"location": "POINT(4.912350 52.374081)", "city": "Amsterdam", "name": "NEMO Science Museum"}
{"index":{}}
{"location": "POINT(4.901618 52.369219)", "city": "Amsterdam", "name": "Museum Het Rembrandthuis"}
{"index":{}}
{"location": "POINT(4.914722 52.371667)", "city": "Amsterdam", "name": "Nederlands Scheepvaartmuseum"}
{"index":{}}
{"location": "POINT(4.405200 51.222900)", "city": "Antwerp", "name": "Letterenhuis"}
{"index":{}}
{"location": "POINT(2.336389 48.861111)", "city": "Paris", "name": "Musée du Louvre"}
{"index":{}}
{"location": "POINT(2.327000 48.860000)", "city": "Paris", "name": "Musée dOrsay"}

- do:
indices.refresh: { }

---
"Test geohash_grid on geo_shape field with defaults":

- do:
search:
index: locations
size: 0
body:
- index:
_index: locations
_id: "1"
- '{"location": "POINT(4.912350 52.374081)", "city": "Amsterdam", "name": "NEMO Science Museum"}'
- index:
_index: locations
_id: "2"
- '{"location": "POINT(4.901618 52.369219)", "city": "Amsterdam", "name": "Museum Het Rembrandthuis"}'
- index:
_index: locations
_id: "3"
- '{"location": "POINT(4.914722 52.371667)", "city": "Amsterdam", "name": "Nederlands Scheepvaartmuseum"}'
- index:
_index: locations
_id: "4"
- '{"location": "POINT(4.405200 51.222900)", "city": "Antwerp", "name": "Letterenhuis"}'
- index:
_index: locations
_id: "5"
- '{"location": "POINT(2.336389 48.861111)", "city": "Paris", "name": "Musée du Louvre"}'
- index:
_index: locations
_id: "6"
- '{"location": "POINT(2.327000 48.860000)", "city": "Paris", "name": "Musée dOrsay"}'
aggs:
grid:
geohash_grid:
field: location
- match: { hits.total.value: 6 }
- length: { aggregations.grid.buckets: 4 }
- match: { aggregations.grid.buckets.0.key: "u173z" }
- match: { aggregations.grid.buckets.0.doc_count: 3 }
- match: { aggregations.grid.buckets.1.key: "u155k" }
- match: { aggregations.grid.buckets.1.doc_count: 1 }
- match: { aggregations.grid.buckets.2.key: "u09tv" }
- match: { aggregations.grid.buckets.2.doc_count: 1 }
- match: { aggregations.grid.buckets.3.key: "u09tu" }
- match: { aggregations.grid.buckets.3.doc_count: 1 }

---
"Test geohash_grid on geo_shape field with precision":

- do:
search:
rest_total_hits_as_int: true
index: locations
size: 0
body:
aggs:
grid:
geohash_grid:
precision: 4
field: location
- match: {hits.total: 6 }
precision: 4
- match: { hits.total.value: 6 }
- length: { aggregations.grid.buckets: 3 }
- match: { aggregations.grid.buckets.0.key: "u173" }
- match: { aggregations.grid.buckets.0.doc_count: 3 }
- match: { aggregations.grid.buckets.1.key: "u09t" }
- match: { aggregations.grid.buckets.1.doc_count: 2 }
- match: { aggregations.grid.buckets.2.key: "u155" }
- match: { aggregations.grid.buckets.2.doc_count: 1 }

---
"Test geohash_grid on geo_shape field with size":

- do:
search:
index: locations
size: 0
body:
aggs:
grid:
geohash_grid:
field: location
size: 1
- match: { hits.total.value: 6 }
- length: { aggregations.grid.buckets: 1 }
- match: { aggregations.grid.buckets.0.key: "u173z" }
- match: { aggregations.grid.buckets.0.doc_count: 3 }

---
"Test geohash_grid on geo_shape field with shard_size":

- do:
search:
index: locations
size: 0
body:
aggs:
grid:
geohash_grid:
field: location
shard_size: 10
- match: { hits.total.value: 6 }
- length: { aggregations.grid.buckets: 4 }
- match: { aggregations.grid.buckets.0.key: "u173z" }
- match: { aggregations.grid.buckets.0.doc_count: 3 }
- match: { aggregations.grid.buckets.1.key: "u155k" }
- match: { aggregations.grid.buckets.1.doc_count: 1 }
- match: { aggregations.grid.buckets.2.key: "u09tv" }
- match: { aggregations.grid.buckets.2.doc_count: 1 }
- match: { aggregations.grid.buckets.3.key: "u09tu" }
- match: { aggregations.grid.buckets.3.doc_count: 1 }

---
"Test geohash_grid on geo_shape field with bounds":

- do:
search:
index: locations
size: 0
body:
aggs:
grid:
geohash_grid:
field: location
bounds:
top_left: "POINT (4.9 52.4)"
bottom_right: "POINT (5.0 52.3)"
- match: { hits.total.value: 6 }
- length: { aggregations.grid.buckets: 1 }
- match: { aggregations.grid.buckets.0.key: "u173z" }
- match: { aggregations.grid.buckets.0.doc_count: 3 }
Loading