Skip to content

Commit d52c640

Browse files
opensearch-trigger-bot[bot]martin-gaievski
opensearch-trigger-bot[bot]
and
martin-gaievski
authored
Removing redundant model uploads from integ tests (#671) (#674)
(cherry picked from commit 09dde7b) Signed-off-by: Martin Gaievski <gaievski@amazon.com> Co-authored-by: Martin Gaievski <gaievski@amazon.com>
1 parent 347ccef commit d52c640

File tree

4 files changed

+14
-38
lines changed

4 files changed

+14
-38
lines changed

‎src/test/java/org/opensearch/neuralsearch/processor/NeuralQueryEnricherProcessorIT.java

+3-5
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,10 @@ public void testNeuralQueryEnricherProcessor_whenNoModelIdPassedInNeuralSparseQu
8686

8787
@SneakyThrows
8888
public void testNeuralQueryEnricherProcessor_whenGetEmptyQueryBody_thenSuccess() {
89-
String modelId = null;
9089
try {
9190
initializeIndexIfNotExist(index);
92-
modelId = prepareModel();
93-
createSearchRequestProcessor(modelId, search_pipeline);
94-
createPipelineProcessor(modelId, ingest_pipeline, ProcessorType.TEXT_EMBEDDING);
91+
createSearchRequestProcessor(null, search_pipeline);
92+
createPipelineProcessor(null, ingest_pipeline, ProcessorType.TEXT_EMBEDDING);
9593
updateIndexSettings(index, Settings.builder().put("index.search.default_pipeline", search_pipeline));
9694
Request request = new Request("POST", "/" + index + "/_search");
9795
Response response = client().performRequest(request);
@@ -101,7 +99,7 @@ public void testNeuralQueryEnricherProcessor_whenGetEmptyQueryBody_thenSuccess()
10199
assertFalse(responseInMap.isEmpty());
102100
assertEquals(3, ((Map) responseInMap.get("hits")).size());
103101
} finally {
104-
wipeOfTestResources(index, ingest_pipeline, modelId, search_pipeline);
102+
wipeOfTestResources(index, ingest_pipeline, null, search_pipeline);
105103
}
106104
}
107105

‎src/test/java/org/opensearch/neuralsearch/processor/NormalizationProcessorIT.java

+2-6
Original file line numberDiff line numberDiff line change
@@ -230,10 +230,8 @@ public void testResultProcessor_whenMultipleShardsAndQueryMatches_thenSuccessful
230230

231231
@SneakyThrows
232232
public void testResultProcessor_whenMultipleShardsAndNoMatches_thenSuccessful() {
233-
String modelId = null;
234233
try {
235234
initializeIndexIfNotExist(TEST_MULTI_DOC_INDEX_THREE_SHARDS_NAME);
236-
modelId = prepareModel();
237235
createSearchPipelineWithResultsPostProcessor(SEARCH_PIPELINE);
238236

239237
HybridQueryBuilder hybridQueryBuilder = new HybridQueryBuilder();
@@ -249,16 +247,14 @@ public void testResultProcessor_whenMultipleShardsAndNoMatches_thenSuccessful()
249247
);
250248
assertQueryResults(searchResponseAsMap, 0, true);
251249
} finally {
252-
wipeOfTestResources(TEST_MULTI_DOC_INDEX_THREE_SHARDS_NAME, null, modelId, SEARCH_PIPELINE);
250+
wipeOfTestResources(TEST_MULTI_DOC_INDEX_THREE_SHARDS_NAME, null, null, SEARCH_PIPELINE);
253251
}
254252
}
255253

256254
@SneakyThrows
257255
public void testResultProcessor_whenMultipleShardsAndPartialMatches_thenSuccessful() {
258-
String modelId = null;
259256
try {
260257
initializeIndexIfNotExist(TEST_MULTI_DOC_INDEX_THREE_SHARDS_NAME);
261-
modelId = prepareModel();
262258
createSearchPipelineWithResultsPostProcessor(SEARCH_PIPELINE);
263259

264260
HybridQueryBuilder hybridQueryBuilder = new HybridQueryBuilder();
@@ -275,7 +271,7 @@ public void testResultProcessor_whenMultipleShardsAndPartialMatches_thenSuccessf
275271
);
276272
assertQueryResults(searchResponseAsMap, 4, true, Range.between(0.33f, 1.0f));
277273
} finally {
278-
wipeOfTestResources(TEST_MULTI_DOC_INDEX_THREE_SHARDS_NAME, null, modelId, SEARCH_PIPELINE);
274+
wipeOfTestResources(TEST_MULTI_DOC_INDEX_THREE_SHARDS_NAME, null, null, SEARCH_PIPELINE);
279275
}
280276
}
281277

