From f13c09f210910cfb15e403d2b7224a178f59253b Mon Sep 17 00:00:00 2001 From: Andrei Stefan Date: Mon, 25 Aug 2025 15:58:23 +0300 Subject: [PATCH 1/2] Create unique lookup data to avoid matching multiple lookup docs --- muted-tests.yml | 6 ------ .../org/elasticsearch/xpack/esql/ccq/MultiClustersIT.java | 8 +++++++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/muted-tests.yml b/muted-tests.yml index ac99142aaed56..2d3b339f29374 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -354,9 +354,6 @@ tests: - class: org.elasticsearch.search.SearchWithRejectionsIT method: testOpenContextsAfterRejections issue: https://github.com/elastic/elasticsearch/issues/130821 -- class: org.elasticsearch.xpack.esql.ccq.MultiClustersIT - method: testLookupJoinAliases - issue: https://github.com/elastic/elasticsearch/issues/131166 - class: org.elasticsearch.packaging.test.DockerTests method: test090SecurityCliPackaging issue: https://github.com/elastic/elasticsearch/issues/131107 @@ -408,9 +405,6 @@ tests: - class: org.elasticsearch.compute.lucene.read.SortedSetOrdinalsBuilderTests method: testReader issue: https://github.com/elastic/elasticsearch/issues/131573 -- class: org.elasticsearch.xpack.esql.ccq.MultiClustersIT - method: testLookupJoinAliasesSkipOld - issue: https://github.com/elastic/elasticsearch/issues/131697 - class: org.elasticsearch.packaging.test.DockerTests method: test151MachineDependentHeapWithSizeOverride issue: https://github.com/elastic/elasticsearch/issues/123437 diff --git a/x-pack/plugin/esql/qa/server/multi-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClustersIT.java b/x-pack/plugin/esql/qa/server/multi-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClustersIT.java index af6915a717d3a..445bae825da88 100644 --- a/x-pack/plugin/esql/qa/server/multi-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClustersIT.java +++ b/x-pack/plugin/esql/qa/server/multi-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClustersIT.java @@ -127,8 +127,14 @@ private void setupLookupIndices() throws IOException { "morecolor": { "type": "keyword" } } """; + var randomDocsData = new ArrayList(); var lookupDocs = IntStream.range(0, between(1, 5)) - .mapToObj(n -> new Doc(n, randomFrom("red", "yellow", "green"), randomIntBetween(1, 1000))) + .mapToObj(n -> { + String color = randomFrom("red", "yellow", "green"); + int data = randomValueOtherThanMany(i -> randomDocsData.contains(i), () -> randomIntBetween(1, 1000)); + randomDocsData.add(data); + return new Doc(n, color, data); + }) .toList(); createIndex( localClient, From 409016f520866821c84060e3585118755ca32cfc Mon Sep 17 00:00:00 2001 From: elasticsearchmachine Date: Mon, 25 Aug 2025 13:08:51 +0000 Subject: [PATCH 2/2] [CI] Auto commit changes from spotless --- .../xpack/esql/ccq/MultiClustersIT.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/x-pack/plugin/esql/qa/server/multi-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClustersIT.java b/x-pack/plugin/esql/qa/server/multi-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClustersIT.java index 445bae825da88..42b7bc59e278b 100644 --- a/x-pack/plugin/esql/qa/server/multi-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClustersIT.java +++ b/x-pack/plugin/esql/qa/server/multi-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClustersIT.java @@ -128,14 +128,12 @@ private void setupLookupIndices() throws IOException { } """; var randomDocsData = new ArrayList(); - var lookupDocs = IntStream.range(0, between(1, 5)) - .mapToObj(n -> { - String color = randomFrom("red", "yellow", "green"); - int data = randomValueOtherThanMany(i -> randomDocsData.contains(i), () -> randomIntBetween(1, 1000)); - randomDocsData.add(data); - return new Doc(n, color, data); - }) - .toList(); + var lookupDocs = IntStream.range(0, between(1, 5)).mapToObj(n -> { + String color = randomFrom("red", "yellow", "green"); + int data = randomValueOtherThanMany(i -> randomDocsData.contains(i), () -> randomIntBetween(1, 1000)); + randomDocsData.add(data); + return new Doc(n, color, data); + }).toList(); createIndex( localClient, lookupIndexLocal,