Use logically more correct expression (#131869)

smalyshev · web-flow · commit 80faf64ceeda · 2025-07-25T02:22:33.000+02:00
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/session/EsqlCCSUtils.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/session/EsqlCCSUtils.java
@@ -58,7 +58,7 @@ static Map<String, List<FieldCapabilitiesFailure>> groupFailuresPerCluster(List<
     static Map<String, FieldCapabilitiesFailure> determineUnavailableRemoteClusters(Map<String, List<FieldCapabilitiesFailure>> failures) {
         Map<String, FieldCapabilitiesFailure> unavailableRemotes = new HashMap<>(failures.size());
         for (var e : failures.entrySet()) {
-            if (Strings.isEmpty(e.getKey())) {
+            if (RemoteClusterAware.LOCAL_CLUSTER_GROUP_KEY.equals(e.getKey())) {
                 continue;
             }
             if (e.getValue().stream().allMatch(f -> ExceptionsHelper.isRemoteUnavailableException(f.getException()))) {

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ static Map<String, List<FieldCapabilitiesFailure>> groupFailuresPerCluster(List<`
`58`	`58`	`static Map<String, FieldCapabilitiesFailure> determineUnavailableRemoteClusters(Map<String, List<FieldCapabilitiesFailure>> failures) {`
`59`	`59`	`Map<String, FieldCapabilitiesFailure> unavailableRemotes = new HashMap<>(failures.size());`
`60`	`60`	`for (var e : failures.entrySet()) {`
`61`		`- if (Strings.isEmpty(e.getKey())) {`
	`61`	`+ if (RemoteClusterAware.LOCAL_CLUSTER_GROUP_KEY.equals(e.getKey())) {`
`62`	`62`	`continue;`
`63`	`63`	`}`
`64`	`64`	`if (e.getValue().stream().allMatch(f -> ExceptionsHelper.isRemoteUnavailableException(f.getException()))) {`