From 88b0e083a62aed24f979092c35e52365e78571a8 Mon Sep 17 00:00:00 2001 From: zane-neo Date: Thu, 23 Jan 2025 16:57:39 +0800 Subject: [PATCH] Fix test failure after lucene version upgraded to 10 Signed-off-by: zane-neo --- .../ml/client/MachineLearningNodeClientTest.java | 2 +- .../ml/common/model/LocalRegexGuardrail.java | 4 ++-- .../ml/engine/indices/MLInputDatasetHandler.java | 2 +- .../ml/engine/tools/VisualizationsTool.java | 2 +- .../TransportUpdateModelGroupAction.java | 2 +- .../register/TransportRegisterModelAction.java | 2 +- .../undeploy/TransportUndeployModelsAction.java | 2 +- .../TransportRegisterModelMetaAction.java | 2 +- .../ml/autoredeploy/MLModelAutoReDeployer.java | 2 +- .../opensearch/ml/model/MLModelGroupManager.java | 2 +- .../java/org/opensearch/ml/utils/IndexUtils.java | 2 +- .../action/custom_model/CustomModelITTests.java | 2 +- .../model_group/SearchModelGroupITTests.java | 16 ++++++++-------- .../ml/action/models/SearchModelITTests.java | 14 +++++++------- .../org/opensearch/ml/utils/IntegTestUtils.java | 4 ++-- .../ml/utils/SearchResponseUtilTests.java | 4 ++-- 16 files changed, 32 insertions(+), 32 deletions(-) diff --git a/client/src/test/java/org/opensearch/ml/client/MachineLearningNodeClientTest.java b/client/src/test/java/org/opensearch/ml/client/MachineLearningNodeClientTest.java index 7d77d2132d..5ae20e34c7 100644 --- a/client/src/test/java/org/opensearch/ml/client/MachineLearningNodeClientTest.java +++ b/client/src/test/java/org/opensearch/ml/client/MachineLearningNodeClientTest.java @@ -909,7 +909,7 @@ public void searchTask() { verify(client).execute(eq(MLTaskSearchAction.INSTANCE), isA(SearchRequest.class), any()); verify(searchTaskActionListener).onResponse(argumentCaptor.capture()); - assertEquals(1, argumentCaptor.getValue().getHits().getTotalHits().value); + assertEquals(1, argumentCaptor.getValue().getHits().getTotalHits().value()); Map source = argumentCaptor.getValue().getHits().getAt(0).getSourceAsMap(); assertEquals(taskId, source.get(MLTask.TASK_ID_FIELD)); assertEquals(modelId, source.get(MLTask.MODEL_ID_FIELD)); diff --git a/common/src/main/java/org/opensearch/ml/common/model/LocalRegexGuardrail.java b/common/src/main/java/org/opensearch/ml/common/model/LocalRegexGuardrail.java index 8da4e4db97..a7dabb30ad 100644 --- a/common/src/main/java/org/opensearch/ml/common/model/LocalRegexGuardrail.java +++ b/common/src/main/java/org/opensearch/ml/common/model/LocalRegexGuardrail.java @@ -235,7 +235,7 @@ public Boolean validateStopWordsSingleIndex(String input, String indexName, List context = client.threadPool().getThreadContext().stashContext(); ThreadContext.StoredContext finalContext = context; client.search(searchRequest, ActionListener.runBefore(new LatchedActionListener(ActionListener.wrap(r -> { - if (r == null || r.getHits() == null || r.getHits().getTotalHits() == null || r.getHits().getTotalHits().value == 0) { + if (r == null || r.getHits() == null || r.getHits().getTotalHits() == null || r.getHits().getTotalHits().value() == 0) { hitStopWords.set(true); } }, e -> { @@ -244,7 +244,7 @@ public Boolean validateStopWordsSingleIndex(String input, String indexName, List }), latch), () -> finalContext.restore())); } else { client.search(searchRequest, new LatchedActionListener(ActionListener.wrap(r -> { - if (r == null || r.getHits() == null || r.getHits().getTotalHits() == null || r.getHits().getTotalHits().value == 0) { + if (r == null || r.getHits() == null || r.getHits().getTotalHits() == null || r.getHits().getTotalHits().value() == 0) { hitStopWords.set(true); } }, e -> { diff --git a/ml-algorithms/src/main/java/org/opensearch/ml/engine/indices/MLInputDatasetHandler.java b/ml-algorithms/src/main/java/org/opensearch/ml/engine/indices/MLInputDatasetHandler.java index 452f836357..d58858434e 100644 --- a/ml-algorithms/src/main/java/org/opensearch/ml/engine/indices/MLInputDatasetHandler.java +++ b/ml-algorithms/src/main/java/org/opensearch/ml/engine/indices/MLInputDatasetHandler.java @@ -53,7 +53,7 @@ public void parseSearchQueryInput(MLInputDataset mlInputDataset, ActionListener< searchRequest.indices(indices); client.search(searchRequest, ActionListener.wrap(r -> { - if (r == null || r.getHits() == null || r.getHits().getTotalHits() == null || r.getHits().getTotalHits().value == 0) { + if (r == null || r.getHits() == null || r.getHits().getTotalHits() == null || r.getHits().getTotalHits().value() == 0) { listener.onFailure(new IllegalArgumentException("No document found")); return; } diff --git a/ml-algorithms/src/main/java/org/opensearch/ml/engine/tools/VisualizationsTool.java b/ml-algorithms/src/main/java/org/opensearch/ml/engine/tools/VisualizationsTool.java index e78cbd2870..b4df0de40a 100644 --- a/ml-algorithms/src/main/java/org/opensearch/ml/engine/tools/VisualizationsTool.java +++ b/ml-algorithms/src/main/java/org/opensearch/ml/engine/tools/VisualizationsTool.java @@ -86,7 +86,7 @@ public void onResponse(SearchResponse searchResponse) { SearchHits hits = searchResponse.getHits(); StringBuilder visBuilder = new StringBuilder(); visBuilder.append("Title,Id\n"); - if (hits.getTotalHits().value > 0) { + if (hits.getTotalHits().value() > 0) { Arrays.stream(hits.getHits()).forEach(h -> { String id = trimIdPrefix(h.getId()); Map visMap = (Map) h.getSourceAsMap().get(SAVED_OBJECT_TYPE); diff --git a/plugin/src/main/java/org/opensearch/ml/action/model_group/TransportUpdateModelGroupAction.java b/plugin/src/main/java/org/opensearch/ml/action/model_group/TransportUpdateModelGroupAction.java index 6bdf091665..f5da828ea7 100644 --- a/plugin/src/main/java/org/opensearch/ml/action/model_group/TransportUpdateModelGroupAction.java +++ b/plugin/src/main/java/org/opensearch/ml/action/model_group/TransportUpdateModelGroupAction.java @@ -210,7 +210,7 @@ private void updateModelGroup( ActionListener.wrap(modelGroups -> { if (modelGroups != null && modelGroups.getHits().getTotalHits() != null - && modelGroups.getHits().getTotalHits().value != 0) { + && modelGroups.getHits().getTotalHits().value() != 0) { for (SearchHit documentFields : modelGroups.getHits()) { String id = documentFields.getId(); listener diff --git a/plugin/src/main/java/org/opensearch/ml/action/register/TransportRegisterModelAction.java b/plugin/src/main/java/org/opensearch/ml/action/register/TransportRegisterModelAction.java index 838a8e3148..634b29e8ba 100644 --- a/plugin/src/main/java/org/opensearch/ml/action/register/TransportRegisterModelAction.java +++ b/plugin/src/main/java/org/opensearch/ml/action/register/TransportRegisterModelAction.java @@ -179,7 +179,7 @@ protected void doExecute(Task task, ActionRequest request, ActionListener { if (modelGroups != null && modelGroups.getHits().getTotalHits() != null - && modelGroups.getHits().getTotalHits().value != 0) { + && modelGroups.getHits().getTotalHits().value() != 0) { String modelGroupIdOfTheNameProvided = modelGroups.getHits().getAt(0).getId(); registerModelInput.setModelGroupId(modelGroupIdOfTheNameProvided); checkUserAccess(registerModelInput, listener, true); diff --git a/plugin/src/main/java/org/opensearch/ml/action/undeploy/TransportUndeployModelsAction.java b/plugin/src/main/java/org/opensearch/ml/action/undeploy/TransportUndeployModelsAction.java index 579fa51a38..1e88013a51 100644 --- a/plugin/src/main/java/org/opensearch/ml/action/undeploy/TransportUndeployModelsAction.java +++ b/plugin/src/main/java/org/opensearch/ml/action/undeploy/TransportUndeployModelsAction.java @@ -129,7 +129,7 @@ protected void doExecute(Task task, ActionRequest request, ActionListener { if (hiddenModels != null && hiddenModels.getHits().getTotalHits() != null - && hiddenModels.getHits().getTotalHits().value != 0 + && hiddenModels.getHits().getTotalHits().value() != 0 && !isSuperAdminUserWrapper(clusterService, client)) { List hiddenModelIds = Arrays .stream(hiddenModels.getHits().getHits()) diff --git a/plugin/src/main/java/org/opensearch/ml/action/upload_chunk/TransportRegisterModelMetaAction.java b/plugin/src/main/java/org/opensearch/ml/action/upload_chunk/TransportRegisterModelMetaAction.java index b39521ab30..e073945e12 100644 --- a/plugin/src/main/java/org/opensearch/ml/action/upload_chunk/TransportRegisterModelMetaAction.java +++ b/plugin/src/main/java/org/opensearch/ml/action/upload_chunk/TransportRegisterModelMetaAction.java @@ -69,7 +69,7 @@ protected void doExecute(Task task, ActionRequest request, ActionListener { if (modelGroups != null && modelGroups.getHits().getTotalHits() != null - && modelGroups.getHits().getTotalHits().value != 0) { + && modelGroups.getHits().getTotalHits().value() != 0) { String modelGroupIdOfTheNameProvided = modelGroups.getHits().getAt(0).getId(); mlUploadInput.setModelGroupId(modelGroupIdOfTheNameProvided); checkUserAccess(mlUploadInput, listener, true); diff --git a/plugin/src/main/java/org/opensearch/ml/autoredeploy/MLModelAutoReDeployer.java b/plugin/src/main/java/org/opensearch/ml/autoredeploy/MLModelAutoReDeployer.java index 4cf8a9130e..68f32606b8 100644 --- a/plugin/src/main/java/org/opensearch/ml/autoredeploy/MLModelAutoReDeployer.java +++ b/plugin/src/main/java/org/opensearch/ml/autoredeploy/MLModelAutoReDeployer.java @@ -205,7 +205,7 @@ private void triggerAutoDeployModels(List addedNodes) { private void triggerUndeployModelsOnDataNodes(List dataNodeIds) { List modelIds = new ArrayList<>(); ActionListener listener = ActionListener.wrap(res -> { - if (res != null && res.getHits() != null && res.getHits().getTotalHits() != null && res.getHits().getTotalHits().value > 0) { + if (res != null && res.getHits() != null && res.getHits().getTotalHits() != null && res.getHits().getTotalHits().value() > 0) { Arrays.stream(res.getHits().getHits()).forEach(x -> modelIds.add(x.getId())); if (!modelIds.isEmpty()) { ActionListener undeployModelListener = ActionListener.wrap(r -> { diff --git a/plugin/src/main/java/org/opensearch/ml/model/MLModelGroupManager.java b/plugin/src/main/java/org/opensearch/ml/model/MLModelGroupManager.java index e76ae8e306..979b0be42c 100644 --- a/plugin/src/main/java/org/opensearch/ml/model/MLModelGroupManager.java +++ b/plugin/src/main/java/org/opensearch/ml/model/MLModelGroupManager.java @@ -90,7 +90,7 @@ public void createModelGroup(MLRegisterModelGroupInput input, ActionListener { if (modelGroups != null && modelGroups.getHits().getTotalHits() != null - && modelGroups.getHits().getTotalHits().value != 0) { + && modelGroups.getHits().getTotalHits().value() != 0) { for (SearchHit documentFields : modelGroups.getHits()) { String id = documentFields.getId(); wrappedListener diff --git a/plugin/src/main/java/org/opensearch/ml/utils/IndexUtils.java b/plugin/src/main/java/org/opensearch/ml/utils/IndexUtils.java index aee973bf55..89c8fa510d 100644 --- a/plugin/src/main/java/org/opensearch/ml/utils/IndexUtils.java +++ b/plugin/src/main/java/org/opensearch/ml/utils/IndexUtils.java @@ -127,7 +127,7 @@ public void getNumberOfDocumentsInIndex( searchRequest.source(builder).indices(indexName); client.search(searchRequest, ActionListener.runBefore(ActionListener.wrap(r -> { - long count = r.getHits().getTotalHits().value; + long count = r.getHits().getTotalHits().value(); listener.onResponse(count); }, e -> { listener.onFailure(e); }), () -> context.restore())); } catch (Exception e) { diff --git a/plugin/src/test/java/org/opensearch/ml/action/custom_model/CustomModelITTests.java b/plugin/src/test/java/org/opensearch/ml/action/custom_model/CustomModelITTests.java index d3eea44bcf..53d63a105c 100644 --- a/plugin/src/test/java/org/opensearch/ml/action/custom_model/CustomModelITTests.java +++ b/plugin/src/test/java/org/opensearch/ml/action/custom_model/CustomModelITTests.java @@ -142,7 +142,7 @@ protected void testTextEmbeddingModel(Set modelWorkerNodes) throws Inter SearchResponse response = searchModelChunks(modelId.get()); AtomicBoolean modelChunksReady = new AtomicBoolean(false); if (response != null) { - long totalHits = response.getHits().getTotalHits().value; + long totalHits = response.getHits().getTotalHits().value(); if (totalHits == 9) { modelChunksReady.set(true); } diff --git a/plugin/src/test/java/org/opensearch/ml/action/model_group/SearchModelGroupITTests.java b/plugin/src/test/java/org/opensearch/ml/action/model_group/SearchModelGroupITTests.java index 2e3a7a84b1..b6b73cf8ed 100644 --- a/plugin/src/test/java/org/opensearch/ml/action/model_group/SearchModelGroupITTests.java +++ b/plugin/src/test/java/org/opensearch/ml/action/model_group/SearchModelGroupITTests.java @@ -52,7 +52,7 @@ public void test_empty_body_search() { SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder(); searchRequest.source(searchSourceBuilder); SearchResponse response = client().execute(MLModelGroupSearchAction.INSTANCE, searchRequest).actionGet(); - assertEquals(1, response.getHits().getTotalHits().value); + assertEquals(1, response.getHits().getTotalHits().value()); assertEquals(modelGroupId, response.getHits().getHits()[0].getId()); } @@ -62,7 +62,7 @@ public void test_matchAll_search() { searchRequest.source(searchSourceBuilder); searchRequest.source().query(QueryBuilders.matchAllQuery()); SearchResponse response = client().execute(MLModelGroupSearchAction.INSTANCE, searchRequest).actionGet(); - assertEquals(1, response.getHits().getTotalHits().value); + assertEquals(1, response.getHits().getTotalHits().value()); assertEquals(modelGroupId, response.getHits().getHits()[0].getId()); } @@ -72,7 +72,7 @@ public void test_bool_search() { searchRequest.source(searchSourceBuilder); searchRequest.source().query(QueryBuilders.boolQuery().must(QueryBuilders.termQuery("name.keyword", "mock_model_group_name"))); SearchResponse response = client().execute(MLModelGroupSearchAction.INSTANCE, searchRequest).actionGet(); - assertEquals(1, response.getHits().getTotalHits().value); + assertEquals(1, response.getHits().getTotalHits().value()); assertEquals(modelGroupId, response.getHits().getHits()[0].getId()); } @@ -82,7 +82,7 @@ public void test_term_search() { searchRequest.source(searchSourceBuilder); searchRequest.source().query(QueryBuilders.termQuery("name.keyword", "mock_model_group_name")); SearchResponse response = client().execute(MLModelGroupSearchAction.INSTANCE, searchRequest).actionGet(); - assertEquals(1, response.getHits().getTotalHits().value); + assertEquals(1, response.getHits().getTotalHits().value()); assertEquals(modelGroupId, response.getHits().getHits()[0].getId()); } @@ -92,7 +92,7 @@ public void test_terms_search() { searchRequest.source(searchSourceBuilder); searchRequest.source().query(QueryBuilders.termsQuery("name.keyword", "mock_model_group_name", "test_model_group_name")); SearchResponse response = client().execute(MLModelGroupSearchAction.INSTANCE, searchRequest).actionGet(); - assertEquals(1, response.getHits().getTotalHits().value); + assertEquals(1, response.getHits().getTotalHits().value()); assertEquals(modelGroupId, response.getHits().getHits()[0].getId()); } @@ -102,7 +102,7 @@ public void test_range_search() { searchRequest.source(searchSourceBuilder); searchRequest.source().query(QueryBuilders.rangeQuery("created_time").gte("now-1d")); SearchResponse response = client().execute(MLModelGroupSearchAction.INSTANCE, searchRequest).actionGet(); - assertEquals(1, response.getHits().getTotalHits().value); + assertEquals(1, response.getHits().getTotalHits().value()); assertEquals(modelGroupId, response.getHits().getHits()[0].getId()); } @@ -112,7 +112,7 @@ public void test_matchPhrase_search() { searchRequest.source(searchSourceBuilder); searchRequest.source().query(QueryBuilders.matchPhraseQuery("description", "desc")); SearchResponse response = client().execute(MLModelGroupSearchAction.INSTANCE, searchRequest).actionGet(); - assertEquals(1, response.getHits().getTotalHits().value); + assertEquals(1, response.getHits().getTotalHits().value()); assertEquals(modelGroupId, response.getHits().getHits()[0].getId()); } @@ -122,7 +122,7 @@ public void test_queryString_search() { searchRequest.source(searchSourceBuilder); searchRequest.source().query(QueryBuilders.queryStringQuery("name: mock_model_group_*")); SearchResponse response = client().execute(MLModelGroupSearchAction.INSTANCE, searchRequest).actionGet(); - assertEquals(1, response.getHits().getTotalHits().value); + assertEquals(1, response.getHits().getTotalHits().value()); assertEquals(modelGroupId, response.getHits().getHits()[0].getId()); } diff --git a/plugin/src/test/java/org/opensearch/ml/action/models/SearchModelITTests.java b/plugin/src/test/java/org/opensearch/ml/action/models/SearchModelITTests.java index 9bbf98e139..87e33cfd48 100644 --- a/plugin/src/test/java/org/opensearch/ml/action/models/SearchModelITTests.java +++ b/plugin/src/test/java/org/opensearch/ml/action/models/SearchModelITTests.java @@ -111,7 +111,7 @@ private void test_empty_body_search() { searchRequest.source(searchSourceBuilder); searchRequest.source().query(QueryBuilders.boolQuery().mustNot(QueryBuilders.existsQuery(CHUNK_NUMBER))); SearchResponse response = client().execute(MLModelSearchAction.INSTANCE, searchRequest).actionGet(); - assertEquals(1, response.getHits().getTotalHits().value); + assertEquals(1, response.getHits().getTotalHits().value()); } private void test_matchAll_search() { @@ -122,7 +122,7 @@ private void test_matchAll_search() { .source() .query(QueryBuilders.boolQuery().mustNot(QueryBuilders.existsQuery(CHUNK_NUMBER)).must(QueryBuilders.matchAllQuery())); SearchResponse response = client().execute(MLModelSearchAction.INSTANCE, searchRequest).actionGet(); - assertEquals(1, response.getHits().getTotalHits().value); + assertEquals(1, response.getHits().getTotalHits().value()); } private void test_bool_search() { @@ -142,7 +142,7 @@ private void test_bool_search() { ) ); SearchResponse response = client().execute(MLModelSearchAction.INSTANCE, searchRequest).actionGet(); - assertEquals(1, response.getHits().getTotalHits().value); + assertEquals(1, response.getHits().getTotalHits().value()); } private void test_term_search() { @@ -155,7 +155,7 @@ private void test_term_search() { .must(QueryBuilders.termQuery("name.keyword", "msmarco-distilbert-base-tas-b-pt")); searchRequest.source().query(boolQueryBuilder); SearchResponse response = client().execute(MLModelSearchAction.INSTANCE, searchRequest).actionGet(); - assertEquals(1, response.getHits().getTotalHits().value); + assertEquals(1, response.getHits().getTotalHits().value()); } private void test_terms_search() { @@ -168,7 +168,7 @@ private void test_terms_search() { .must(QueryBuilders.termsQuery("name.keyword", "msmarco-distilbert-base-tas-b-pt", "test_model_group_name")); searchRequest.source().query(boolQueryBuilder); SearchResponse response = client().execute(MLModelSearchAction.INSTANCE, searchRequest).actionGet(); - assertEquals(1, response.getHits().getTotalHits().value); + assertEquals(1, response.getHits().getTotalHits().value()); } private void test_range_search() { @@ -181,7 +181,7 @@ private void test_range_search() { .must(QueryBuilders.rangeQuery("created_time").gte("now-1d")); searchRequest.source().query(boolQueryBuilder); SearchResponse response = client().execute(MLModelSearchAction.INSTANCE, searchRequest).actionGet(); - assertEquals(1, response.getHits().getTotalHits().value); + assertEquals(1, response.getHits().getTotalHits().value()); } private void test_matchPhrase_search() { @@ -194,7 +194,7 @@ private void test_matchPhrase_search() { .must(QueryBuilders.matchPhraseQuery("description", "desc")); searchRequest.source().query(boolQueryBuilder); SearchResponse response = client().execute(MLModelSearchAction.INSTANCE, searchRequest).actionGet(); - assertEquals(1, response.getHits().getTotalHits().value); + assertEquals(1, response.getHits().getTotalHits().value()); } @Override diff --git a/plugin/src/test/java/org/opensearch/ml/utils/IntegTestUtils.java b/plugin/src/test/java/org/opensearch/ml/utils/IntegTestUtils.java index fae3220114..7d5b6a70ef 100644 --- a/plugin/src/test/java/org/opensearch/ml/utils/IntegTestUtils.java +++ b/plugin/src/test/java/org/opensearch/ml/utils/IntegTestUtils.java @@ -148,7 +148,7 @@ public static SearchResponse waitModelAvailable1(String taskId) throws Interrupt SearchRequest modelSearchRequest = new SearchRequest(new String[] { ML_MODEL_INDEX }, modelSearchSourceBuilder); SearchResponse modelSearchResponse = null; int i = 0; - while ((modelSearchResponse == null || modelSearchResponse.getHits().getTotalHits().value == 0) && i < 500) { + while ((modelSearchResponse == null || modelSearchResponse.getHits().getTotalHits().value() == 0) && i < 500) { try { ActionFuture searchFuture = client().execute(SearchAction.INSTANCE, modelSearchRequest); modelSearchResponse = searchFuture.actionGet(); @@ -159,7 +159,7 @@ public static SearchResponse waitModelAvailable1(String taskId) throws Interrupt i++; } assertNotNull(modelSearchResponse); - assertTrue(modelSearchResponse.getHits().getTotalHits().value > 0); + assertTrue(modelSearchResponse.getHits().getTotalHits().value() > 0); return modelSearchResponse; } diff --git a/plugin/src/test/java/org/opensearch/ml/utils/SearchResponseUtilTests.java b/plugin/src/test/java/org/opensearch/ml/utils/SearchResponseUtilTests.java index bf877ebc76..effce6d249 100644 --- a/plugin/src/test/java/org/opensearch/ml/utils/SearchResponseUtilTests.java +++ b/plugin/src/test/java/org/opensearch/ml/utils/SearchResponseUtilTests.java @@ -104,7 +104,7 @@ public void testReplaceHitsWithSearchHits() throws IOException { assertNotNull(newResponse); assertEquals(newHits.length, newResponse.getHits().getHits().length); - assertEquals(15, newResponse.getHits().getTotalHits().value); + assertEquals(15, newResponse.getHits().getTotalHits().value()); assertEquals(TotalHits.Relation.EQUAL_TO, newResponse.getHits().getTotalHits().relation); assertEquals(0.7f, newResponse.getHits().getMaxScore(), 0.0001f); } @@ -131,7 +131,7 @@ public void testReplaceHitsWithNonWriteableAggregations() { assertNotNull(newResponse); assertEquals(newHits.length, newResponse.getHits().getHits().length); - assertEquals(15, newResponse.getHits().getTotalHits().value); + assertEquals(15, newResponse.getHits().getTotalHits().value()); assertEquals(TotalHits.Relation.EQUAL_TO, newResponse.getHits().getTotalHits().relation); assertEquals(0.7f, newResponse.getHits().getMaxScore(), 0.0001f); }