Merge branch '118621_fix' of https://github.com/astefan/elasticsearch into 118621_fix

Author: astefan

x-pack/plugin/eql/qa/common/src/main/java/org/elasticsearch/test/eql/DataLoader.java

@@ -98,8 +98,11 @@ public static void loadDatasetIntoEs(RestClient client, CheckedBiFunction<XConte
         });
     }
 
-    private static void loadDatasetIntoEsWithIndexCreator(RestClient client, CheckedBiFunction<XContent, InputStream, XContentParser, IOException> p, IndexCreator indexCreator)
-        throws IOException {
+    private static void loadDatasetIntoEsWithIndexCreator(
+        RestClient client,
+        CheckedBiFunction<XContent, InputStream, XContentParser, IOException> p,
+        IndexCreator indexCreator
+    ) throws IOException {
 
         //
         // Main Index

x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/optimizer/OptimizerRules.java

@@ -1256,31 +1256,29 @@ protected Expression rule(Or or) {
             if (found.isEmpty() == false) {
                 // combine Equals alongside the existing ORs
                 final ZoneId finalZoneId = zoneId;
-                found.forEach(
-                    (k, v) -> {
-                        if (v.size() == 1) {
-                            ors.add(createEquals(k, v.iterator().next(), finalZoneId));
-                        } else {
-                            In in = createIn(k, new ArrayList<>(v), finalZoneId);
-                            // IN has its own particularities when it comes to type resolution and not all implementations
-                            // double check the validity of an internally created IN (like the one created here). EQL is one where the IN
-                            // implementation is like this mechanism here has been specifically created for it
-                            if (shouldValidateIn()) {
-                                Expression.TypeResolution resolution = in.validateInTypes();
-                                if (resolution.unresolved()) {
-                                    // if the internally created In is not valid, fall back to the original ORs
-                                    assert originalOrs.containsKey(k);
-                                    assert originalOrs.get(k).isEmpty() == false;
-                                    ors.add(combineOr(originalOrs.get(k)));
-                                } else {
-                                    ors.add(in);
-                                }
+                found.forEach((k, v) -> {
+                    if (v.size() == 1) {
+                        ors.add(createEquals(k, v.iterator().next(), finalZoneId));
+                    } else {
+                        In in = createIn(k, new ArrayList<>(v), finalZoneId);
+                        // IN has its own particularities when it comes to type resolution and not all implementations
+                        // double check the validity of an internally created IN (like the one created here). EQL is one where the IN
+                        // implementation is like this mechanism here has been specifically created for it
+                        if (shouldValidateIn()) {
+                            Expression.TypeResolution resolution = in.validateInTypes();
+                            if (resolution.unresolved()) {
+                                // if the internally created In is not valid, fall back to the original ORs
+                                assert originalOrs.containsKey(k);
+                                assert originalOrs.get(k).isEmpty() == false;
+                                ors.add(combineOr(originalOrs.get(k)));
                             } else {
                                 ors.add(in);
                             }
+                        } else {
+                            ors.add(in);
                         }
                     }
-                );
+                });
 
                 Expression combineOr = combineOr(ors);
                 // check the result semantically since the result might different in order