move lock position

apache · Sep 6, 2024 · b204a0c · b204a0c
1 parent 27987d2
commit b204a0c
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/...main/java/org/apache/doris/nereids/rules/exploration/mv/AbstractMaterializedViewRule.java b/...main/java/org/apache/doris/nereids/rules/exploration/mv/AbstractMaterializedViewRule.java
@@ -261,6 +261,12 @@ protected List<Plan> doRewrite(StructInfo queryStructInfo, CascadesContext casca
             // Rewrite query by view
             rewrittenPlan = rewriteQueryByView(matchMode, queryStructInfo, viewStructInfo, viewToQuerySlotMapping,
                     rewrittenPlan, materializationContext, cascadesContext);
+            // If rewrite successfully, try to get mv read lock to avoid data inconsistent,
+            // try to get lock which should added before RBO
+            if (materializationContext instanceof AsyncMaterializationContext && !materializationContext.isSuccess()) {
+                cascadesContext.getStatementContext()
+                        .addTableReadLock(((AsyncMaterializationContext) materializationContext).getMtmv());
+            }
             rewrittenPlan = MaterializedViewUtils.rewriteByRules(cascadesContext,
                     childContext -> {
                         Rewriter.getWholeTreeRewriter(childContext).execute();
@@ -356,12 +362,6 @@ protected List<Plan> doRewrite(StructInfo queryStructInfo, CascadesContext casca
             rewriteResults.add(rewrittenPlan);
             // if rewrite successfully, try to regenerate mv scan because it maybe used again
             materializationContext.tryReGenerateScanPlan(cascadesContext);
-            //  if rewrite successfully, try to get mv read lock to avoid data inconsistent
-            if (materializationContext instanceof AsyncMaterializationContext && !materializationContext.isSuccess()) {
-                // Need get mtmv read lock, to avoid the data of plan which use mv is wrong
-                cascadesContext.getStatementContext()
-                        .addTableReadLock(((AsyncMaterializationContext) materializationContext).getMtmv());
-            }
             recordIfRewritten(queryStructInfo.getOriginalPlan(), materializationContext);
         }
         return rewriteResults;