fix

Author: JingsongLi

paimon-common/src/main/java/org/apache/paimon/predicate/PredicateBuilder.java

@@ -296,7 +296,9 @@ public static Predicate and(List<Predicate> predicates) {
             return optimized.get(0);
         }
 
-        return new CompoundPredicate(And.INSTANCE, optimized);
+        return optimized.stream()
+                .reduce((a, b) -> new CompoundPredicate(And.INSTANCE, Arrays.asList(a, b)))
+                .get();
     }
 
     @Nullable
@@ -349,7 +351,9 @@ public static Predicate or(List<Predicate> predicates) {
             return noFalsePredicates.get(0);
         }
 
-        return new CompoundPredicate(Or.INSTANCE, noFalsePredicates);
+        return noFalsePredicates.stream()
+                .reduce((a, b) -> new CompoundPredicate(Or.INSTANCE, Arrays.asList(a, b)))
+                .get();
     }
 
     private static boolean isAlwaysFalse(Predicate predicate) {

paimon-common/src/test/java/org/apache/paimon/predicate/PredicateBuilderTest.java

@@ -150,22 +150,6 @@ public void testAndAllTrue() {
         assertThat(result).isEqualTo(PredicateBuilder.alwaysTrue());
     }
 
-    @Test
-    public void testAndProducesFlatCompound() {
-        PredicateBuilder builder =
-                new PredicateBuilder(RowType.of(new IntType(), new IntType(), new IntType()));
-        Predicate a = builder.equal(0, 1);
-        Predicate b = builder.equal(1, 2);
-        Predicate c = builder.equal(2, 3);
-
-        Predicate result = PredicateBuilder.and(a, b, c);
-        // Should be a flat CompoundPredicate, not nested binary
-        assertThat(result).isInstanceOf(CompoundPredicate.class);
-        CompoundPredicate compound = (CompoundPredicate) result;
-        assertThat(compound.function()).isInstanceOf(And.class);
-        assertThat(compound.children()).containsExactly(a, b, c);
-    }
-
     // ---- or() tests ----
 
     @Test
@@ -200,22 +184,6 @@ public void testOrAllFalse() {
         assertThat(result).isEqualTo(PredicateBuilder.alwaysFalse());
     }
 
-    @Test
-    public void testOrProducesFlatCompound() {
-        PredicateBuilder builder =
-                new PredicateBuilder(RowType.of(new IntType(), new IntType(), new IntType()));
-        Predicate a = builder.equal(0, 1);
-        Predicate b = builder.equal(1, 2);
-        Predicate c = builder.equal(2, 3);
-
-        Predicate result = PredicateBuilder.or(a, b, c);
-        // Should be a flat CompoundPredicate, not nested binary
-        assertThat(result).isInstanceOf(CompoundPredicate.class);
-        CompoundPredicate compound = (CompoundPredicate) result;
-        assertThat(compound.function()).isInstanceOf(Or.class);
-        assertThat(compound.children()).containsExactly(a, b, c);
-    }
-
     // ---- and/or evaluation tests ----
 
     @Test