Skip to content

ES|QL: add tests for ccs ENRICH with local only policy #134199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 5, 2025
+68 −12
Merged

ES|QL: add tests for ccs ENRICH with local only policy #134199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de38760
ES|QL: add tests for ccs ENRICH with local only policy
luigidellaquila Sep 5, 2025
df35bcf
Merge branch 'main' into esql/test_stats_enrich_coord
luigidellaquila Sep 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 22 additions & 12 deletions ...est/java/org/elasticsearch/xpack/esql/action/AbstractEnrichBasedCrossClusterTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ protected Settings nodeSettings() {
}

static final EnrichPolicy hostPolicy = new EnrichPolicy("match", null, List.of("hosts"), "ip", List.of("ip", "os"));
static final EnrichPolicy hostPolicyLocal = new EnrichPolicy("match", null, List.of("hosts_local"), "ip", List.of("ip", "os"));
static final EnrichPolicy vendorPolicy = new EnrichPolicy("match", null, List.of("vendors"), "os", List.of("os", "vendor"));

@Before
Expand Down Expand Up @@ -115,18 +116,23 @@ public void setupHostsEnrich() {
"Windows"
);
for (String cluster : allClusters()) {
Client client = client(cluster);
client.admin().indices().prepareCreate("hosts").setMapping("ip", "type=ip", "os", "type=keyword").get();
for (Map.Entry<String, String> h : allHosts.entrySet()) {
client.prepareIndex("hosts").setSource("ip", h.getKey(), "os", h.getValue()).get();
}
client.admin().indices().prepareRefresh("hosts").get();
client.execute(PutEnrichPolicyAction.INSTANCE, new PutEnrichPolicyAction.Request(TEST_REQUEST_TIMEOUT, "hosts", hostPolicy))
.actionGet();
client.execute(ExecuteEnrichPolicyAction.INSTANCE, new ExecuteEnrichPolicyAction.Request(TEST_REQUEST_TIMEOUT, "hosts"))
.actionGet();
assertAcked(client.admin().indices().prepareDelete("hosts"));
initHostsPolicy(client(cluster), "hosts", hostPolicy, allHosts);
}
// create policy on coordinator only
initHostsPolicy(client(), "hosts_local", hostPolicyLocal, allHosts);
}

private static void initHostsPolicy(Client client, String indexName, EnrichPolicy policy, Map<String, String> allHosts) {
client.admin().indices().prepareCreate(indexName).setMapping("ip", "type=ip", "os", "type=keyword").get();
for (Map.Entry<String, String> h : allHosts.entrySet()) {
client.prepareIndex(indexName).setSource("ip", h.getKey(), "os", h.getValue()).get();
}
client.admin().indices().prepareRefresh(indexName).get();
client.execute(PutEnrichPolicyAction.INSTANCE, new PutEnrichPolicyAction.Request(TEST_REQUEST_TIMEOUT, indexName, policy))
.actionGet();
client.execute(ExecuteEnrichPolicyAction.INSTANCE, new ExecuteEnrichPolicyAction.Request(TEST_REQUEST_TIMEOUT, indexName))
.actionGet();
assertAcked(client.admin().indices().prepareDelete(indexName));
}

@Before
Expand Down Expand Up @@ -201,7 +207,7 @@ record Event(long timestamp, String user, String host) {
public void wipeEnrichPolicies() {
for (String cluster : allClusters()) {
cluster(cluster).wipe(Set.of());
for (String policy : List.of("hosts", "vendors")) {
for (String policy : List.of("hosts", "hosts_local", "vendors")) {
if (tolerateErrorsWhenWipingEnrichPolicies()) {
try {
client(cluster).execute(
Expand All @@ -226,6 +232,10 @@ static String enrichHosts(Enrich.Mode mode) {
return EsqlTestUtils.randomEnrichCommand("hosts", mode, hostPolicy.getMatchField(), hostPolicy.getEnrichFields());
}

static String enrichHostsLocal(Enrich.Mode mode) {
return EsqlTestUtils.randomEnrichCommand("hosts_local", mode, hostPolicyLocal.getMatchField(), hostPolicyLocal.getEnrichFields());
}

static String enrichVendors(Enrich.Mode mode) {
return EsqlTestUtils.randomEnrichCommand("vendors", mode, vendorPolicy.getMatchField(), vendorPolicy.getEnrichFields());
}
Expand Down
46 changes: 46 additions & 0 deletions ...rc/internalClusterTest/java/org/elasticsearch/xpack/esql/action/CrossClusterEnrichIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,52 @@ public void testWithHostsPolicy() {
}
}

public void testFromRemotesWithCoordPolicy() {

String query = "FROM *:events | eval ip= TO_STR(host) | "
+ enrichHostsLocal(Enrich.Mode.COORDINATOR)
+ " | stats c = COUNT(*) by os | SORT os";
Comment on lines +115 to +117
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is eval ip= acting as a PipelineBreaker here?
I am not sure why enrich is in coordinator mode here. Could it be any or randomFrom(..)?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, in that case eval is not a pipeline breaker, I believe ENRICH becomes the actual breaker, as it's in COORDINATOR mode.

The real test is a few lines below, where I have a STATS by ip before ENRICH

try (EsqlQueryResponse resp = runQuery(query, null)) {
List<List<Object>> rows = getValuesList(resp);
assertThat(
rows,
equalTo(
List.of(
List.of(1L, "Android"),
List.of(2L, "Linux"),
List.of(4L, "MacOS"),
List.of(3L, "Windows"),
List.of(1L, "iOS"),
Arrays.asList(2L, (String) null)
)
)
);
assertTrue(resp.getExecutionInfo().isCrossClusterSearch());
}

query = "FROM *:events | eval ip= TO_STR(host) | stats by ip | "
+ enrichHostsLocal(Enrich.Mode.COORDINATOR)
+ " | stats c = COUNT(*) by os | SORT os";
try (EsqlQueryResponse resp = runQuery(query, null)) {
List<List<Object>> rows = getValuesList(resp);
assertThat(
rows,
equalTo(
List.of(
List.of(1L, "Android"),
List.of(2L, "Linux"),
List.of(2L, "MacOS"),
List.of(2L, "Windows"),
List.of(1L, "iOS"),
Arrays.asList(2L, (String) null)
)
)
);
assertTrue(resp.getExecutionInfo().isCrossClusterSearch());
}

}

public void testEnrichHostsAggThenEnrichVendorCoordinator() {
Tuple<Boolean, Boolean> includeCCSMetadata = randomIncludeCCSMetadata();
Boolean requestIncludeMeta = includeCCSMetadata.v1();
Expand Down