fix make check

pingcap · Jul 25, 2023 · 24960de · 24960de
1 parent abb2fd1
commit 24960de
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/build/BUILD.bazel b/build/BUILD.bazel
@@ -174,6 +174,7 @@ nogo(
            }) +
            select({
                "//build:without_rbe": [
+                   "//build/linter/filepermission",
                ],
                "//conditions:default": [],
            }),

diff --git a/planner/core/rule_join_reorder.go b/planner/core/rule_join_reorder.go
@@ -543,8 +543,8 @@ func (s *baseSingleGroupJoinOrderSolver) makeJoin(leftPlan, rightPlan LogicalPla
 		// these remained other condition here shouldn't be appended to it because on-mismatch
 		// logic will produce more append-null rows which is banned in original semantic.
 		remainOtherConds = append(remainOtherConds, otherConds...) // nozero
-		remainOtherConds = append(remainOtherConds, leftConds...)
-		remainOtherConds = append(remainOtherConds, rightConds...)
+		remainOtherConds = append(remainOtherConds, leftConds...)  // nozero
+		remainOtherConds = append(remainOtherConds, rightConds...) // nozero
 		otherConds = otherConds[:0]
 		leftConds = leftConds[:0]
 		rightConds = rightConds[:0]