Skip to content

Commit 7613137

Browse files
authored
Enable Semantic Search CCS When ccs_minimize_roundtrips=true (#135309)
1 parent 32dfe39 commit 7613137

24 files changed

+1716
-198
lines changed

docs/changelog/135309.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 135309
2+
summary: Enable semantic search CCS when ccs_minimize_roundtrips=true
3+
area: Vector Search
4+
type: enhancement
5+
issues: []

qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/110_semantic_query.yml

Lines changed: 0 additions & 37 deletions
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9174000
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sampling_configuration,9173000
1+
semantic_search_ccs_support,9174000

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/LocalStateCompositeXPackPlugin.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@
8080
import org.elasticsearch.plugins.ShutdownAwarePlugin;
8181
import org.elasticsearch.plugins.SystemIndexPlugin;
8282
import org.elasticsearch.plugins.interceptor.RestServerActionPlugin;
83+
import org.elasticsearch.plugins.internal.InternalSearchPlugin;
84+
import org.elasticsearch.plugins.internal.rewriter.QueryRewriteInterceptor;
8385
import org.elasticsearch.repositories.RepositoriesMetrics;
8486
import org.elasticsearch.repositories.Repository;
8587
import org.elasticsearch.repositories.SnapshotMetrics;
@@ -136,6 +138,7 @@ public class LocalStateCompositeXPackPlugin extends XPackPlugin
136138
IndexStorePlugin,
137139
SystemIndexPlugin,
138140
SearchPlugin,
141+
InternalSearchPlugin,
139142
ShutdownAwarePlugin,
140143
RestServerActionPlugin {
141144

@@ -298,6 +301,15 @@ public List<QuerySpec<?>> getQueries() {
298301
return querySpecs;
299302
}
300303

304+
@Override
305+
public List<QueryRewriteInterceptor> getQueryRewriteInterceptors() {
306+
List<QueryRewriteInterceptor> interceptors = new ArrayList<>();
307+
filterPlugins(InternalSearchPlugin.class).stream()
308+
.flatMap(p -> p.getQueryRewriteInterceptors().stream())
309+
.forEach(interceptors::add);
310+
return interceptors;
311+
}
312+
301313
@Override
302314
public List<NamedXContentRegistry.Entry> getNamedXContent() {
303315
List<NamedXContentRegistry.Entry> entries = new ArrayList<>(super.getNamedXContent());

x-pack/plugin/inference/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ dependencies {
3636
testImplementation(project(':x-pack:plugin:inference:qa:test-service-plugin'))
3737
testImplementation project(':modules:reindex')
3838
testImplementation project(':modules:mapper-extras')
39+
testImplementation project(':x-pack:plugin:ml')
3940
clusterPlugins project(':x-pack:plugin:inference:qa:test-service-plugin')
4041

4142
api "com.ibm.icu:icu4j:${versions.icu4j}"

0 commit comments

Comments
 (0)