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

eldenmoon 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 def48d5e13b [Fix](Short Circuit) fix no project list in OlapScanNode 
(#37121)
def48d5e13b is described below

commit def48d5e13bc74fb4c518a8cd579dc6544f5d0ef
Author: lihangyu <15605149...@163.com>
AuthorDate: Wed Jul 3 15:23:08 2024 +0800

    [Fix](Short Circuit) fix no project list in OlapScanNode (#37121)
    
    query like
    
    ```
    select a, `__DORIS_DELETE_SIGN__` from  `test_tbl` WHERE k = '1111111'
    ```
    will not contain project list on top of OlapScanNode, so for short
    circuit queries, we should use output exprs on top of plan fragment.
    
    ```
    
+----------------------------------------------------------------------------------------------------------------------------+
    | Explain String(Nereids Planner)                                           
                                                 |
    
+----------------------------------------------------------------------------------------------------------------------------+
    | PLAN FRAGMENT 0                                                           
                                                 |
    |   OUTPUT EXPRS:                                                           
                                                 |
    |     k1[#0]                                                                
                                                 |
    |     k2[#1]                                                                
                                                 |
    |     k3[#2]                                                                
                                                 |
    |     k4[#3]                                                                
                                                 |
    |     k5[#4]                                                                
                                                 |
    |     k6[#5]                                                                
                                                 |
    |     k7[#6]                                                                
                                                 |
    |     k8[#7]                                                                
                                                 |
    |     k9[#8]                                                                
                                                 |
    |     k10[#9]                                                               
                                                 |
    |     k11[#10]                                                              
                                                 |
    |     k12[#11]                                                              
                                                 |
    |     new_column0[#12]                                                      
                                                 |
    |     new_column1[#13]                                                      
                                                 |
    |     __DORIS_DELETE_SIGN__[#14]                                            
                                                 |
    |   PARTITION: UNPARTITIONED                                                
                                                 |
    |                                                                           
                                                 |
    |   HAS_COLO_PLAN_NODE: false                                               
                                                 |
    |                                                                           
                                                 |
    |   VRESULT SINK                                                            
                                                 |
    |      MYSQL_PROTOCAL                                                       
                                                 |
    |                                                                           
                                                 |
    |   1:VEXCHANGE                                                             
                                                 |
    |      offset: 0                                                            
                                                 |
    |      distribute expr lists: k1[#0], k2[#1], k3[#2]                        
                                                 |
    |                                                                           
                                                 |
    | PLAN FRAGMENT 1                                                           
                                                 |
    |                                                                           
                                                 |
    |   PARTITION: HASH_PARTITIONED: k1[#0], k2[#1], k3[#2]                     
                                                 |
    |                                                                           
                                                 |
    |   HAS_COLO_PLAN_NODE: false                                               
                                                 |
    |                                                                           
                                                 |
    |   STREAM DATA SINK                                                        
                                                 |
    |     EXCHANGE ID: 01                                                       
                                                 |
    |     UNPARTITIONED                                                         
                                                 |
    |                                                                           
                                                 |
    |   0:VOlapScanNode(149)                                                    
                                                 |
    |      TABLE: 
regression_test_serving_p0.tbl_point_query0(tbl_point_query0), PREAGGREGATION: 
ON                              |
    |      PREDICATES: (k1[#0] = 1231) AND (k2[#1] = 119291.110000000) AND 
(k3[#2] = 'ddd') AND (__DORIS_DELETE_SIGN__[#14] = 0) |
    |      partitions=1/1 (tbl_point_query0)                                    
                                                 |
    |      tablets=1/1, tabletList=13203                                        
                                                 |
    |      cardinality=0, avgRowSize=0.0, numNodes=1                            
                                                 |
    |      pushAggOp=NONE                                                       
                                                 |
    |      SHORT-CIRCUIT                                                        
                                                 |
    |                                                                           
                                                 |
    |                                                                           
                                                 |
    | Statistics                                                                
                                                 |
    |  planed with unknown column statistics                                    
                                                 |
    
+----------------------------------------------------------------------------------------------------------------------------+
    ```
---
 .../apache/doris/qe/ShortCircuitQueryContext.java  |  12 +-
 .../data/point_query_p0/test_point_query.out       | 146 ++++++---------------
 .../suites/point_query_p0/test_point_query.groovy  |  24 ++++
 3 files changed, 71 insertions(+), 111 deletions(-)

diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/qe/ShortCircuitQueryContext.java 
b/fe/fe-core/src/main/java/org/apache/doris/qe/ShortCircuitQueryContext.java
index 727eee11752..2840dd65239 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/ShortCircuitQueryContext.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/ShortCircuitQueryContext.java
@@ -36,6 +36,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 public class ShortCircuitQueryContext {
     // Cached for better CPU performance, since serialize DescriptorTable and
@@ -66,8 +67,15 @@ public class ShortCircuitQueryContext {
         this.serializedQueryOptions = ByteString.copyFrom(
                 new TSerializer().serialize(options));
         List<TExpr> exprs = new ArrayList<>();
-        for (Expr expr : 
planner.getFragments().get(1).getPlanRoot().getProjectList()) {
-            exprs.add(expr.treeToThrift());
+        OlapScanNode olapScanNode = (OlapScanNode) 
planner.getFragments().get(1).getPlanRoot();
+        if (olapScanNode.getProjectList() != null) {
+            // project on scan node
+            exprs.addAll(olapScanNode.getProjectList().stream()
+                    .map(Expr::treeToThrift).collect(Collectors.toList()));
+        } else {
+            // add output slots
+            
exprs.addAll(planner.getFragments().get(0).getOutputExprs().stream()
+                    .map(Expr::treeToThrift).collect(Collectors.toList()));
         }
         TExprList exprList = new TExprList(exprs);
         serializedOutputExpr = ByteString.copyFrom(
diff --git a/regression-test/data/point_query_p0/test_point_query.out 
b/regression-test/data/point_query_p0/test_point_query.out
index ff4b1932b3a..5a4e0b66178 100644
--- a/regression-test/data/point_query_p0/test_point_query.out
+++ b/regression-test/data/point_query_p0/test_point_query.out
@@ -1,27 +1,27 @@
 -- This file is automatically generated. You should know what you did if you 
want to edit this
 -- !point_select --
-1231   119291.110000000        ddd     laooq   \N      2020-01-01 12:36:38     
\N      1022-01-01      \N      1.111   \N      [119181.111100000, 
819019.119100000, null]
+1231   119291.110000000        ddd     laooq   \N      2020-01-01T12:36:38     
\N      1022-01-01      \N      1.111   \N      [119181.111100000, 
819019.119100000, null]
 
 -- !point_select --
-1231   119291.110000000        ddd     laooq   \N      2020-01-01 12:36:38     
\N      1022-01-01      \N      1.111   \N      [119181.111100000, 
819019.119100000, null]
+1231   119291.110000000        ddd     laooq   \N      2020-01-01T12:36:38     
\N      1022-01-01      \N      1.111   \N      [119181.111100000, 
819019.119100000, null]
 
 -- !point_select --
-1237   120939.111300000        a    ddd        laooq   2030-01-02      
2020-01-01 12:36:38     22.822  7022-01-01      false   90696620686827832.374   
[1.100000000, 2.200000000, 3.300000000, 4.400000000, 5.500000000]       []
+1237   120939.111300000        a    ddd        laooq   2030-01-02      
2020-01-01T12:36:38     22.822  7022-01-01      false   90696620686827832.374   
[1.100000000, 2.200000000, 3.300000000, 4.400000000, 5.500000000]       []
 
 -- !point_select --
-1232   12222.991211350 xxx     laooq   2023-01-02      2020-01-01 12:36:38     
522.762 2022-01-01      true    212.111 \N      \N
+1232   12222.991211350 xxx     laooq   2023-01-02      2020-01-01T12:36:38     
522.762 2022-01-01      true    212.111 \N      \N
 
 -- !point_select --
-251    120939.111300000        
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
     laooq   2030-01-02      2020-01-01 12:36:38     251.0   7022-01-01      
true    90696620686827832.374   [11111.000000000]       []
+251    120939.111300000        
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
     laooq   2030-01-02      2020-01-01T12:36:38     251.0   7022-01-01      
true    90696620686827832.374   [11111.000000000]       []
 
 -- !point_select --
-252    120939.111300000        
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
    laooq   2030-01-02      2020-01-01 12:36:38     252.0   7022-01-01      
false   90696620686827832.374   \N      [0.000000000]
+252    120939.111300000        
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
    laooq   2030-01-02      2020-01-01T12:36:38     252.0   7022-01-01      
false   90696620686827832.374   \N      [0.000000000]
 
 -- !point_select --
-298    120939.111300000        
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
      laooq   2030-01-02      2020-01-01 12:36:38     298.0   7022-01-01      
true    90696620686827832.374   []      []
+298    120939.111300000        
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
      laooq   2030-01-02      2020-01-01T12:36:38     298.0   7022-01-01      
true    90696620686827832.374   []      []
 
 -- !point_select --
-1235   991129292901.111380000  dd      \N      2120-01-02      2020-01-01 
12:36:38     652.692 5022-01-01      false   90696620686827832.374   
[119181.111100000]      
["aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"]
+1235   991129292901.111380000  dd      \N      2120-01-02      
2020-01-01T12:36:38     652.692 5022-01-01      false   90696620686827832.374   
[119181.111100000]      
["aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"]
 
 -- !point_select --
 646464 6C616F6F71
@@ -33,34 +33,34 @@
 646464 6C616F6F71
 
 -- !point_select --
-1235   120939.111300000        a    ddd        laooq   2030-01-02      
2020-01-01 12:36:38     22.822  7022-01-01      true    1.111   
[119291.192910000]      ["111", "222", "333"]   1
+1235   120939.111300000        a    ddd        laooq   2030-01-02      
2020-01-01T12:36:38     22.822  7022-01-01      true    1.111   
[119291.192910000]      ["111", "222", "333"]   1
 
 -- !point_select --
-1235   120939.111300000        a    ddd        laooq   2030-01-02      
2020-01-01 12:36:38     22.822  7022-01-01      true    1.111   
[119291.192910000]      ["111", "222", "333"]   1
+1235   120939.111300000        a    ddd        laooq   2030-01-02      
2020-01-01T12:36:38     22.822  7022-01-01      true    1.111   
[119291.192910000]      ["111", "222", "333"]   1
 
 -- !point_select --
-1235   120939.111300000        a    ddd        xxxxxx  2030-01-02      
2020-01-01 12:36:38     22.822  7022-01-01      false   1929111.111     
[119291.192910000]      ["111", "222", "333"]   2
+1235   120939.111300000        a    ddd        xxxxxx  2030-01-02      
2020-01-01T12:36:38     22.822  7022-01-01      false   1929111.111     
[119291.192910000]      ["111", "222", "333"]   2
 
 -- !point_select --
-1235   120939.111300000        a    ddd        xxxxxx  2030-01-02      
2020-01-01 12:36:38     22.822  7022-01-01      false   1929111.111     
[119291.192910000]      ["111", "222", "333"]   2
+1235   120939.111300000        a    ddd        xxxxxx  2030-01-02      
2020-01-01T12:36:38     22.822  7022-01-01      false   1929111.111     
[119291.192910000]      ["111", "222", "333"]   2
 
 -- !point_select --
-1235   120939.111300000        a    ddd        xxxxxx  2030-01-02      
2020-01-01 12:36:38     22.822  7022-01-01      false   1929111.111     
[119291.192910000]      ["111", "222", "333"]   2
+1235   120939.111300000        a    ddd        xxxxxx  2030-01-02      
2020-01-01T12:36:38     22.822  7022-01-01      false   1929111.111     
[119291.192910000]      ["111", "222", "333"]   2
 
 -- !point_select --
-1235   120939.111300000        a    ddd        xxxxxx  2030-01-02      
2020-01-01 12:36:38     22.822  7022-01-01      false   1929111.111     
[119291.192910000]      ["111", "222", "333"]   2       0
+1235   120939.111300000        a    ddd        xxxxxx  2030-01-02      
2020-01-01T12:36:38     22.822  7022-01-01      false   1929111.111     
[119291.192910000]      ["111", "222", "333"]   2       0
 
 -- !point_select --
-1235   120939.111300000        a    ddd        xxxxxx  2030-01-02      
2020-01-01 12:36:38     22.822  7022-01-01      false   1929111.111     
[119291.192910000]      ["111", "222", "333"]   2       0
+1235   120939.111300000        a    ddd        xxxxxx  2030-01-02      
2020-01-01T12:36:38     22.822  7022-01-01      false   1929111.111     
[119291.192910000]      ["111", "222", "333"]   2       0
 
 -- !point_select --
-1235   120939.111300000        a    ddd        xxxxxx  2030-01-02      
2020-01-01 12:36:38     22.822  7022-01-01      false   1929111.111     
[119291.192910000]      ["111", "222", "333"]   2
+1235   120939.111300000        a    ddd        xxxxxx  2030-01-02      
2020-01-01T12:36:38     22.822  7022-01-01      false   1929111.111     
[119291.192910000]      ["111", "222", "333"]   2
 
 -- !point_select --
-1235   120939.111300000        a    ddd        xxxxxx  2030-01-02      
2020-01-01 12:36:38     22.822  7022-01-01      false   1929111.111     
[119291.192910000]      ["111", "222", "333"]   2
+1235   120939.111300000        a    ddd        xxxxxx  2030-01-02      
2020-01-01T12:36:38     22.822  7022-01-01      false   1929111.111     
[119291.192910000]      ["111", "222", "333"]   2
 
 -- !point_select --
-1235   120939.111300000        a    ddd        xxxxxx  2030-01-02      
2020-01-01 12:36:38     22.822  7022-01-01      false   1929111.111     
[119291.192910000]      ["111", "222", "333"]   2       0
+1235   120939.111300000        a    ddd        xxxxxx  2030-01-02      
2020-01-01T12:36:38     22.822  7022-01-01      false   1929111.111     
[119291.192910000]      ["111", "222", "333"]   2       0
 
 -- !sql --
 1231   119291.110000000        ddd     laooq   \N      2020-01-01T12:36:38     
\N      1022-01-01      \N      1.111   [119181.111100000, 819019.119100000, 
null]      \N      0       0
@@ -75,28 +75,28 @@
 0      1       2       3
 
 -- !point_select --
-1231   119291.110000000        ddd     laooq   \N      2020-01-01 12:36:38     
\N      1022-01-01      \N      1.111   \N      [119181.111100000, 
819019.119100000, null]
+1231   119291.110000000        ddd     laooq   \N      2020-01-01T12:36:38     
\N      1022-01-01      \N      1.111   \N      [119181.111100000, 
819019.119100000, null]
 
 -- !point_select --
-1231   119291.110000000        ddd     laooq   \N      2020-01-01 12:36:38     
\N      1022-01-01      \N      1.111   \N      [119181.111100000, 
819019.119100000, null]
+1231   119291.110000000        ddd     laooq   \N      2020-01-01T12:36:38     
\N      1022-01-01      \N      1.111   \N      [119181.111100000, 
819019.119100000, null]
 
 -- !point_select --
-1237   120939.111300000        a    ddd        laooq   2030-01-02      
2020-01-01 12:36:38     22.822  7022-01-01      false   90696620686827832.374   
[1.100000000, 2.200000000, 3.300000000, 4.400000000, 5.500000000]       []
+1237   120939.111300000        a    ddd        laooq   2030-01-02      
2020-01-01T12:36:38     22.822  7022-01-01      false   90696620686827832.374   
[1.100000000, 2.200000000, 3.300000000, 4.400000000, 5.500000000]       []
 
 -- !point_select --
-1232   12222.991211350 xxx     laooq   2023-01-02      2020-01-01 12:36:38     
522.762 2022-01-01      true    212.111 \N      \N
+1232   12222.991211350 xxx     laooq   2023-01-02      2020-01-01T12:36:38     
522.762 2022-01-01      true    212.111 \N      \N
 
 -- !point_select --
-251    120939.111300000        
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
     laooq   2030-01-02      2020-01-01 12:36:38     251.0   7022-01-01      
true    90696620686827832.374   [11111.000000000]       []
+251    120939.111300000        
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
     laooq   2030-01-02      2020-01-01T12:36:38     251.0   7022-01-01      
true    90696620686827832.374   [11111.000000000]       []
 
 -- !point_select --
-252    120939.111300000        
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
    laooq   2030-01-02      2020-01-01 12:36:38     252.0   7022-01-01      
false   90696620686827832.374   \N      [0.000000000]
+252    120939.111300000        
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
    laooq   2030-01-02      2020-01-01T12:36:38     252.0   7022-01-01      
false   90696620686827832.374   \N      [0.000000000]
 
 -- !point_select --
-298    120939.111300000        
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
      laooq   2030-01-02      2020-01-01 12:36:38     298.0   7022-01-01      
true    90696620686827832.374   []      []
+298    120939.111300000        
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
      laooq   2030-01-02      2020-01-01T12:36:38     298.0   7022-01-01      
true    90696620686827832.374   []      []
 
 -- !point_select --
-1235   991129292901.111380000  dd      \N      2120-01-02      2020-01-01 
12:36:38     652.692 5022-01-01      false   90696620686827832.374   
[119181.111100000]      
["aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"]
+1235   991129292901.111380000  dd      \N      2120-01-02      
2020-01-01T12:36:38     652.692 5022-01-01      false   90696620686827832.374   
[119181.111100000]      
["aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"]
 
 -- !point_select --
 646464 6C616F6F71
@@ -108,34 +108,34 @@
 646464 6C616F6F71
 
 -- !point_select --
-1235   120939.111300000        a    ddd        laooq   2030-01-02      
2020-01-01 12:36:38     22.822  7022-01-01      true    1.111   
[119291.192910000]      ["111", "222", "333"]   1
+1235   120939.111300000        a    ddd        laooq   2030-01-02      
2020-01-01T12:36:38     22.822  7022-01-01      true    1.111   
[119291.192910000]      ["111", "222", "333"]   1
 
 -- !point_select --
-1235   120939.111300000        a    ddd        laooq   2030-01-02      
2020-01-01 12:36:38     22.822  7022-01-01      true    1.111   
[119291.192910000]      ["111", "222", "333"]   1
+1235   120939.111300000        a    ddd        laooq   2030-01-02      
2020-01-01T12:36:38     22.822  7022-01-01      true    1.111   
[119291.192910000]      ["111", "222", "333"]   1
 
 -- !point_select --
-1235   120939.111300000        a    ddd        xxxxxx  2030-01-02      
2020-01-01 12:36:38     22.822  7022-01-01      false   1929111.111     
[119291.192910000]      ["111", "222", "333"]   2
+1235   120939.111300000        a    ddd        xxxxxx  2030-01-02      
2020-01-01T12:36:38     22.822  7022-01-01      false   1929111.111     
[119291.192910000]      ["111", "222", "333"]   2
 
 -- !point_select --
-1235   120939.111300000        a    ddd        xxxxxx  2030-01-02      
2020-01-01 12:36:38     22.822  7022-01-01      false   1929111.111     
[119291.192910000]      ["111", "222", "333"]   2
+1235   120939.111300000        a    ddd        xxxxxx  2030-01-02      
2020-01-01T12:36:38     22.822  7022-01-01      false   1929111.111     
[119291.192910000]      ["111", "222", "333"]   2
 
 -- !point_select --
-1235   120939.111300000        a    ddd        xxxxxx  2030-01-02      
2020-01-01 12:36:38     22.822  7022-01-01      false   1929111.111     
[119291.192910000]      ["111", "222", "333"]   2
+1235   120939.111300000        a    ddd        xxxxxx  2030-01-02      
2020-01-01T12:36:38     22.822  7022-01-01      false   1929111.111     
[119291.192910000]      ["111", "222", "333"]   2
 
 -- !point_select --
-1235   120939.111300000        a    ddd        xxxxxx  2030-01-02      
2020-01-01 12:36:38     22.822  7022-01-01      false   1929111.111     
[119291.192910000]      ["111", "222", "333"]   2       0
+1235   120939.111300000        a    ddd        xxxxxx  2030-01-02      
2020-01-01T12:36:38     22.822  7022-01-01      false   1929111.111     
[119291.192910000]      ["111", "222", "333"]   2       0
 
 -- !point_select --
-1235   120939.111300000        a    ddd        xxxxxx  2030-01-02      
2020-01-01 12:36:38     22.822  7022-01-01      false   1929111.111     
[119291.192910000]      ["111", "222", "333"]   2       0
+1235   120939.111300000        a    ddd        xxxxxx  2030-01-02      
2020-01-01T12:36:38     22.822  7022-01-01      false   1929111.111     
[119291.192910000]      ["111", "222", "333"]   2       0
 
 -- !point_select --
-1235   120939.111300000        a    ddd        xxxxxx  2030-01-02      
2020-01-01 12:36:38     22.822  7022-01-01      false   1929111.111     
[119291.192910000]      ["111", "222", "333"]   2
+1235   120939.111300000        a    ddd        xxxxxx  2030-01-02      
2020-01-01T12:36:38     22.822  7022-01-01      false   1929111.111     
[119291.192910000]      ["111", "222", "333"]   2
 
 -- !point_select --
-1235   120939.111300000        a    ddd        xxxxxx  2030-01-02      
2020-01-01 12:36:38     22.822  7022-01-01      false   1929111.111     
[119291.192910000]      ["111", "222", "333"]   2
+1235   120939.111300000        a    ddd        xxxxxx  2030-01-02      
2020-01-01T12:36:38     22.822  7022-01-01      false   1929111.111     
[119291.192910000]      ["111", "222", "333"]   2
 
 -- !point_select --
-1235   120939.111300000        a    ddd        xxxxxx  2030-01-02      
2020-01-01 12:36:38     22.822  7022-01-01      false   1929111.111     
[119291.192910000]      ["111", "222", "333"]   2       0
+1235   120939.111300000        a    ddd        xxxxxx  2030-01-02      
2020-01-01T12:36:38     22.822  7022-01-01      false   1929111.111     
[119291.192910000]      ["111", "222", "333"]   2       0
 
 -- !sql --
 1231   119291.110000000        ddd     laooq   \N      2020-01-01T12:36:38     
\N      1022-01-01      \N      1.111   [119181.111100000, 819019.119100000, 
null]      \N      0       0
@@ -149,78 +149,6 @@
 -- !sql --
 0      1       2       3
 
--- !point_select --
-1231   119291.110000000        ddd     laooq   \N      2020-01-01 12:36:38     
\N      1022-01-01      \N      1.111   \N      [119181.111100000, 
819019.119100000, null]
-
--- !point_select --
-1231   119291.110000000        ddd     laooq   \N      2020-01-01 12:36:38     
\N      1022-01-01      \N      1.111   \N      [119181.111100000, 
819019.119100000, null]
-
--- !point_select --
-1237   120939.111300000        a    ddd        laooq   2030-01-02      
2020-01-01 12:36:38     22.822  7022-01-01      false   90696620686827832.374   
[1.100000000, 2.200000000, 3.300000000, 4.400000000, 5.500000000]       []
-
--- !point_select --
-1232   12222.991211350 xxx     laooq   2023-01-02      2020-01-01 12:36:38     
522.762 2022-01-01      true    212.111 \N      \N
-
--- !point_select --
-251    120939.111300000        
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
     laooq   2030-01-02      2020-01-01 12:36:38     251.0   7022-01-01      
true    90696620686827832.374   [11111.000000000]       []
-
--- !point_select --
-252    120939.111300000        
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
    laooq   2030-01-02      2020-01-01 12:36:38     252.0   7022-01-01      
false   90696620686827832.374   \N      [0.000000000]
-
--- !point_select --
-298    120939.111300000        
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
      laooq   2030-01-02      2020-01-01 12:36:38     298.0   7022-01-01      
true    90696620686827832.374   []      []
-
--- !point_select --
-1235   991129292901.111380000  dd      \N      2120-01-02      2020-01-01 
12:36:38     652.692 5022-01-01      false   90696620686827832.374   
[119181.111100000]      
["aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"]
-
--- !point_select --
-646464 6C616F6F71
-
--- !point_select --
-646464 6C616F6F71
-
--- !point_select --
-646464 6C616F6F71
-
--- !point_select --
-1235   120939.111300000        a    ddd        laooq   2030-01-02      
2020-01-01 12:36:38     22.822  7022-01-01      true    1.111   
[119291.192910000]      ["111", "222", "333"]   1
-
--- !point_select --
-1235   120939.111300000        a    ddd        laooq   2030-01-02      
2020-01-01 12:36:38     22.822  7022-01-01      true    1.111   
[119291.192910000]      ["111", "222", "333"]   1
-
--- !point_select --
-1235   120939.111300000        a    ddd        xxxxxx  2030-01-02      
2020-01-01 12:36:38     22.822  7022-01-01      false   1929111.111     
[119291.192910000]      ["111", "222", "333"]   2
-
--- !point_select --
-1235   120939.111300000        a    ddd        xxxxxx  2030-01-02      
2020-01-01 12:36:38     22.822  7022-01-01      false   1929111.111     
[119291.192910000]      ["111", "222", "333"]   2
-
--- !point_select --
-1235   120939.111300000        a    ddd        xxxxxx  2030-01-02      
2020-01-01 12:36:38     22.822  7022-01-01      false   1929111.111     
[119291.192910000]      ["111", "222", "333"]   2
-
--- !point_select --
-1235   120939.111300000        a    ddd        xxxxxx  2030-01-02      
2020-01-01 12:36:38     22.822  7022-01-01      false   1929111.111     
[119291.192910000]      ["111", "222", "333"]   2       0
-
--- !point_select --
-1235   120939.111300000        a    ddd        xxxxxx  2030-01-02      
2020-01-01 12:36:38     22.822  7022-01-01      false   1929111.111     
[119291.192910000]      ["111", "222", "333"]   2       0
-
--- !point_select --
-1235   120939.111300000        a    ddd        xxxxxx  2030-01-02      
2020-01-01 12:36:38     22.822  7022-01-01      false   1929111.111     
[119291.192910000]      ["111", "222", "333"]   2
-
--- !point_select --
-1235   120939.111300000        a    ddd        xxxxxx  2030-01-02      
2020-01-01 12:36:38     22.822  7022-01-01      false   1929111.111     
[119291.192910000]      ["111", "222", "333"]   2
-
--- !point_select --
-1235   120939.111300000        a    ddd        xxxxxx  2030-01-02      
2020-01-01 12:36:38     22.822  7022-01-01      false   1929111.111     
[119291.192910000]      ["111", "222", "333"]   2       0
-
 -- !sql --
-1231   119291.110000000        ddd     laooq   \N      2020-01-01T12:36:38     
\N      1022-01-01      \N      1.111   [119181.111100000, 819019.119100000, 
null]      \N      0       0
-
--- !sql --
-1237   120939.111300000        a    ddd        laooq   2030-01-02      
2020-01-01T12:36:38     22.822  7022-01-01      false   90696620686827832.374   
[1.100000000, 2.200000000, 3.300000000, 4.400000000, 5.500000000]       []      
0       0
-
--- !sql --
-6120202020646464       6C616F6F71      32.92200050354004
-
--- !sql --
-0      1       2       3
+0      1111111
 
diff --git a/regression-test/suites/point_query_p0/test_point_query.groovy 
b/regression-test/suites/point_query_p0/test_point_query.groovy
index 2fcbfd51434..0d4df448286 100644
--- a/regression-test/suites/point_query_p0/test_point_query.groovy
+++ b/regression-test/suites/point_query_p0/test_point_query.groovy
@@ -274,6 +274,30 @@ suite("test_point_query", "nonConcurrent") {
         """                
         sql "insert into test_ODS_EBA_LLREPORT(RPTNO) values('567890')"
         sql "select  /*+ SET_VAR(enable_nereids_planner=true) */  
substr(RPTNO,2,5) from test_ODS_EBA_LLREPORT where  RPTNO = '567890'"
+
+        sql "DROP TABLE IF EXISTS test_cc_aaaid2";
+        sql """
+        CREATE TABLE `test_cc_aaaid2` (
+          `aaaid` VARCHAR(13) NULL COMMENT '3aid'
+        ) ENGINE=OLAP
+        UNIQUE KEY(`aaaid`)
+        COMMENT 'OLAP'
+        DISTRIBUTED BY HASH(`aaaid`) BUCKETS 1
+        PROPERTIES (
+        "replication_allocation" = "tag.location.default: 1",
+        "enable_unique_key_merge_on_write" = "true",
+        "store_row_column" = "true"
+        );
+        """                
+        sql """insert into `test_cc_aaaid2` values('1111111')"""
+        qt_sql """SELECT
+             `__DORIS_DELETE_SIGN__`,
+             aaaid
+
+            FROM
+             `test_cc_aaaid2` 
+            WHERE
+             aaaid = '1111111'"""
     } finally {
         set_be_config.call("disable_storage_row_cache", "true")
         sql """set global enable_nereids_planner=true"""


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

Reply via email to