Skip to content

ES|QL: fix MultiClustersIT.testNotLikeListKeyword #131199

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
Jul 14, 2025
Merged

ES|QL: fix MultiClustersIT.testNotLikeListKeyword #131199

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad1aca6
ES|QL: fix MultiClustersIT
luigidellaquila Jul 14, 2025
ce75d36
Merge branch 'main' into fix_131155
luigidellaquila Jul 14, 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
3 changes: 0 additions & 3 deletions muted-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,9 +546,6 @@ tests:
- class: org.elasticsearch.xpack.esql.qa.multi_node.GenerativeIT
method: test
issue: https://github.com/elastic/elasticsearch/issues/131154
- class: org.elasticsearch.xpack.esql.ccq.MultiClustersIT
method: testNotLikeListKeyword
issue: https://github.com/elastic/elasticsearch/issues/131155
- class: org.elasticsearch.index.engine.ThreadPoolMergeExecutorServiceDiskSpaceTests
method: testEnqueuedMergeTasksAreUnblockedWhenEstimatedMergeSizeChanges
issue: https://github.com/elastic/elasticsearch/issues/131165
Expand Down
1 change: 0 additions & 1 deletion test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,6 @@ public static void setupEntitlementsForClass() {
TestEntitlementBootstrap.setActive(false == withoutEntitlements);
TestEntitlementBootstrap.setTriviallyAllowingTestCode(false == withEntitlementsOnTestCode);
if (entitledPackages != null) {
assert withEntitlementsOnTestCode == false : "Cannot use @WithEntitlementsOnTestCode together with @EntitledTestPackages";
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this change related?

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... probably a fat finger, let me fix it

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think GitHub is not having a good day... I didn't change it, this PR did, so that change is already in main.
Updating the PR branch fixed the "problem"

assert entitledPackages.value().length > 0 : "No test packages specified in @EntitledTestPackages";
TestEntitlementBootstrap.setEntitledTestPackages(entitledPackages.value());
}
Expand Down
14 changes: 10 additions & 4 deletions ...ulti-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClustersIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,10 +629,16 @@ public void testNotLikeListKeyword() throws Exception {
""", includeCCSMetadata);
var columns = List.of(Map.of("name", "c", "type", "long"), Map.of("name", "_index", "type", "keyword"));
Predicate<Doc> filter = d -> false == (d.color.contains("blue") || d.color.contains("red"));
var values = List.of(
List.of((int) remoteDocs.stream().filter(filter).count(), REMOTE_CLUSTER_NAME + ":" + remoteIndex),
List.of((int) localDocs.stream().filter(filter).count(), localIndex)
);

var values = new ArrayList<>();
int remoteCount = (int) remoteDocs.stream().filter(filter).count();
int localCount = (int) localDocs.stream().filter(filter).count();
if (remoteCount > 0) {
values.add(List.of(remoteCount, REMOTE_CLUSTER_NAME + ":" + remoteIndex));
}
if (localCount > 0) {
values.add(List.of(localCount, localIndex));
}
assertResultMapForLike(includeCCSMetadata, result, columns, values, false, true);
}

Expand Down