Skip to content

Commit ebc0792

Browse files
zane-neopeterzhuamazonrithin-pullela-aws
authored
Fix test failure after lucene upgrade to 10 (opensearch-project#3426)
* Fix test failure after lucene upgrade to 10 Signed-off-by: zane-neo <[email protected]> * Fix test failure after lucene upgrade to 10 Signed-off-by: zane-neo <[email protected]> * Fix test failure after lucene version upgraded to 10 Signed-off-by: zane-neo <[email protected]> * Change version to opensearch version alpha1 Signed-off-by: zane-neo <[email protected]> * Update build.gradle to use alpha1 version correctly Signed-off-by: Peter Zhu <[email protected]> * Fix test failure after lucene upgrade to 10 Signed-off-by: zane-neo <[email protected]> * Fix test failure after lucene upgrade to 10 Signed-off-by: zane-neo <[email protected]> * Fix test failure after lucene version upgraded to 10 Signed-off-by: zane-neo <[email protected]> * Change version to opensearch version alpha1 Signed-off-by: zane-neo <[email protected]> * Fix compilation failure due to opensearch core change Signed-off-by: zane-neo <[email protected]> * fix conflicts Signed-off-by: zane-neo <[email protected]> * fix conflicts Signed-off-by: zane-neo <[email protected]> * format code Signed-off-by: zane-neo <[email protected]> * Update more version Signed-off-by: Peter Zhu <[email protected]> * Fix compilation error Signed-off-by: zane-neo <[email protected]> * Added test to cover getNumberOfDocumentsInIndex with 4 arguments Signed-off-by: rithin-pullela-aws <[email protected]> --------- Signed-off-by: zane-neo <[email protected]> Signed-off-by: Peter Zhu <[email protected]> Signed-off-by: rithin-pullela-aws <[email protected]> Co-authored-by: Peter Zhu <[email protected]> Co-authored-by: rithin-pullela-aws <[email protected]>
1 parent d224d7a commit ebc0792

File tree

341 files changed

+434
-403
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

341 files changed

+434
-403
lines changed

‎build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ buildscript {
1111
ext {
1212
opensearch_group = "org.opensearch"
1313
isSnapshot = "true" == System.getProperty("build.snapshot", "true")
14-
opensearch_version = System.getProperty("opensearch.version", "3.0.0-SNAPSHOT")
15-
buildVersionQualifier = System.getProperty("build.version_qualifier", "")
14+
opensearch_version = System.getProperty("opensearch.version", "3.0.0-alpha1-SNAPSHOT")
15+
buildVersionQualifier = System.getProperty("build.version_qualifier", "alpha1")
1616
asm_version = "9.7"
1717

1818
// 2.0.0-rc1-SNAPSHOT -> 2.0.0.0-rc1-SNAPSHOT
@@ -79,7 +79,7 @@ allprojects {
7979
}
8080

8181
plugins.withId('jacoco') {
82-
jacoco.toolVersion = '0.8.10'
82+
jacoco.toolVersion = '0.8.12'
8383
}
8484

8585
project.getExtensions().getExtraProperties().set("versions", VersionProperties.getVersions());

‎client/src/main/java/org/opensearch/ml/client/MachineLearningNodeClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import org.opensearch.action.delete.DeleteResponse;
2222
import org.opensearch.action.search.SearchRequest;
2323
import org.opensearch.action.search.SearchResponse;
24-
import org.opensearch.client.Client;
2524
import org.opensearch.core.action.ActionListener;
2625
import org.opensearch.core.action.ActionResponse;
2726
import org.opensearch.ml.common.FunctionName;
@@ -89,6 +88,7 @@
8988
import org.opensearch.ml.common.transport.undeploy.MLUndeployModelsAction;
9089
import org.opensearch.ml.common.transport.undeploy.MLUndeployModelsRequest;
9190
import org.opensearch.ml.common.transport.undeploy.MLUndeployModelsResponse;
91+
import org.opensearch.transport.client.Client;
9292

9393
import lombok.AccessLevel;
9494
import lombok.RequiredArgsConstructor;

‎client/src/test/java/org/opensearch/ml/client/MachineLearningNodeClientTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
import org.opensearch.action.search.SearchRequest;
4949
import org.opensearch.action.search.SearchResponse;
5050
import org.opensearch.action.search.ShardSearchFailure;
51-
import org.opensearch.client.node.NodeClient;
5251
import org.opensearch.cluster.ClusterName;
5352
import org.opensearch.common.xcontent.XContentFactory;
5453
import org.opensearch.core.action.ActionListener;
@@ -147,6 +146,7 @@
147146
import org.opensearch.search.internal.InternalSearchResponse;
148147
import org.opensearch.search.profile.SearchProfileShardResults;
149148
import org.opensearch.search.suggest.Suggest;
149+
import org.opensearch.transport.client.node.NodeClient;
150150

151151
public class MachineLearningNodeClientTest {
152152

@@ -909,7 +909,7 @@ public void searchTask() {
909909

910910
verify(client).execute(eq(MLTaskSearchAction.INSTANCE), isA(SearchRequest.class), any());
911911
verify(searchTaskActionListener).onResponse(argumentCaptor.capture());
912-
assertEquals(1, argumentCaptor.getValue().getHits().getTotalHits().value);
912+
assertEquals(1, argumentCaptor.getValue().getHits().getTotalHits().value());
913913
Map<String, Object> source = argumentCaptor.getValue().getHits().getAt(0).getSourceAsMap();
914914
assertEquals(taskId, source.get(MLTask.TASK_ID_FIELD));
915915
assertEquals(modelId, source.get(MLTask.MODEL_ID_FIELD));

‎common/src/main/java/org/opensearch/ml/common/model/Guardrail.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
import java.io.IOException;
99
import java.util.Map;
1010

11-
import org.opensearch.client.Client;
1211
import org.opensearch.core.common.io.stream.StreamOutput;
1312
import org.opensearch.core.xcontent.NamedXContentRegistry;
1413
import org.opensearch.core.xcontent.ToXContentObject;
14+
import org.opensearch.transport.client.Client;
1515

1616
public abstract class Guardrail implements ToXContentObject {
1717

‎common/src/main/java/org/opensearch/ml/common/model/LocalRegexGuardrail.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.opensearch.action.LatchedActionListener;
2828
import org.opensearch.action.search.SearchRequest;
2929
import org.opensearch.action.search.SearchResponse;
30-
import org.opensearch.client.Client;
3130
import org.opensearch.common.util.concurrent.ThreadContext;
3231
import org.opensearch.common.xcontent.LoggingDeprecationHandler;
3332
import org.opensearch.common.xcontent.XContentType;
@@ -38,6 +37,7 @@
3837
import org.opensearch.core.xcontent.XContentBuilder;
3938
import org.opensearch.core.xcontent.XContentParser;
4039
import org.opensearch.search.builder.SearchSourceBuilder;
40+
import org.opensearch.transport.client.Client;
4141

4242
import lombok.Builder;
4343
import lombok.EqualsAndHashCode;
@@ -235,7 +235,7 @@ public Boolean validateStopWordsSingleIndex(String input, String indexName, List
235235
context = client.threadPool().getThreadContext().stashContext();
236236
ThreadContext.StoredContext finalContext = context;
237237
client.search(searchRequest, ActionListener.runBefore(new LatchedActionListener(ActionListener.<SearchResponse>wrap(r -> {
238-
if (r == null || r.getHits() == null || r.getHits().getTotalHits() == null || r.getHits().getTotalHits().value == 0) {
238+
if (r == null || r.getHits() == null || r.getHits().getTotalHits() == null || r.getHits().getTotalHits().value() == 0) {
239239
hitStopWords.set(true);
240240
}
241241
}, e -> {
@@ -244,7 +244,7 @@ public Boolean validateStopWordsSingleIndex(String input, String indexName, List
244244
}), latch), () -> finalContext.restore()));
245245
} else {
246246
client.search(searchRequest, new LatchedActionListener(ActionListener.<SearchResponse>wrap(r -> {
247-
if (r == null || r.getHits() == null || r.getHits().getTotalHits() == null || r.getHits().getTotalHits().value == 0) {
247+
if (r == null || r.getHits() == null || r.getHits().getTotalHits() == null || r.getHits().getTotalHits().value() == 0) {
248248
hitStopWords.set(true);
249249
}
250250
}, e -> {

‎common/src/main/java/org/opensearch/ml/common/model/MLGuard.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
import java.util.Map;
99

10-
import org.opensearch.client.Client;
1110
import org.opensearch.core.xcontent.NamedXContentRegistry;
11+
import org.opensearch.transport.client.Client;
1212

1313
import lombok.Getter;
1414
import lombok.extern.log4j.Log4j2;

‎common/src/main/java/org/opensearch/ml/common/model/ModelGuardrail.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
import org.opensearch.action.ActionRequest;
2424
import org.opensearch.action.LatchedActionListener;
25-
import org.opensearch.client.Client;
2625
import org.opensearch.core.action.ActionListener;
2726
import org.opensearch.core.action.ActionResponse;
2827
import org.opensearch.core.common.io.stream.StreamInput;
@@ -38,6 +37,7 @@
3837
import org.opensearch.ml.common.transport.MLTaskResponse;
3938
import org.opensearch.ml.common.transport.prediction.MLPredictionTaskAction;
4039
import org.opensearch.ml.common.transport.prediction.MLPredictionTaskRequest;
40+
import org.opensearch.transport.client.Client;
4141

4242
import lombok.Builder;
4343
import lombok.EqualsAndHashCode;

‎common/src/test/java/org/opensearch/ml/common/model/LocalRegexGuardrailTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.mockito.MockitoAnnotations;
2424
import org.opensearch.action.search.SearchResponse;
2525
import org.opensearch.action.search.ShardSearchFailure;
26-
import org.opensearch.client.Client;
2726
import org.opensearch.common.action.ActionFuture;
2827
import org.opensearch.common.io.stream.BytesStreamOutput;
2928
import org.opensearch.common.settings.Settings;
@@ -45,6 +44,7 @@
4544
import org.opensearch.search.profile.SearchProfileShardResults;
4645
import org.opensearch.search.suggest.Suggest;
4746
import org.opensearch.threadpool.ThreadPool;
47+
import org.opensearch.transport.client.Client;
4848

4949
public class LocalRegexGuardrailTests {
5050
NamedXContentRegistry xContentRegistry;

‎common/src/test/java/org/opensearch/ml/common/model/MLGuardTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
import org.junit.Test;
1717
import org.mockito.Mock;
1818
import org.mockito.MockitoAnnotations;
19-
import org.opensearch.client.Client;
2019
import org.opensearch.common.settings.Settings;
2120
import org.opensearch.common.util.concurrent.ThreadContext;
2221
import org.opensearch.core.xcontent.NamedXContentRegistry;
2322
import org.opensearch.search.SearchModule;
2423
import org.opensearch.threadpool.ThreadPool;
24+
import org.opensearch.transport.client.Client;
2525

2626
public class MLGuardTests {
2727

‎common/src/test/java/org/opensearch/ml/common/model/ModelGuardrailTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import org.junit.Test;
1414
import org.mockito.Mock;
1515
import org.mockito.MockitoAnnotations;
16-
import org.opensearch.client.Client;
1716
import org.opensearch.common.io.stream.BytesStreamOutput;
1817
import org.opensearch.common.settings.Settings;
1918
import org.opensearch.common.xcontent.XContentType;
@@ -23,6 +22,7 @@
2322
import org.opensearch.core.xcontent.XContentParser;
2423
import org.opensearch.ml.common.TestHelper;
2524
import org.opensearch.search.SearchModule;
25+
import org.opensearch.transport.client.Client;
2626

2727
public class ModelGuardrailTests {
2828
NamedXContentRegistry xContentRegistry;

0 commit comments

Comments
 (0)