From bee139f59dccf7d349a3e491d9ca940b0ac90a7a Mon Sep 17 00:00:00 2001 From: Kunal Shroff Date: Tue, 16 Jan 2024 11:57:55 -0500 Subject: [PATCH 1/2] using match queries searches for both pvName and readbackPvName --- .../org/phoebus/service/saveandrestore/search/SearchUtil.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/services/save-and-restore/src/main/java/org/phoebus/service/saveandrestore/search/SearchUtil.java b/services/save-and-restore/src/main/java/org/phoebus/service/saveandrestore/search/SearchUtil.java index 5299f703f4..63bc00169a 100644 --- a/services/save-and-restore/src/main/java/org/phoebus/service/saveandrestore/search/SearchUtil.java +++ b/services/save-and-restore/src/main/java/org/phoebus/service/saveandrestore/search/SearchUtil.java @@ -324,8 +324,7 @@ public SearchRequest buildSearchRequestForPvs(List pvNames) { List pvQueries = new ArrayList<>(); for (String value : pvNames) { for (String pattern : value.split("[|,;]")) { - pvQueries.add(TermQuery.of(t -> t.field("pvList.pvName").value(pattern.trim()))._toQuery()); - pvQueries.add(TermQuery.of(t -> t.field("pvList.readbackPvName").value(pattern.trim()))._toQuery()); + pvQueries.add(MatchQuery.of(m -> m.field("pvList").query(pattern.trim()))._toQuery()); } } Query pvsQuery = pvQuery.queries(pvQueries).build()._toQuery(); From a15aadb98a3855aef04377bcffd70bb0cb55d3b5 Mon Sep 17 00:00:00 2001 From: Kunal Shroff Date: Tue, 16 Jan 2024 11:58:31 -0500 Subject: [PATCH 2/2] fixing SAR search unit test --- .../saveandrestore/web/controllers/SearchControllerTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/save-and-restore/src/test/java/org/phoebus/service/saveandrestore/web/controllers/SearchControllerTest.java b/services/save-and-restore/src/test/java/org/phoebus/service/saveandrestore/web/controllers/SearchControllerTest.java index dd4ab3ee4d..07ee27333e 100644 --- a/services/save-and-restore/src/test/java/org/phoebus/service/saveandrestore/web/controllers/SearchControllerTest.java +++ b/services/save-and-restore/src/test/java/org/phoebus/service/saveandrestore/web/controllers/SearchControllerTest.java @@ -100,7 +100,7 @@ public void testSearchForPVs() { SearchRequest searchRequest = searchUtil.buildSearchRequestForPvs(List.of("abc")); assertEquals(ES_CONFIGURATION_INDEX, searchRequest.index().get(0)); - assertEquals("pvList.pvName", searchRequest.query().bool().must().get(0).disMax().queries().get(0).term().field()); - assertEquals("abc", searchRequest.query().bool().must().get(0).disMax().queries().get(0).term().value().stringValue()); + assertEquals("pvList", searchRequest.query().bool().must().get(0).disMax().queries().get(0).match().field()); + assertEquals("abc", searchRequest.query().bool().must().get(0).disMax().queries().get(0).match().query().stringValue()); } }