fix

924060929 · Feb 28, 2024 · 2315875 · 2315875
1 parent 3fadf18
commit 2315875
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/jobs/executor/Rewriter.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/jobs/executor/Rewriter.java
@@ -42,7 +42,7 @@
 import org.apache.doris.nereids.rules.rewrite.CheckDataTypes;
 import org.apache.doris.nereids.rules.rewrite.CheckMatchExpression;
 import org.apache.doris.nereids.rules.rewrite.CheckMultiDistinct;
-import org.apache.doris.nereids.rules.rewrite.CheckPrivilege;
+import org.apache.doris.nereids.rules.rewrite.CheckPrivileges;
 import org.apache.doris.nereids.rules.rewrite.CollectFilterAboveConsumer;
 import org.apache.doris.nereids.rules.rewrite.CollectProjectAboveConsumer;
 import org.apache.doris.nereids.rules.rewrite.ColumnPruning;
@@ -241,7 +241,7 @@ public class Rewriter extends AbstractBatchJobExecutor {
             // 2. and then check the column privileges
             // 3. finally, we can eliminate the LogicalView
             topic("Inline view and check column privileges",
-                    custom(RuleType.CHECK_PRIVILEGES, CheckPrivilege::new),
+                    custom(RuleType.CHECK_PRIVILEGES, CheckPrivileges::new),
                     bottomUp(new InlineLogicalView())
             ),
             topic("Eliminate optimization",

diff --git a/...ore/src/main/java/org/apache/doris/nereids/rules/analysis/EliminateLogicalSelectHint.java b/...ore/src/main/java/org/apache/doris/nereids/rules/analysis/EliminateLogicalSelectHint.java
@@ -108,7 +108,7 @@ private void setVar(SelectHintSetVar selectHint, StatementContext context) {
             }
             throw new AnalysisException("The nereids is disabled in this sql, fallback to original planner");
         }
-        context.invalidCache(SessionVariable.DISABLE_NEREIDS_RULES);
+        context.invalidCache(selectHint.getHintName());
     }
 
     private void extractLeading(SelectHintLeading selectHint, CascadesContext context,

diff --git a/...nereids/rules/rewrite/CheckPrivilege.java → ...ereids/rules/rewrite/CheckPrivileges.java b/...nereids/rules/rewrite/CheckPrivilege.java → ...ereids/rules/rewrite/CheckPrivileges.java
@@ -34,8 +34,8 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-/** CheckPrivilege */
-public class CheckPrivilege extends ColumnPruning {
+/** CheckPrivileges */
+public class CheckPrivileges extends ColumnPruning {
     private JobContext jobContext;
 
     @Override

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/logical/LogicalTestScan.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/logical/LogicalTestScan.java
@@ -30,7 +30,7 @@
 import java.util.Optional;
 
 /**
- * LogicalTestTable.
+ * LogicalTestScan.
  *
  * only for ut
  */

diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java b/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
@@ -2612,9 +2612,11 @@ public int getNthOptimizedPlan() {
 
     public Set<String> getDisableNereidsRuleNames() {
         String checkPrivilege = RuleType.CHECK_PRIVILEGES.name();
+        String checkRowPolicy = RuleType.CHECK_ROW_POLICY.name();
         return Arrays.stream(disableNereidsRules.split(",[\\s]*"))
                 .map(rule -> rule.toUpperCase(Locale.ROOT))
-                .filter(rule -> !StringUtils.equalsIgnoreCase(rule, checkPrivilege))
+                .filter(rule -> !StringUtils.equalsIgnoreCase(rule, checkPrivilege)
+                        && !StringUtils.equalsIgnoreCase(rule, checkRowPolicy))
                 .collect(ImmutableSet.toImmutableSet());
     }
 
@@ -2623,7 +2625,8 @@ public Set<Integer> getDisableNereidsRules() {
                 .filter(rule -> !rule.isEmpty())
                 .map(rule -> rule.toUpperCase(Locale.ROOT))
                 .map(rule -> RuleType.valueOf(rule))
-                .filter(ruleType -> ruleType != RuleType.CHECK_PRIVILEGES)
+                .filter(ruleType -> ruleType != RuleType.CHECK_PRIVILEGES
+                        && ruleType != RuleType.CHECK_ROW_POLICY)
                 .map(RuleType::type)
                 .collect(ImmutableSet.toImmutableSet());
     }