Skip to content

Commit e9f2684

Browse files
will-hwangwill-hwang
committed
comment out mixed test case
1 parent 47f0a8c commit e9f2684

8 files changed

+104
-104
lines changed

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

+8-8
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,19 @@ public void testBatchIngestion_SparseEncodingProcessor_E2EFlow() throws Exceptio
3939
validateDocCountAndInfo(indexName, 5, () -> getDocById(indexName, "4"), EMBEDDING_FIELD_NAME, Map.class);
4040
break;
4141
case MIXED:
42-
sparseModelId = TestUtils.getModelId(getIngestionPipeline(SPARSE_PIPELINE), SPARSE_ENCODING_PROCESSOR);
43-
loadModel(sparseModelId);
44-
List<Map<String, String>> docsForMixed = prepareDataForBulkIngestion(5, 5);
45-
bulkAddDocuments(indexName, TEXT_FIELD_NAME, SPARSE_PIPELINE, docsForMixed, 3);
46-
validateDocCountAndInfo(indexName, 10, () -> getDocById(indexName, "9"), EMBEDDING_FIELD_NAME, Map.class);
42+
// sparseModelId = TestUtils.getModelId(getIngestionPipeline(SPARSE_PIPELINE), SPARSE_ENCODING_PROCESSOR);
43+
// loadModel(sparseModelId);
44+
// List<Map<String, String>> docsForMixed = prepareDataForBulkIngestion(5, 5);
45+
// bulkAddDocuments(indexName, TEXT_FIELD_NAME, SPARSE_PIPELINE, docsForMixed, 3);
46+
// validateDocCountAndInfo(indexName, 10, () -> getDocById(indexName, "9"), EMBEDDING_FIELD_NAME, Map.class);
4747
break;
4848
case UPGRADED:
4949
try {
5050
sparseModelId = TestUtils.getModelId(getIngestionPipeline(SPARSE_PIPELINE), SPARSE_ENCODING_PROCESSOR);
5151
loadModel(sparseModelId);
52-
List<Map<String, String>> docsForUpgraded = prepareDataForBulkIngestion(10, 5);
53-
bulkAddDocuments(indexName, TEXT_FIELD_NAME, SPARSE_PIPELINE, docsForUpgraded, 2);
54-
validateDocCountAndInfo(indexName, 15, () -> getDocById(indexName, "14"), EMBEDDING_FIELD_NAME, Map.class);
52+
List<Map<String, String>> docsForUpgraded = prepareDataForBulkIngestion(5, 5);
53+
bulkAddDocuments(indexName, TEXT_FIELD_NAME, SPARSE_PIPELINE, docsForUpgraded, 3);
54+
validateDocCountAndInfo(indexName, 10, () -> getDocById(indexName, "9"), EMBEDDING_FIELD_NAME, Map.class);
5555
} finally {
5656
wipeOfTestResources(indexName, SPARSE_PIPELINE, sparseModelId, null);
5757
}

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

