Skip to content

Commit 8ff869f

Browse files
committed
Addressed PR comments
Signed-off-by: Owais Kazi <owaiskazi19@gmail.com>
1 parent 08fa4d3 commit 8ff869f

File tree

2 files changed

+38
-3
lines changed

2 files changed

+38
-3
lines changed

server/src/main/java/org/opensearch/search/pipeline/SearchPipelineService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ public PipelinedRequest resolvePipeline(SearchRequest searchRequest, IndexNameEx
392392
if (searchRequest.pipeline() != null) {
393393
// Named pipeline specified for the request
394394
pipelineId = searchRequest.pipeline();
395-
} else if (state != null && searchRequest.indices() != null) {
395+
} else if (state != null && searchRequest.indices() != null && searchRequest.indices().length != 0) {
396396
// Check for index default pipeline
397397
Index[] concreteIndices = indexNameExpressionResolver.concreteIndices(state, searchRequest);
398398
for (Index index : concreteIndices) {

server/src/test/java/org/opensearch/search/pipeline/SearchPipelineServiceTests.java

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,10 @@ private static IndexMetadata.Builder indexBuilder(String index) {
115115
}
116116

117117
private static IndexMetadata.Builder indexBuilder(String index, Settings additionalSettings) {
118-
return IndexMetadata.builder(index).settings(settings(additionalSettings));
118+
return IndexMetadata.builder(index).settings(addAdditionalSettings(additionalSettings));
119119
}
120120

121-
private static Settings.Builder settings(Settings additionalSettings) {
121+
private static Settings.Builder addAdditionalSettings(Settings additionalSettings) {
122122
return settings(Version.CURRENT).put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1)
123123
.put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0)
124124
.put(additionalSettings);
@@ -1629,4 +1629,39 @@ public void testDifferentDefaultPipelineForMultipleIndices() throws Exception {
16291629
assertEquals(5, pipelinedRequest.source().size());
16301630
}
16311631

1632+
public void testNoIndexResolveIndexDefaultPipeline() throws Exception {
1633+
SearchPipelineService service = createWithProcessors();
1634+
1635+
SearchPipelineMetadata metadata = new SearchPipelineMetadata(
1636+
Map.of(
1637+
"p1",
1638+
new PipelineConfiguration(
1639+
"p1",
1640+
new BytesArray("{\"request_processors\" : [ { \"scale_request_size\": { \"scale\" : 2 } } ] }"),
1641+
MediaTypeRegistry.JSON
1642+
)
1643+
)
1644+
);
1645+
Settings defaultPipelineSetting = Settings.builder()
1646+
.put(IndexMetadata.INDEX_NUMBER_OF_SHARDS_SETTING.getKey(), 1)
1647+
.put(IndexMetadata.INDEX_NUMBER_OF_REPLICAS_SETTING.getKey(), 0)
1648+
.put(IndexMetadata.SETTING_INDEX_VERSION_CREATED.getKey(), Version.CURRENT)
1649+
.put(IndexSettings.DEFAULT_SEARCH_PIPELINE.getKey(), "p1")
1650+
.build();
1651+
IndexMetadata indexMetadata = new IndexMetadata.Builder("my_index").settings(defaultPipelineSetting).build();
1652+
ClusterState clusterState = ClusterState.builder(new ClusterName("_name")).build();
1653+
ClusterState previousState = clusterState;
1654+
clusterState = ClusterState.builder(clusterState)
1655+
.metadata(Metadata.builder().put(indexMetadata, false).putCustom(SearchPipelineMetadata.TYPE, metadata))
1656+
.build();
1657+
1658+
ClusterChangedEvent cce = new ClusterChangedEvent("", clusterState, previousState);
1659+
service.applyClusterState(cce);
1660+
1661+
SearchRequest searchRequest = new SearchRequest().source(SearchSourceBuilder.searchSource().size(5));
1662+
PipelinedRequest pipelinedRequest = syncTransformRequest(service.resolvePipeline(searchRequest, indexNameExpressionResolver));
1663+
assertEquals("_none", pipelinedRequest.getPipeline().getId());
1664+
assertEquals(5, pipelinedRequest.source().size());
1665+
}
1666+
16321667
}

0 commit comments

Comments
 (0)