fix fe ut

Author: starocean999

fe/fe-core/src/main/java/org/apache/doris/nereids/jobs/executor/Optimizer.java

@@ -100,10 +100,6 @@ public static boolean isDpHyp(CascadesContext cascadesContext) {
                 && !cascadesContext.isLeadingDisableJoinReorder()
                 && continuousJoinNum <= sessionVariable.getMaxJoinNumberOfReorder()
                 && isDpHyp;
-        if (continuousJoinNum > 0) {
-            finalEnableDpHyp = true;
-        }
-
         cascadesContext.getStatementContext().setDpHyp(finalEnableDpHyp);
         return finalEnableDpHyp;
     }

fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/JoinType.java

@@ -26,7 +26,7 @@
 import java.util.Map;
 
 /**
- * All join type in Nereids.
+ * All job type in Nereids.
  */
 public enum JoinType {
     INNER_JOIN,
@@ -55,7 +55,7 @@ public enum JoinType {
             .build();
 
     // TODO: the right-semi/right-anti/right-outer join is not derived in paper. We need to derive them
-    // TODO: add null rejecting conjunct check for assoc, l-assoc and r-assoc
+
     /*ASSOC:
      *        topJoin       bottomJoin
      *        /     \         /     \
@@ -69,24 +69,14 @@ public enum JoinType {
      */
     private static final Map<JoinType, ImmutableSet<JoinType>> assocJoinMatrix
             = ImmutableMap.<JoinType, ImmutableSet<JoinType>>builder()
-            .put(CROSS_JOIN, ImmutableSet.of(CROSS_JOIN, INNER_JOIN, LEFT_SEMI_JOIN, LEFT_ANTI_JOIN,
-                    LEFT_OUTER_JOIN, FULL_OUTER_JOIN))
-            .put(INNER_JOIN, ImmutableSet.of(CROSS_JOIN, INNER_JOIN, LEFT_SEMI_JOIN, LEFT_ANTI_JOIN,
-                    LEFT_OUTER_JOIN, FULL_OUTER_JOIN))
+            .put(CROSS_JOIN, ImmutableSet.of(CROSS_JOIN, INNER_JOIN))
+            .put(INNER_JOIN, ImmutableSet.of(CROSS_JOIN, INNER_JOIN))
             .build();
 
     private static final Map<JoinType, ImmutableSet<JoinType>> lAssocJoinMatrix
             = ImmutableMap.<JoinType, ImmutableSet<JoinType>>builder()
-            .put(CROSS_JOIN, ImmutableSet.of(CROSS_JOIN, INNER_JOIN, LEFT_SEMI_JOIN, LEFT_ANTI_JOIN,
-                    LEFT_OUTER_JOIN))
-            .put(INNER_JOIN, ImmutableSet.of(CROSS_JOIN, INNER_JOIN, LEFT_SEMI_JOIN, LEFT_ANTI_JOIN,
-                    LEFT_OUTER_JOIN))
-            .put(LEFT_SEMI_JOIN, ImmutableSet.of(CROSS_JOIN, INNER_JOIN, LEFT_SEMI_JOIN, LEFT_ANTI_JOIN,
-                    LEFT_OUTER_JOIN))
-            .put(LEFT_ANTI_JOIN, ImmutableSet.of(CROSS_JOIN, INNER_JOIN, LEFT_SEMI_JOIN, LEFT_ANTI_JOIN,
-                    LEFT_OUTER_JOIN))
-            .put(LEFT_OUTER_JOIN, ImmutableSet.of(CROSS_JOIN, INNER_JOIN, LEFT_SEMI_JOIN, LEFT_ANTI_JOIN,
-                    LEFT_OUTER_JOIN))
+            .put(CROSS_JOIN, ImmutableSet.of(CROSS_JOIN, INNER_JOIN))
+            .put(INNER_JOIN, ImmutableSet.of(CROSS_JOIN, INNER_JOIN))
             .build();
 
     private static final Map<JoinType, ImmutableSet<JoinType>> rAssocJoinMatrix

fe/fe-core/src/test/java/org/apache/doris/nereids/util/PlanConstructor.java

@@ -107,7 +107,7 @@ public static OlapTable newOlapTable(long tableId, String tableName, int hashCol
         // Use two INT columns to increase chance of join matches in randomized tests
         List<Column> columns = ImmutableList.of(
                 new Column("id", Type.INT, true, AggregateType.NONE, "0", ""),
-                new Column("age", Type.INT, true, AggregateType.NONE, "0", ""));
+                new Column("name", Type.STRING, true, AggregateType.NONE, "", ""));
 
         HashDistributionInfo hashDistributionInfo = new HashDistributionInfo(3,
                 ImmutableList.of(columns.get(hashColumn)));