+15-15
Original file line numberDiff line numberDiff line change
@@ -63,26 +63,26 @@ public void testNormalizationProcessor_whenIndexWithMultipleShards_E2EFlow() thr
6363
);
6464
break;
6565
case MIXED:
66-
modelId = getModelId(getIngestionPipeline(PIPELINE_NAME), TEXT_EMBEDDING_PROCESSOR);
67-
int totalDocsCountMixed;
68-
if (isFirstMixedRound()) {
69-
totalDocsCountMixed = NUM_DOCS_PER_ROUND;
70-
HybridQueryBuilder hybridQueryBuilder = getQueryBuilder(modelId, null, null, null);
71-
QueryBuilder rescorer = QueryBuilders.matchQuery(TEST_FIELD, RESCORE_QUERY).boost(0.3f);
72-
validateTestIndexOnUpgrade(totalDocsCountMixed, modelId, hybridQueryBuilder, rescorer);
73-
addDocument(getIndexNameForTest(), "1", TEST_FIELD, TEXT_MIXED, null, null);
74-
} else {
75-
// totalDocsCountMixed = 2 * NUM_DOCS_PER_ROUND;
76-
// HybridQueryBuilder hybridQueryBuilder = getQueryBuilder(modelId, null, null, null);
77-
// validateTestIndexOnUpgrade(totalDocsCountMixed, modelId, hybridQueryBuilder, null);
78-
}
66+
// modelId = getModelId(getIngestionPipeline(PIPELINE_NAME), TEXT_EMBEDDING_PROCESSOR);
67+
// int totalDocsCountMixed;
68+
// if (isFirstMixedRound()) {
69+
// totalDocsCountMixed = NUM_DOCS_PER_ROUND;
70+
// HybridQueryBuilder hybridQueryBuilder = getQueryBuilder(modelId, null, null, null);
71+
// QueryBuilder rescorer = QueryBuilders.matchQuery(TEST_FIELD, RESCORE_QUERY).boost(0.3f);
72+
// validateTestIndexOnUpgrade(totalDocsCountMixed, modelId, hybridQueryBuilder, rescorer);
73+
// addDocument(getIndexNameForTest(), "1", TEST_FIELD, TEXT_MIXED, null, null);
74+
// } else {
75+
// totalDocsCountMixed = 2 * NUM_DOCS_PER_ROUND;
76+
// HybridQueryBuilder hybridQueryBuilder = getQueryBuilder(modelId, null, null, null);
77+
// validateTestIndexOnUpgrade(totalDocsCountMixed, modelId, hybridQueryBuilder, null);
78+
// }
7979
break;
8080
case UPGRADED:
8181
try {
8282
modelId = getModelId(getIngestionPipeline(PIPELINE_NAME), TEXT_EMBEDDING_PROCESSOR);
83-
int totalDocsCountUpgraded = 3 * NUM_DOCS_PER_ROUND;
83+
int totalDocsCountUpgraded = 1 * NUM_DOCS_PER_ROUND;
8484
loadModel(modelId);
85-
addDocument(getIndexNameForTest(), "2", TEST_FIELD, TEXT_UPGRADED, null, null);
85+
addDocument(getIndexNameForTest(), "1", TEST_FIELD, TEXT_UPGRADED, null, null);
8686
HybridQueryBuilder hybridQueryBuilder = getQueryBuilder(modelId, null, null, null);
8787
QueryBuilder rescorer = QueryBuilders.matchQuery(TEST_FIELD, RESCORE_QUERY).boost(0.3f);
8888
validateTestIndexOnUpgrade(totalDocsCountUpgraded, modelId, hybridQueryBuilder, rescorer);

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

+15-15
Original file line numberDiff line numberDiff line change
@@ -63,26 +63,26 @@ public void testHybridQueryWithRescore_whenIndexWithMultipleShards_E2EFlow() thr
6363
);
6464
break;
6565
case MIXED:
66-
modelId = getModelId(getIngestionPipeline(PIPELINE_NAME), TEXT_EMBEDDING_PROCESSOR);
67-
int totalDocsCountMixed;
68-
if (isFirstMixedRound()) {
69-
totalDocsCountMixed = NUM_DOCS_PER_ROUND;
70-
HybridQueryBuilder hybridQueryBuilder = getQueryBuilder(modelId, null, null);
71-
QueryBuilder rescorer = QueryBuilders.matchQuery(TEST_FIELD, RESCORE_QUERY).boost(0.3f);
72-
validateTestIndexOnUpgrade(totalDocsCountMixed, modelId, hybridQueryBuilder, rescorer);
73-
addDocument(getIndexNameForTest(), "1", TEST_FIELD, TEXT_MIXED, null, null);
74-
} else {
75-
// totalDocsCountMixed = 2 * NUM_DOCS_PER_ROUND;
76-
// HybridQueryBuilder hybridQueryBuilder = getQueryBuilder(modelId, null, null);
77-
// validateTestIndexOnUpgrade(totalDocsCountMixed, modelId, hybridQueryBuilder, null);
78-
}
66+
// modelId = getModelId(getIngestionPipeline(PIPELINE_NAME), TEXT_EMBEDDING_PROCESSOR);
67+
// int totalDocsCountMixed;
68+
// if (isFirstMixedRound()) {
69+
// totalDocsCountMixed = NUM_DOCS_PER_ROUND;
70+
// HybridQueryBuilder hybridQueryBuilder = getQueryBuilder(modelId, null, null);
71+
// QueryBuilder rescorer = QueryBuilders.matchQuery(TEST_FIELD, RESCORE_QUERY).boost(0.3f);
72+
// validateTestIndexOnUpgrade(totalDocsCountMixed, modelId, hybridQueryBuilder, rescorer);
73+
// addDocument(getIndexNameForTest(), "1", TEST_FIELD, TEXT_MIXED, null, null);
74+
// } else {
75+
// totalDocsCountMixed = 2 * NUM_DOCS_PER_ROUND;
76+
// HybridQueryBuilder hybridQueryBuilder = getQueryBuilder(modelId, null, null);
77+
// validateTestIndexOnUpgrade(totalDocsCountMixed, modelId, hybridQueryBuilder, null);
78+
// }
7979
break;
8080
case UPGRADED:
8181
try {
8282
modelId = getModelId(getIngestionPipeline(PIPELINE_NAME), TEXT_EMBEDDING_PROCESSOR);
83-
int totalDocsCountUpgraded = 3 * NUM_DOCS_PER_ROUND;
83+
int totalDocsCountUpgraded = 1 * NUM_DOCS_PER_ROUND;
8484
loadModel(modelId);
85-
addDocument(getIndexNameForTest(), "2", TEST_FIELD, TEXT_UPGRADED, null, null);
85+
addDocument(getIndexNameForTest(), "1", TEST_FIELD, TEXT_UPGRADED, null, null);
8686
HybridQueryBuilder hybridQueryBuilder = getQueryBuilder(modelId, null, null);
8787
QueryBuilder rescorer = QueryBuilders.matchQuery(TEST_FIELD, RESCORE_QUERY).boost(0.3f);
8888
validateTestIndexOnUpgrade(totalDocsCountUpgraded, modelId, hybridQueryBuilder, rescorer);

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

+12-12
Original file line numberDiff line numberDiff line change
@@ -44,23 +44,23 @@ public void testKnnRadialSearch_E2EFlow() throws Exception {
4444
addDocument(getIndexNameForTest(), "0", TEST_FIELD, TEXT, TEST_IMAGE_FIELD, TEST_IMAGE_TEXT);
4545
break;
4646
case MIXED:
47-
modelId = getModelId(getIngestionPipeline(PIPELINE_NAME), TEXT_IMAGE_EMBEDDING_PROCESSOR);
48-
int totalDocsCountMixed;
49-
if (isFirstMixedRound()) {
50-
totalDocsCountMixed = NUM_DOCS_PER_ROUND;
51-
validateIndexQueryOnUpgrade(totalDocsCountMixed, modelId, TEXT, TEST_IMAGE_TEXT);
52-
addDocument(getIndexNameForTest(), "1", TEST_FIELD, TEXT_MIXED, TEST_IMAGE_FIELD, TEST_IMAGE_TEXT_MIXED);
53-
} else {
54-
// totalDocsCountMixed = 2 * NUM_DOCS_PER_ROUND;
55-
// validateIndexQueryOnUpgrade(totalDocsCountMixed, modelId, TEXT_MIXED, TEST_IMAGE_TEXT_MIXED);
56-
}
47+
// modelId = getModelId(getIngestionPipeline(PIPELINE_NAME), TEXT_IMAGE_EMBEDDING_PROCESSOR);
48+
// int totalDocsCountMixed;
49+
// if (isFirstMixedRound()) {
50+
// totalDocsCountMixed = NUM_DOCS_PER_ROUND;
51+
// validateIndexQueryOnUpgrade(totalDocsCountMixed, modelId, TEXT, TEST_IMAGE_TEXT);
52+
// addDocument(getIndexNameForTest(), "1", TEST_FIELD, TEXT_MIXED, TEST_IMAGE_FIELD, TEST_IMAGE_TEXT_MIXED);
53+
// } else {
54+
// totalDocsCountMixed = 2 * NUM_DOCS_PER_ROUND;
55+
// validateIndexQueryOnUpgrade(totalDocsCountMixed, modelId, TEXT_MIXED, TEST_IMAGE_TEXT_MIXED);
56+
// }
5757
break;
5858
case UPGRADED:
5959
try {
6060
modelId = getModelId(getIngestionPipeline(PIPELINE_NAME), TEXT_IMAGE_EMBEDDING_PROCESSOR);
61-
int totalDocsCountUpgraded = 3 * NUM_DOCS_PER_ROUND;
61+
int totalDocsCountUpgraded = 1 * NUM_DOCS_PER_ROUND;
6262
loadModel(modelId);
63-
addDocument(getIndexNameForTest(), "2", TEST_FIELD, TEXT_UPGRADED, TEST_IMAGE_FIELD, TEST_IMAGE_TEXT_UPGRADED);
63+
addDocument(getIndexNameForTest(), "1", TEST_FIELD, TEXT_UPGRADED, TEST_IMAGE_FIELD, TEST_IMAGE_TEXT_UPGRADED);
6464
validateIndexQueryOnUpgrade(totalDocsCountUpgraded, modelId, TEXT_UPGRADED, TEST_IMAGE_TEXT_UPGRADED);
6565
} finally {
6666
wipeOfTestResources(getIndexNameForTest(), PIPELINE_NAME, modelId, null);

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

+12-12
Original file line numberDiff line numberDiff line change
@@ -45,23 +45,23 @@ public void testTextImageEmbeddingProcessor_E2EFlow() throws Exception {
4545
addDocument(getIndexNameForTest(), "0", TEST_FIELD, TEXT, TEST_IMAGE_FIELD, TEST_IMAGE_TEXT);
4646
break;
4747
case MIXED:
48-
modelId = getModelId(getIngestionPipeline(PIPELINE_NAME), TEXT_IMAGE_EMBEDDING_PROCESSOR);
49-
int totalDocsCountMixed;
50-
if (isFirstMixedRound()) {
51-
totalDocsCountMixed = NUM_DOCS_PER_ROUND;
52-
validateTestIndexOnUpgrade(totalDocsCountMixed, modelId, TEXT, TEST_IMAGE_TEXT);
53-
addDocument(getIndexNameForTest(), "1", TEST_FIELD, TEXT_MIXED, TEST_IMAGE_FIELD, TEST_IMAGE_TEXT_MIXED);
54-
} else {
55-
// totalDocsCountMixed = 2 * NUM_DOCS_PER_ROUND;
56-
// validateTestIndexOnUpgrade(totalDocsCountMixed, modelId, TEXT_MIXED, TEST_IMAGE_TEXT_MIXED);
57-
}
48+
// modelId = getModelId(getIngestionPipeline(PIPELINE_NAME), TEXT_IMAGE_EMBEDDING_PROCESSOR);
49+
// int totalDocsCountMixed;
50+
// if (isFirstMixedRound()) {
51+
// totalDocsCountMixed = NUM_DOCS_PER_ROUND;
52+
// validateTestIndexOnUpgrade(totalDocsCountMixed, modelId, TEXT, TEST_IMAGE_TEXT);
53+
// addDocument(getIndexNameForTest(), "1", TEST_FIELD, TEXT_MIXED, TEST_IMAGE_FIELD, TEST_IMAGE_TEXT_MIXED);
54+
// } else {
55+
// totalDocsCountMixed = 2 * NUM_DOCS_PER_ROUND;
56+
// validateTestIndexOnUpgrade(totalDocsCountMixed, modelId, TEXT_MIXED, TEST_IMAGE_TEXT_MIXED);
57+
// }
5858
break;
5959
case UPGRADED:
6060
try {
6161
modelId = getModelId(getIngestionPipeline(PIPELINE_NAME), TEXT_IMAGE_EMBEDDING_PROCESSOR);
62-
int totalDocsCountUpgraded = 3 * NUM_DOCS_PER_ROUND;
62+
int totalDocsCountUpgraded = 1 * NUM_DOCS_PER_ROUND;
6363
loadModel(modelId);
64-
addDocument(getIndexNameForTest(), "2", TEST_FIELD, TEXT_UPGRADED, TEST_IMAGE_FIELD, TEST_IMAGE_TEXT_UPGRADED);
64+
addDocument(getIndexNameForTest(), "1", TEST_FIELD, TEXT_UPGRADED, TEST_IMAGE_FIELD, TEST_IMAGE_TEXT_UPGRADED);
6565
validateTestIndexOnUpgrade(totalDocsCountUpgraded, modelId, TEXT_UPGRADED, TEST_IMAGE_TEXT_UPGRADED);
6666
} finally {
6767
wipeOfTestResources(getIndexNameForTest(), PIPELINE_NAME, modelId, null);

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

+19-19
Original file line numberDiff line numberDiff line change
@@ -59,32 +59,32 @@ public void testSparseEncodingProcessor_E2EFlow() throws Exception {
5959
);
6060
break;
6161
case MIXED:
62-
modelId = getModelId(getIngestionPipeline(PIPELINE_NAME), SPARSE_ENCODING_PROCESSOR);
63-
int totalDocsCountMixed;
64-
if (isFirstMixedRound()) {
65-
totalDocsCountMixed = NUM_DOCS_PER_ROUND;
66-
validateTestIndexOnUpgrade(totalDocsCountMixed, modelId);
67-
addSparseEncodingDoc(
68-
getIndexNameForTest(),
69-
"1",
70-
List.of(TEST_SPARSE_ENCODING_FIELD),
71-
List.of(testRankFeaturesDoc2),
72-
List.of(TEST_TEXT_FIELD),
73-
List.of(TEXT_MIXED)
74-
);
75-
} else {
76-
// totalDocsCountMixed = 2 * NUM_DOCS_PER_ROUND;
77-
// validateTestIndexOnUpgrade(totalDocsCountMixed, modelId);
78-
}
62+
// modelId = getModelId(getIngestionPipeline(PIPELINE_NAME), SPARSE_ENCODING_PROCESSOR);
63+
// int totalDocsCountMixed;
64+
// if (isFirstMixedRound()) {
65+
// totalDocsCountMixed = NUM_DOCS_PER_ROUND;
66+
// validateTestIndexOnUpgrade(totalDocsCountMixed, modelId);
67+
// addSparseEncodingDoc(
68+
// getIndexNameForTest(),
69+
// "1",
70+
// List.of(TEST_SPARSE_ENCODING_FIELD),
71+
// List.of(testRankFeaturesDoc2),
72+
// List.of(TEST_TEXT_FIELD),
73+
// List.of(TEXT_MIXED)
74+
// );
75+
// } else {
76+
// totalDocsCountMixed = 2 * NUM_DOCS_PER_ROUND;
77+
// validateTestIndexOnUpgrade(totalDocsCountMixed, modelId);
78+
// }
7979
break;
8080
case UPGRADED:
8181
try {
8282
modelId = getModelId(getIngestionPipeline(PIPELINE_NAME), SPARSE_ENCODING_PROCESSOR);
83-
int totalDocsCountUpgraded = 3 * NUM_DOCS_PER_ROUND;
83+
int totalDocsCountUpgraded = 1 * NUM_DOCS_PER_ROUND;
8484
loadModel(modelId);
8585
addSparseEncodingDoc(
8686
getIndexNameForTest(),
87-
"2",
87+
"1",
8888
List.of(TEST_SPARSE_ENCODING_FIELD),
8989
List.of(testRankFeaturesDoc3),
9090
List.of(TEST_TEXT_FIELD),

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

+12-12
Original file line numberDiff line numberDiff line change
@@ -38,24 +38,24 @@ public void testSemanticSearch_E2EFlow() throws Exception {
3838
addDocument(getIndexNameForTest(), "0", TEST_FIELD, TEXT, null, null);
3939
break;
4040
case MIXED:
41-
String modelId2 = getModelId(getIngestionPipeline(PIPELINE_NAME), TEXT_EMBEDDING_PROCESSOR);
42-
int totalDocsCountMixed;
43-
if (isFirstMixedRound()) {
44-
totalDocsCountMixed = NUM_DOCS_PER_ROUND;
45-
validateTestIndexOnUpgrade(totalDocsCountMixed, modelId2, TEXT);
46-
addDocument(getIndexNameForTest(), "1", TEST_FIELD, TEXT_MIXED, null, null);
47-
} else {
48-
// totalDocsCountMixed = 2 * NUM_DOCS_PER_ROUND;
49-
// validateTestIndexOnUpgrade(totalDocsCountMixed, modelId2, TEXT_MIXED);
50-
}
41+
// String modelId2 = getModelId(getIngestionPipeline(PIPELINE_NAME), TEXT_EMBEDDING_PROCESSOR);
42+
// int totalDocsCountMixed;
43+
// if (isFirstMixedRound()) {
44+
// totalDocsCountMixed = NUM_DOCS_PER_ROUND;
45+
// validateTestIndexOnUpgrade(totalDocsCountMixed, modelId2, TEXT);
46+
// addDocument(getIndexNameForTest(), "1", TEST_FIELD, TEXT_MIXED, null, null);
47+
// } else {
48+
// totalDocsCountMixed = 2 * NUM_DOCS_PER_ROUND;
49+
// validateTestIndexOnUpgrade(totalDocsCountMixed, modelId2, TEXT_MIXED);
50+
// }
5151
break;
5252
case UPGRADED:
5353
String modelId3 = null;
5454
try {
5555
modelId3 = getModelId(getIngestionPipeline(PIPELINE_NAME), TEXT_EMBEDDING_PROCESSOR);
56-
int totalDocsCountUpgraded = 3 * NUM_DOCS_PER_ROUND;
56+
int totalDocsCountUpgraded = 1 * NUM_DOCS_PER_ROUND;
5757
loadModel(modelId3);
58-
addDocument(getIndexNameForTest(), "2", TEST_FIELD, TEXT_UPGRADED, null, null);
58+
addDocument(getIndexNameForTest(), "1", TEST_FIELD, TEXT_UPGRADED, null, null);
5959
validateTestIndexOnUpgrade(totalDocsCountUpgraded, modelId3, TEXT_UPGRADED);
6060
} finally {
6161
wipeOfTestResources(getIndexNameForTest(), PIPELINE_NAME, modelId3, null);

0 commit comments

Comments
 (0)