‎src/test/java/org/opensearch/neuralsearch/processor/ScoreCombinationIT.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,8 @@ public void setUp() throws Exception {
8585
*/
8686
@SneakyThrows
8787
public void testArithmeticWeightedMean_whenWeightsPassed_thenSuccessful() {
88-
String modelId = null;
8988
try {
9089
initializeIndexIfNotExist(TEST_MULTI_DOC_INDEX_THREE_SHARDS_NAME);
91-
modelId = prepareModel();
9290
// check case when number of weights and sub-queries are same
9391
createSearchPipeline(
9492
SEARCH_PIPELINE,
@@ -189,7 +187,7 @@ public void testArithmeticWeightedMean_whenWeightsPassed_thenSuccessful() {
189187
)
190188
);
191189
} finally {
192-
wipeOfTestResources(TEST_MULTI_DOC_INDEX_THREE_SHARDS_NAME, null, modelId, SEARCH_PIPELINE);
190+
wipeOfTestResources(TEST_MULTI_DOC_INDEX_THREE_SHARDS_NAME, null, null, SEARCH_PIPELINE);
193191
}
194192
}
195193

‎src/test/java/org/opensearch/neuralsearch/query/HybridQueryIT.java

+8-24
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,8 @@ protected boolean preserveClusterUponCompletion() {
131131
*/
132132
@SneakyThrows
133133
public void testComplexQuery_whenMultipleSubqueries_thenSuccessful() {
134-
String modelId = null;
135134
try {
136135
initializeIndexIfNotExist(TEST_BASIC_VECTOR_DOC_FIELD_INDEX_NAME);
137-
modelId = prepareModel();
138136
createSearchPipelineWithResultsPostProcessor(SEARCH_PIPELINE);
139137
TermQueryBuilder termQueryBuilder1 = QueryBuilders.termQuery(TEST_TEXT_FIELD_NAME_1, TEST_QUERY_TEXT3);
140138
TermQueryBuilder termQueryBuilder2 = QueryBuilders.termQuery(TEST_TEXT_FIELD_NAME_1, TEST_QUERY_TEXT4);
@@ -175,7 +173,7 @@ public void testComplexQuery_whenMultipleSubqueries_thenSuccessful() {
175173
assertNotNull(total.get("relation"));
176174
assertEquals(RELATION_EQUAL_TO, total.get("relation"));
177175
} finally {
178-
wipeOfTestResources(TEST_BASIC_VECTOR_DOC_FIELD_INDEX_NAME, null, modelId, SEARCH_PIPELINE);
176+
wipeOfTestResources(TEST_BASIC_VECTOR_DOC_FIELD_INDEX_NAME, null, null, SEARCH_PIPELINE);
179177
}
180178
}
181179

@@ -207,10 +205,8 @@ public void testComplexQuery_whenMultipleSubqueries_thenSuccessful() {
207205
*/
208206
@SneakyThrows
209207
public void testComplexQuery_whenMultipleIdenticalSubQueries_thenSuccessful() {
210-
String modelId = null;
211208
try {
212209
initializeIndexIfNotExist(TEST_BASIC_VECTOR_DOC_FIELD_INDEX_NAME);
213-
modelId = prepareModel();
214210
createSearchPipelineWithResultsPostProcessor(SEARCH_PIPELINE);
215211
TermQueryBuilder termQueryBuilder1 = QueryBuilders.termQuery(TEST_TEXT_FIELD_NAME_1, TEST_QUERY_TEXT3);
216212
TermQueryBuilder termQueryBuilder2 = QueryBuilders.termQuery(TEST_TEXT_FIELD_NAME_1, TEST_QUERY_TEXT4);
@@ -250,16 +246,14 @@ public void testComplexQuery_whenMultipleIdenticalSubQueries_thenSuccessful() {
250246
assertNotNull(total.get("relation"));
251247
assertEquals(RELATION_EQUAL_TO, total.get("relation"));
252248
} finally {
253-
wipeOfTestResources(TEST_BASIC_VECTOR_DOC_FIELD_INDEX_NAME, null, modelId, SEARCH_PIPELINE);
249+
wipeOfTestResources(TEST_BASIC_VECTOR_DOC_FIELD_INDEX_NAME, null, null, SEARCH_PIPELINE);
254250
}
255251
}
256252

257253
@SneakyThrows
258254
public void testNoMatchResults_whenOnlyTermSubQueryWithoutMatch_thenEmptyResult() {
259-
String modelId = null;
260255
try {
261256
initializeIndexIfNotExist(TEST_MULTI_DOC_WITH_NESTED_FIELDS_INDEX_NAME);
262-
modelId = prepareModel();
263257
createSearchPipelineWithResultsPostProcessor(SEARCH_PIPELINE);
264258
TermQueryBuilder termQueryBuilder = QueryBuilders.termQuery(TEST_TEXT_FIELD_NAME_1, TEST_QUERY_TEXT);
265259
TermQueryBuilder termQuery2Builder = QueryBuilders.termQuery(TEST_TEXT_FIELD_NAME_1, TEST_QUERY_TEXT2);
@@ -285,16 +279,14 @@ public void testNoMatchResults_whenOnlyTermSubQueryWithoutMatch_thenEmptyResult(
285279
assertNotNull(total.get("relation"));
286280
assertEquals(RELATION_EQUAL_TO, total.get("relation"));
287281
} finally {
288-
wipeOfTestResources(TEST_MULTI_DOC_WITH_NESTED_FIELDS_INDEX_NAME, null, modelId, SEARCH_PIPELINE);
282+
wipeOfTestResources(TEST_MULTI_DOC_WITH_NESTED_FIELDS_INDEX_NAME, null, null, SEARCH_PIPELINE);
289283
}
290284
}
291285

292286
@SneakyThrows
293287
public void testNestedQuery_whenHybridQueryIsWrappedIntoOtherQuery_thenFail() {
294-
String modelId = null;
295288
try {
296289
initializeIndexIfNotExist(TEST_MULTI_DOC_INDEX_NAME_ONE_SHARD);
297-
modelId = prepareModel();
298290
createSearchPipelineWithResultsPostProcessor(SEARCH_PIPELINE);
299291
MatchQueryBuilder matchQueryBuilder = QueryBuilders.matchQuery(TEST_TEXT_FIELD_NAME_1, TEST_QUERY_TEXT3);
300292
MatchQueryBuilder matchQuery2Builder = QueryBuilders.matchQuery(TEST_TEXT_FIELD_NAME_1, TEST_QUERY_TEXT4);
@@ -338,16 +330,14 @@ public void testNestedQuery_whenHybridQueryIsWrappedIntoOtherQuery_thenFail() {
338330
)
339331
);
340332
} finally {
341-
wipeOfTestResources(TEST_MULTI_DOC_INDEX_NAME_ONE_SHARD, null, modelId, SEARCH_PIPELINE);
333+
wipeOfTestResources(TEST_MULTI_DOC_INDEX_NAME_ONE_SHARD, null, null, SEARCH_PIPELINE);
342334
}
343335
}
344336

345337
@SneakyThrows
346338
public void testIndexWithNestedFields_whenHybridQuery_thenSuccess() {
347-
String modelId = null;
348339
try {
349340
initializeIndexIfNotExist(TEST_MULTI_DOC_INDEX_WITH_NESTED_TYPE_NAME_ONE_SHARD);
350-
modelId = prepareModel();
351341
createSearchPipelineWithResultsPostProcessor(SEARCH_PIPELINE);
352342
TermQueryBuilder termQueryBuilder = QueryBuilders.termQuery(TEST_TEXT_FIELD_NAME_1, TEST_QUERY_TEXT3);
353343
TermQueryBuilder termQuery2Builder = QueryBuilders.termQuery(TEST_TEXT_FIELD_NAME_1, TEST_QUERY_TEXT2);
@@ -373,16 +363,14 @@ public void testIndexWithNestedFields_whenHybridQuery_thenSuccess() {
373363
assertNotNull(total.get("relation"));
374364
assertEquals(RELATION_EQUAL_TO, total.get("relation"));
375365
} finally {
376-
wipeOfTestResources(TEST_MULTI_DOC_INDEX_WITH_NESTED_TYPE_NAME_ONE_SHARD, null, modelId, SEARCH_PIPELINE);
366+
wipeOfTestResources(TEST_MULTI_DOC_INDEX_WITH_NESTED_TYPE_NAME_ONE_SHARD, null, null, SEARCH_PIPELINE);
377367
}
378368
}
379369

380370
@SneakyThrows
381371
public void testIndexWithNestedFields_whenHybridQueryIncludesNested_thenSuccess() {
382-
String modelId = null;
383372
try {
384373
initializeIndexIfNotExist(TEST_MULTI_DOC_INDEX_WITH_NESTED_TYPE_NAME_ONE_SHARD);
385-
modelId = prepareModel();
386374
createSearchPipelineWithResultsPostProcessor(SEARCH_PIPELINE);
387375
TermQueryBuilder termQueryBuilder = QueryBuilders.termQuery(TEST_TEXT_FIELD_NAME_1, TEST_QUERY_TEXT);
388376
NestedQueryBuilder nestedQueryBuilder = QueryBuilders.nestedQuery(
@@ -412,16 +400,14 @@ public void testIndexWithNestedFields_whenHybridQueryIncludesNested_thenSuccess(
412400
assertNotNull(total.get("relation"));
413401
assertEquals(RELATION_EQUAL_TO, total.get("relation"));
414402
} finally {
415-
wipeOfTestResources(TEST_MULTI_DOC_INDEX_WITH_NESTED_TYPE_NAME_ONE_SHARD, null, modelId, SEARCH_PIPELINE);
403+
wipeOfTestResources(TEST_MULTI_DOC_INDEX_WITH_NESTED_TYPE_NAME_ONE_SHARD, null, null, SEARCH_PIPELINE);
416404
}
417405
}
418406

419407
@SneakyThrows
420408
public void testRequestCache_whenOneShardAndQueryReturnResults_thenSuccessful() {
421-
String modelId = null;
422409
try {
423410
initializeIndexIfNotExist(TEST_INDEX_WITH_KEYWORDS_ONE_SHARD);
424-
modelId = prepareModel();
425411
createSearchPipelineWithResultsPostProcessor(SEARCH_PIPELINE);
426412
MatchQueryBuilder matchQueryBuilder = QueryBuilders.matchQuery(KEYWORD_FIELD_1, KEYWORD_FIELD_2_VALUE);
427413
RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery(INTEGER_FIELD_PRICE).gte(10).lte(1000);
@@ -494,16 +480,14 @@ public void testRequestCache_whenOneShardAndQueryReturnResults_thenSuccessful()
494480
assertNotNull(totalSecondQuery.get("relation"));
495481
assertEquals(RELATION_EQUAL_TO, totalSecondQuery.get("relation"));
496482
} finally {
497-
wipeOfTestResources(TEST_INDEX_WITH_KEYWORDS_ONE_SHARD, null, modelId, SEARCH_PIPELINE);
483+
wipeOfTestResources(TEST_INDEX_WITH_KEYWORDS_ONE_SHARD, null, null, SEARCH_PIPELINE);
498484
}
499485
}
500486

501487
@SneakyThrows
502488
public void testRequestCache_whenMultipleShardsQueryReturnResults_thenSuccessful() {
503-
String modelId = null;
504489
try {
505490
initializeIndexIfNotExist(TEST_INDEX_WITH_KEYWORDS_THREE_SHARDS);
506-
modelId = prepareModel();
507491
createSearchPipelineWithResultsPostProcessor(SEARCH_PIPELINE);
508492
MatchQueryBuilder matchQueryBuilder = QueryBuilders.matchQuery(KEYWORD_FIELD_1, KEYWORD_FIELD_2_VALUE);
509493
RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery(INTEGER_FIELD_PRICE).gte(10).lte(1000);
@@ -576,7 +560,7 @@ public void testRequestCache_whenMultipleShardsQueryReturnResults_thenSuccessful
576560
assertNotNull(totalSecondQuery.get("relation"));
577561
assertEquals(RELATION_EQUAL_TO, totalSecondQuery.get("relation"));
578562
} finally {
579-
wipeOfTestResources(TEST_INDEX_WITH_KEYWORDS_THREE_SHARDS, null, modelId, SEARCH_PIPELINE);
563+
wipeOfTestResources(TEST_INDEX_WITH_KEYWORDS_THREE_SHARDS, null, null, SEARCH_PIPELINE);
580564
}
581565
}
582566

0 commit comments

Comments
 (0)