Mixing NativeQuery with CriteriaQuery and a Criteria with GeoLocation fails

[bernhardkern]

Mixing a NativeQuery and a CriteriaQuery fails, when using Criteria with geoLocation.

Version: Spring Data ElasticSearch 5.2.2
Spring Boot Version: 3.2.2
ElasticSearch Version: 8.12.0

Github, Service demonstrating the issue

Github, Test demonstrating the issue

 val nativeGeoDistance = GeoDistanceQuery.Builder().field("location").distance("10km")            
 .location(GeoLocation.Builder().latlon(LatLonGeoLocation.Builder().lat(pointWeAreLookingFor.lat).lon(pointWeAreLookingFor.lon).build()).build()).build()
        val nq = NativeQueryBuilder().withQuery { q -> q.geoDistance(nativeGeoDistance) }.build()

        return operations.search(nq, WithGeoLocation::class.java)

delivers the expected result -> only one document is found

val cq = CriteriaQuery(Criteria("location").within(pointWeAreLookingFor, "10km"))
        val nq = NativeQueryBuilder().withQuery(cq).build()

        return operations.search(nq, WithGeoLocation::class.java)

fails, both documents are found. It also fails with bounding box queries. Everything that is geo-related.

If I run the critieriaQuery directly, without nesting it in NativeQuery, it works. Sometimes this nesting is necessary, e.g. when using Aggregations, but in general we write the Queries in CriteriaQuery.

Issue: Using a CriteriaQuery as base for the NativeQueryBuilder fails when using a geo based query. Other critiera work (e.g. Term).

[sothawo]

Had a first look at the sample repo; alas there is no explicit Spring Data Elasticsearch configuration, so I cannot just plug in an intercepting proxy to see what's going over the line. I will need to set this up in a configurable way.

[sothawo]

BTW, If you are using Elasticsearch 8.12, be aware that Elasticsearch broke the communication at one place between the client and the server, the problem comes from the server side, so it will happen with a client lib of 8.11 as well, see #2836 and the issues linked there

[sothawo]

Ok, had some time to debug this now.

A CriteriaQuery can have criteria that are defining the query part of a search, and other ones used in the filter part of a search. A geo_location within criteria is one for the filter part. And this currently is only added to the search when using a CriteriaQuery directly, not when it's added to a NativeQuery. And so in your example the whole query is basically ignored resultig inreturning all documents from the index.

So we need to fix that for a CriteriaQuery in a NativeQuery we not only add the query but also the filter part.

[sothawo]

backported to 5.2.x and 5.1.x