[doris] branch master updated: [fix](Nereids) scan should output all invisiable column (#23003)

[morrysnow]

This is an automated email from the ASF dual-hosted git repository.

morrysnow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/master by this push:
     new 0594acfcf1 [fix](Nereids) scan should output all invisiable column 
(#23003)
0594acfcf1 is described below

commit 0594acfcf16fee6330fc8d9dc37a5a96be60de79
Author: morrySnow <101034200+morrys...@users.noreply.github.com>
AuthorDate: Wed Aug 16 18:07:59 2023 +0800

    [fix](Nereids) scan should output all invisiable column (#23003)
---
 .../doris/nereids/trees/plans/logical/LogicalOlapScan.java   | 12 +-----------
 .../doris/nereids/rules/analysis/BindRelationTest.java       |  2 +-
 .../doris/nereids/rules/rewrite/PruneOlapScanTabletTest.java |  2 +-
 3 files changed, 3 insertions(+), 13 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
index 60458eb2a2..4777e2b65b 100644
--- 
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
@@ -20,7 +20,6 @@ package org.apache.doris.nereids.trees.plans.logical;
 import org.apache.doris.catalog.Column;
 import org.apache.doris.catalog.OlapTable;
 import org.apache.doris.catalog.Table;
-import org.apache.doris.common.util.Util;
 import org.apache.doris.nereids.memo.GroupExpression;
 import org.apache.doris.nereids.properties.LogicalProperties;
 import 
org.apache.doris.nereids.rules.rewrite.mv.AbstractSelectMaterializedIndexRule;
@@ -33,20 +32,17 @@ import org.apache.doris.nereids.trees.plans.RelationId;
 import org.apache.doris.nereids.trees.plans.algebra.OlapScan;
 import org.apache.doris.nereids.trees.plans.visitor.PlanVisitor;
 import org.apache.doris.nereids.util.Utils;
-import org.apache.doris.qe.ConnectContext;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Maps;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * Logical OlapScan.
@@ -290,13 +286,7 @@ public class LogicalOlapScan extends 
LogicalCatalogRelation implements OlapScan
         if (selectedIndexId != ((OlapTable) table).getBaseIndexId()) {
             return getOutputByIndex(selectedIndexId);
         }
-        List<Column> otherColumns = new ArrayList<>();
-        if (!Util.showHiddenColumns() && getTable().hasDeleteSign()
-                && !ConnectContext.get().getSessionVariable()
-                .skipDeleteSign()) {
-            otherColumns.add(getTable().getDeleteSignColumn());
-        }
-        return Stream.concat(table.getBaseSchema().stream(), 
otherColumns.stream())
+        return table.getBaseSchema(true).stream()
                 .map(col -> {
                     if (cacheSlotWithSlotName.containsKey(col.getName())) {
                         return cacheSlotWithSlotName.get(col.getName());
diff --git 
a/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/analysis/BindRelationTest.java
 
b/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/analysis/BindRelationTest.java
index af012ce3fb..e23c67ed56 100644
--- 
a/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/analysis/BindRelationTest.java
+++ 
b/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/analysis/BindRelationTest.java
@@ -93,7 +93,7 @@ class BindRelationTest extends TestWithFeService implements 
GeneratedPlanPattern
         OlapTable externalOlapTable = new OlapTable(1, tableName, 
externalTableColumns, KeysType.DUP_KEYS,
                 new PartitionInfo(), new RandomDistributionInfo(10)) {
             @Override
-            public List<Column> getBaseSchema() {
+            public List<Column> getBaseSchema(boolean full) {
                 return externalTableColumns;
             }
 
diff --git 
a/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/rewrite/PruneOlapScanTabletTest.java
 
b/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/rewrite/PruneOlapScanTabletTest.java
index e0244a80e3..38cdc115de 100644
--- 
a/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/rewrite/PruneOlapScanTabletTest.java
+++ 
b/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/rewrite/PruneOlapScanTabletTest.java
@@ -106,7 +106,7 @@ class PruneOlapScanTabletTest implements 
MemoPatternMatchSupported {
                 olapTable.getPartitionIds();
                 result = ImmutableList.of(1L);
 
-                olapTable.getBaseSchema();
+                olapTable.getBaseSchema(true);
                 result = columns;
 
                 olapTable.getName();


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org