fix regression test

apache · Sep 23, 2024 · 120c66f · 120c66f
1 parent d7cc2b0
commit 120c66f
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/logical/LogicalOlapScan.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/logical/LogicalOlapScan.java
@@ -48,6 +48,7 @@
 import org.apache.commons.lang3.tuple.Pair;
 import org.json.JSONObject;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -566,9 +567,23 @@ public void computeFd(DataTrait.Builder builder) {
 
     Map<Slot, Slot> constructReplaceMap(MTMV mtmv) {
         Map<Slot, Slot> replaceMap = new HashMap<>();
-        List<Slot> originOutputs = mtmv.getCache().getOriginalPlan().getOutput();
-        for (int i = 0; i < getOutput().size(); i++) {
-            replaceMap.put(originOutputs.get(i), getOutput().get(i));
+        // Need remove invisible column, and then mapping them
+        List<Slot> originOutputs = new ArrayList<>();
+        for (Slot originSlot : mtmv.getCache().getOriginalPlan().getOutput()) {
+            if (!(originSlot instanceof SlotReference) || (((SlotReference) originSlot).isVisible())) {
+                originOutputs.add(originSlot);
+            }
+        }
+        List<Slot> targetOutputs = new ArrayList<>();
+        for (Slot targeSlot : getOutput()) {
+            if (!(targeSlot instanceof SlotReference) || (((SlotReference) targeSlot).isVisible())) {
+                targetOutputs.add(targeSlot);
+            }
+        }
+        Preconditions.checkArgument(originOutputs.size() == targetOutputs.size(),
+                "constructReplaceMap, the size of originOutputs and targetOutputs should be same");
+        for (int i = 0; i < targetOutputs.size(); i++) {
+            replaceMap.put(originOutputs.get(i), targetOutputs.get(i));
         }
         return replaceMap;
     }

diff --git a/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Suite.groovy b/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Suite.groovy
@@ -1305,7 +1305,7 @@ class Suite implements GroovyInterceptable {
         }
         Assert.assertEquals("SUCCESS", status)
         logger.info("waitingMTMVTaskFinished analyze mv name is " + result.last().get(5))
-        sql "analyze table ${mvName} with sync;"
+        sql "analyze table ${result.last().get(6)}.${mvName} with sync;"
     }
 
     void waitingMTMVTaskFinishedByMvNameAllowCancel(String mvName) {
@@ -1330,7 +1330,7 @@ class Suite implements GroovyInterceptable {
         Assert.assertEquals("SUCCESS", status)
         // Need to analyze materialized view for cbo to choose the materialized view accurately
         logger.info("waitingMTMVTaskFinished analyze mv name is " + result.last().get(5))
-        sql "analyze table ${mvName} with sync;"
+        sql "analyze table ${result.last().get(6)}.${mvName} with sync;"
     }
 
     void waitingPartitionIsExpected(String tableName, String partitionName, boolean expectedStatus) {
@@ -1381,7 +1381,7 @@ class Suite implements GroovyInterceptable {
         Assert.assertEquals("SUCCESS", status)
         // Need to analyze materialized view for cbo to choose the materialized view accurately
         logger.info("waitingMTMVTaskFinished analyze mv name is " + result.last().get(5))
-        sql "analyze table ${result.last().get(5)} with sync;"
+        sql "analyze table ${result.last().get(6)}.${result.last().get(5)} with sync;"
     }
 
     void waitingMTMVTaskFinishedNotNeedSuccess(String jobName) {