Skip to content

Avoid deprecated from and to parameters for ES range queries #3635

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
shroffk merged 1 commit into from
Nov 10, 2025
Merged

Avoid deprecated from and to parameters for ES range queries #3635

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
6 changes: 4 additions & 2 deletions services/alarm-logger/src/main/java/org/phoebus/alarm/logging/rest/AlarmLogSearchUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import co.elastic.clients.elasticsearch._types.query_dsl.WildcardQuery;
import co.elastic.clients.elasticsearch.core.SearchRequest;
import co.elastic.clients.elasticsearch.core.SearchResponse;
import co.elastic.clients.json.JsonData;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
Expand Down Expand Up @@ -237,8 +238,9 @@ public static List<AlarmLogMessage> search(ElasticsearchClient client,
Query.of(q -> q
.range(RangeQuery.of(r -> r
.field("message_time")
.from(formatter.format(finalFromInstant))
.to(formatter.format(finalToInstant))
.gte(JsonData.of(finalFromInstant.toEpochMilli()))
.lte(JsonData.of(finalToInstant.toEpochMilli()))
.format("epoch_millis")
)
)
)
Expand Down
6 changes: 4 additions & 2 deletions .../save-and-restore/src/main/java/org/phoebus/service/saveandrestore/search/SearchUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import co.elastic.clients.elasticsearch._types.query_dsl.RangeQuery;
import co.elastic.clients.elasticsearch._types.query_dsl.WildcardQuery;
import co.elastic.clients.elasticsearch.core.SearchRequest;
import co.elastic.clients.json.JsonData;
import org.phoebus.applications.saveandrestore.model.Tag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -240,8 +241,9 @@ public SearchRequest buildSearchRequest(MultiValueMap<String, String> searchPara
DisMaxQuery.Builder temporalQuery = new DisMaxQuery.Builder();
RangeQuery.Builder rangeQuery = new RangeQuery.Builder();
// Add a query based on the created time
rangeQuery.field("node.lastModified").from(Long.toString(1000 * start.toEpochSecond()))
.to(Long.toString(1000 * end.toEpochSecond()));
rangeQuery.field("node.lastModified").gte(JsonData.of(start.toEpochSecond()))
.lte(JsonData.of(end.toEpochSecond()))
.format("epoch_second");
NestedQuery nestedQuery = NestedQuery.of(n1 -> n1.path("node").query(rangeQuery.build()._toQuery()));
temporalQuery.queries(nestedQuery._toQuery());
boolQueryBuilder.must(temporalQuery.build()._toQuery());
Expand Down