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

yiguolei pushed a commit to branch branch-4.0
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/branch-4.0 by this push:
     new b598e7c79f5 branch-4.0: [fix](regression-case)fix unstable case: 
push_down_top_n_through_union #60251 (#60378)
b598e7c79f5 is described below

commit b598e7c79f516d4351e5fd9ea583b5f92f36d807
Author: github-actions[bot] 
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Jan 30 16:12:25 2026 +0800

    branch-4.0: [fix](regression-case)fix unstable case: 
push_down_top_n_through_union #60251 (#60378)
    
    Cherry-picked from #60251
    
    Co-authored-by: minghong <[email protected]>
---
 .../push_down_top_n/push_down_top_n_through_union.out                 | 2 +-
 .../push_down_top_n/push_down_top_n_through_union.groovy              | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/regression-test/data/nereids_rules_p0/push_down_top_n/push_down_top_n_through_union.out
 
b/regression-test/data/nereids_rules_p0/push_down_top_n/push_down_top_n_through_union.out
index 8d743d5eb9e..5e515a9861f 100644
--- 
a/regression-test/data/nereids_rules_p0/push_down_top_n/push_down_top_n_through_union.out
+++ 
b/regression-test/data/nereids_rules_p0/push_down_top_n/push_down_top_n_through_union.out
@@ -134,7 +134,7 @@ error_code=500&message=Database+connection+failed   
{"component":"database","sever
 error_code=500&message=Internal+Server+Error   
{"severity":"high","type":"error"}      500     Internal server error occurred  
192.168.1.104   /api/v1/users   192.168.1.104   api.example.com 
{"app":"web","env":"production"}        {"city":"Berlin","country":"Germany"}   
{"Content-Type":"application/json","X-Request-ID":"req123"}     
{"hostname":"web-server-02"}    https://client.example.com      Mozilla/5.0 
(Windows NT 10.0; Win64; x64)       {"input_type":"error","tags":["error", 
"prod"]} {"level":"error","message":"server error", [...]
 order_id=789&amount=99.99      {"method":"credit_card","type":"payment"}       
201     Payment processed       192.168.1.102   /api/v1/payments        
192.168.1.102   pay.example.com {"app":"payment","env":"production"}    
{"city":"London","country":"UK"}        
{"Content-Type":"application/json","X-CSRF-Token":"xyz789"}     
{"hostname":"payment-gateway-01"}       https://checkout.example.com    
Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) 
{"input_type":"api","tags":["payment", "prod"]} 
{"level":"info","message":"payment success","timesta [...]
 product_id=456&category=electronics    
{"device":"mobile","type":"product_view"}       304     Product page viewed     
192.168.1.101   /products/456   192.168.1.101   shop.example.com        
{"app":"ecommerce","env":"staging"}     {"city":"New York","country":"USA"}     
{"Cache-Control":"max-age=3600","Content-Type":"text/html"}     
{"hostname":"shop-server-02"}   https://search.example.com      Mozilla/5.0 
(iPhone; CPU iPhone OS 15_0 like Mac OS X)  
{"input_type":"http","tags":["shop", "mobile"]} 
{"level":"info","message":"product view [...]
-product_id=789&quantity=2&price=59.99  
{"event":"purchase","payment_method":"credit_card"}     201     Order processed 
successfully    192.168.1.101   /api/v1/orders  192.168.1.101   
shop.example.com        
{"app":"ecommerce","env":"production","version":"3.2.1"}        {"city":"New 
York","coordinates":{"lat":40.7128,"lon":-74.006},"country":"US"}  
{"Accept":"application/json","Content-Type":"application/json","X-CSRF-Token":"csrf_abc123"}
    {"region":"us-east-1","server":"shop-node-03"}  
https://shop.example.com/product/ [...]
+product_id=789&quantity=2&price=59.99  
{"event":"purchase","payment_method":"credit_card"}     201     Order processed 
successfully    192.168.1.101   /api/v1/orders  192.168.1.101   
shop.example.com        
{"app":"ecommerce","env":"production","version":"3.2.1"}        {"city":"New 
York","coordinates":{"lat":40.7128,"lon":-74.006},"country":"US"}  
{"Accept":"application/json","Content-Type":"application/json","X-CSRF-Token":"csrf_abc123"}
    {"region":"us-east-1","server":"shop-node-03"}  
https://shop.example.com/product/ [...]
 query=smartphone&page=1&sort=price_asc {"filters":["in_stock", 
"free_shipping"],"search_type":"product"}       200     Search results returned 
192.168.1.104   /api/v1/search  192.168.1.104   search.example.com      
{"app":"search","env":"production","features":["autocomplete", 
"faceted_search"]}       
{"city":"Berlin","coordinates":{"lat":52.52,"lon":13.405},"country":"DE"}       
{"Content-Type":"application/json","X-Forwarded-For":"192.168.1.104, 
203.0.113.5"}      {"region":"eu-central-1","server":"search-node-01"}     
https: [...]
 search_term=laptop&page=2      {"results_count":25,"type":"search"}    200     
Search results returned 192.168.1.103   /search 192.168.1.103   
search.example.com      {"app":"search","env":"production"}     
{"city":"Tokyo","country":"Japan"}      
{"Accept-Language":"en-US","Content-Type":"application/json"}   
{"hostname":"search-server-03"} https://www.example.com Mozilla/5.0 (Linux; 
Android 11; SM-G991B)       {"input_type":"search","tags":["search", "prod"]}   
    {"level":"info","message":"search query","timestamp":"2025-07-31T [...]
 transaction_id=txn_987654&amount=199.99        
{"currency":"USD","gateway":"stripe","type":"payment"}  202     Payment 
processing started      192.168.1.102   /api/v1/payments        192.168.1.102   
pay.example.com {"app":"payment","env":"production","features":["3d_secure", 
"refunds"]}        
{"city":"London","coordinates":{"lat":51.5074,"lon":-0.1278},"country":"GB"}    
{"Content-Type":"application/json","Idempotency-Key":"idemp_123","X-Request-ID":"req_987xyz"}
   {"region":"eu-west-2","server":"payment-gw-02"} https://check [...]
diff --git 
a/regression-test/suites/nereids_rules_p0/push_down_top_n/push_down_top_n_through_union.groovy
 
b/regression-test/suites/nereids_rules_p0/push_down_top_n/push_down_top_n_through_union.groovy
index e7c806518c2..28ef3d1b61a 100644
--- 
a/regression-test/suites/nereids_rules_p0/push_down_top_n/push_down_top_n_through_union.groovy
+++ 
b/regression-test/suites/nereids_rules_p0/push_down_top_n/push_down_top_n_through_union.groovy
@@ -138,7 +138,7 @@ suite("push_down_top_n_through_union") {
     '{"source":"web","tags":["security","auth"]}', 
'{"timestamp":"2025-07-31T09:15:22Z","level":"INFO","message":"Successful login 
for user 
admin","context":{"ip":"192.168.1.100","user_agent":"Chrome/125.0.0.0","session_id":"sess_xyz123"}}'),
 
 
-    ('2025-07-31 11:30:45', 'product_id=789&quantity=2&price=59.99', 
'{"event":"purchase","payment_method":"credit_card"}', 201, 'Order processed 
successfully',
+    ('2025-07-31 11:30:44', 'product_id=789&quantity=2&price=59.99', 
'{"event":"purchase","payment_method":"credit_card"}', 201, 'Order processed 
successfully',
     '192.168.1.101', '/api/v1/orders', '192.168.1.101', 'shop.example.com', 
'{"app":"ecommerce","env":"production","version":"3.2.1"}',
     '{"country":"US","city":"New 
York","coordinates":{"lat":40.7128,"lon":-74.0060}}', 
'{"Content-Type":"application/json","X-CSRF-Token":"csrf_abc123","Accept":"application/json"}',
 '{"server":"shop-node-03","region":"us-east-1"}', 
'https://shop.example.com/product/789', 'Mozilla/5.0 (iPhone; CPU iPhone OS 
16_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.5 
Mobile/15E148 Safari/604.1',
     '{"source":"mobile","tags":["transaction","order"]}', 
'{"timestamp":"2025-07-31T11:30:45Z","level":"INFO","message":"New order 
created","context":{"order_id":"ord_789xyz","amount":119.98,"currency":"USD","customer_id":"cust_123abc"}}'),
@@ -312,4 +312,4 @@ suite("push_down_top_n_through_union") {
     ORDER BY logTimestamp desc
     LIMIT 8;
     """
-}
\ No newline at end of file
+}


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to