Skip to content

Commit d8f126f

Browse files
Update neural_query_enricher bwc tests (#652) (#679)
* update neural_query_enricher bwc Signed-off-by: zhichao-aws <zhichaog@amazon.com> * changelog Signed-off-by: zhichao-aws <zhichaog@amazon.com> * nit Signed-off-by: zhichao-aws <zhichaog@amazon.com> --------- Signed-off-by: zhichao-aws <zhichaog@amazon.com> (cherry picked from commit 4b71e49) Co-authored-by: zhichao-aws <zhichaog@amazon.com>
1 parent d52c640 commit d8f126f

File tree

3 files changed

+14
-5
lines changed

3 files changed

+14
-5
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,5 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
2121
### Infrastructure
2222
### Documentation
2323
### Maintenance
24+
- Update bwc tests for neural_query_enricher neural_sparse search ([#652](https://github.com/opensearch-project/neural-search/pull/652))
2425
### Refactoring

qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/NeuralQueryEnricherProcessorIT.java

+4
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@ public void testNeuralQueryEnricherProcessor_NeuralSparseSearch_E2EFlow() throws
5454
getIndexNameForTest(),
5555
Settings.builder().put("index.search.default_pipeline", SPARSE_SEARCH_PIPELINE_NAME)
5656
);
57+
assertEquals(
58+
search(getIndexNameForTest(), sparseEncodingQueryBuilderWithoutModelId, 1).get("hits"),
59+
search(getIndexNameForTest(), sparseEncodingQueryBuilderWithModelId, 1).get("hits")
60+
);
5761
} else {
5862
String modelId = null;
5963
try {

qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/NeuralQueryEnricherProcessorIT.java

+9-5
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,20 @@ public void testNeuralQueryEnricherProcessor_NeuralSparseSearch_E2EFlow() throws
5757
getIndexNameForTest(),
5858
Settings.builder().put("index.search.default_pipeline", SPARSE_SEARCH_PIPELINE_NAME)
5959
);
60+
assertEquals(
61+
search(getIndexNameForTest(), sparseEncodingQueryBuilderWithoutModelId, 1).get("hits"),
62+
search(getIndexNameForTest(), sparseEncodingQueryBuilderWithModelId, 1).get("hits")
63+
);
6064
break;
6165
case MIXED:
6266
sparseModelId = TestUtils.getModelId(getIngestionPipeline(SPARSE_INGEST_PIPELINE_NAME), SPARSE_ENCODING_PROCESSOR);
6367
loadModel(sparseModelId);
6468
sparseEncodingQueryBuilderWithModelId.modelId(sparseModelId);
69+
70+
assertEquals(
71+
search(getIndexNameForTest(), sparseEncodingQueryBuilderWithoutModelId, 1).get("hits"),
72+
search(getIndexNameForTest(), sparseEncodingQueryBuilderWithModelId, 1).get("hits")
73+
);
6574
break;
6675
case UPGRADED:
6776
try {
@@ -117,11 +126,6 @@ public void testNeuralQueryEnricherProcessor_NeuralSearch_E2EFlow() throws Excep
117126
loadModel(denseModelId);
118127
neuralQueryBuilderWithModelId.modelId(denseModelId);
119128

120-
createSearchRequestProcessor(denseModelId, DENSE_SEARCH_PIPELINE_NAME);
121-
updateIndexSettings(
122-
getIndexNameForTest(),
123-
Settings.builder().put("index.search.default_pipeline", DENSE_SEARCH_PIPELINE_NAME)
124-
);
125129
assertEquals(
126130
search(getIndexNameForTest(), neuralQueryBuilderWithoutModelId, 1).get("hits"),
127131
search(getIndexNameForTest(), neuralQueryBuilderWithModelId, 1).get("hits")

0 commit comments

Comments
 (0)