Skip to content

Commit 4790cf4

Browse files
authored
Make ESQL match operator project-aware (#130331)
And unmute the YAML tests in the MP suite.
1 parent 2142915 commit 4790cf4

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/fulltext/QueryBuilderResolver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ private static QueryRewriteContext queryRewriteContext(TransportActionServices s
5555
ResolvedIndices resolvedIndices = ResolvedIndices.resolveWithIndexNamesAndOptions(
5656
indexNames.toArray(String[]::new),
5757
IndexResolver.FIELD_CAPS_INDICES_OPTIONS,
58-
services.clusterService().state().metadata().getProject(),
58+
services.projectResolver().getProjectMetadata(services.clusterService().state()),
5959
services.indexNameExpressionResolver(),
6060
services.transportService().getRemoteClusterService(),
6161
System.currentTimeMillis()

x-pack/qa/multi-project/xpack-rest-tests-with-multiple-projects/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ tasks.named("yamlRestTest").configure {
3535
'^deprecation/10_basic/*',
3636
'^dlm/10_usage/*',
3737
'^esql/60_usage/*',
38-
'^esql/180_match_operator/*',
3938
'^health/10_usage/*',
4039
'^ilm/80_health/*',
4140
'^logsdb/10_usage/*',

0 commit comments

Comments
 (0)