Skip to content

ST_GEOHEX fix for excessive object creation in bounded grids #130343

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 5 commits into from
Jul 3, 2025
Merged

ST_GEOHEX fix for excessive object creation in bounded grids #130343

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e5f72f9
Use new objects per thread instead of per record
craigtaverner Jun 30, 2025
889e895
Update docs/changelog/130343.yaml
craigtaverner Jun 30, 2025
bf3b40d
Delete docs/changelog/130343.yaml
craigtaverner Jun 30, 2025
55a9af0
Expand tests to use random bounds, after multi-thread fix
craigtaverner Jul 1, 2025
925a6a5
Merge branch 'main' into esql_geogrid_less_objects
craigtaverner Jul 3, 2025
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 docs/reference/query-languages/esql/kibana/definition/functions/st_geohash.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/query-languages/esql/kibana/definition/functions/st_geohex.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/query-languages/esql/kibana/definition/functions/st_geotile.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions ...l/expression/function/scalar/spatial/StGeohashFromFieldAndLiteralAndLiteralEvaluator.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions ...ion/function/scalar/spatial/StGeohashFromFieldDocValuesAndLiteralAndLiteralEvaluator.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions ...ql/expression/function/scalar/spatial/StGeohexFromFieldAndLiteralAndLiteralEvaluator.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions ...sion/function/scalar/spatial/StGeohexFromFieldDocValuesAndLiteralAndLiteralEvaluator.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions ...l/expression/function/scalar/spatial/StGeotileFromFieldAndLiteralAndLiteralEvaluator.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions ...ion/function/scalar/spatial/StGeotileFromFieldDocValuesAndLiteralAndLiteralEvaluator.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 2 additions & 7 deletions ...g/elasticsearch/xpack/esql/expression/function/scalar/spatial/GeoHexBoundedPredicate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,15 @@
public class GeoHexBoundedPredicate {

private final boolean crossesDateline;
private final GeoBoundingBox bbox;
private final GeoBoundingBox bbox, scratch;

GeoHexBoundedPredicate(GeoBoundingBox bbox) {
this.crossesDateline = bbox.right() < bbox.left();
// TODO remove this once we get serverless flaky tests to pass
// assert this.crossesDateline == false;
this.bbox = bbox;
this.scratch = new GeoBoundingBox(new org.elasticsearch.common.geo.GeoPoint(), new org.elasticsearch.common.geo.GeoPoint());
}

public boolean validHex(long hex) {
GeoBoundingBox scratch = new GeoBoundingBox(
new org.elasticsearch.common.geo.GeoPoint(),
new org.elasticsearch.common.geo.GeoPoint()
);
H3SphericalUtil.computeGeoBounds(hex, scratch);
if (bbox.top() > scratch.bottom() && bbox.bottom() < scratch.top()) {
if (scratch.left() > scratch.right()) {
Expand Down
Loading
Loading