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

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


The following commit(s) were added to refs/heads/branch-4.1 by this push:
     new af23c8da954 branch-4.1: [fix](regression) Stabilize variant schema 
change and SNII cases (#70353)
af23c8da954 is described below

commit af23c8da954119f3ec6a9c0f8d18327286e940e7
Author: lihangyu <[email protected]>
AuthorDate: Fri Nov 13 10:07:57 2026 +0800

    branch-4.1: [fix](regression) Stabilize variant schema change and SNII 
cases (#70353)
    
    cherry-pick #70196
    
    Conflicts resolved: dropped var_index_snii.groovy (SNII suite not
    present on branch-4.1); took stabilized expected output for
    test_double_write_when_schema_change.
---
 .../schema_change/test_double_write_when_schema_change.out           | 5 ++---
 .../schema_change/test_double_write_when_schema_change.groovy        | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git 
a/regression-test/data/variant_p0/schema_change/test_double_write_when_schema_change.out
 
b/regression-test/data/variant_p0/schema_change/test_double_write_when_schema_change.out
index 37aba8eb64c..b5ed2fe133c 100644
--- 
a/regression-test/data/variant_p0/schema_change/test_double_write_when_schema_change.out
+++ 
b/regression-test/data/variant_p0/schema_change/test_double_write_when_schema_change.out
@@ -28,7 +28,7 @@ PullRequestEvent      2489395770      2015-01-01T01:00:02Z
 1      
{"actor":{"avatar_url":"https://avatars.githubusercontent.com/u/1310570?","gravatar_id":"","id":1310570,"login":"soumith","url":"https://api.github.com/users/soumith"},"created_at":"2015-01-01T01:00:00Z","id":"2489395767","payload":{"before":"2d06657267b32e0c8e193c617039da200f710195","commits":[{"sha":"dbd68d30ee1f7b60d404553fc1c6226ebb374c8e","author":{"email":"[email protected]","name":"Soumith
 Chintala"},"message":"back to old structure, except lua f [...]
 1      
{"actor":{"avatar_url":"https://avatars.githubusercontent.com/u/6799218?","gravatar_id":"","id":6799218,"login":"gyuho","url":"https://api.github.com/users/gyuho"},"created_at":"2015-01-01T02:00:00Z","id":"2489418154","payload":{"before":"79d9868b8a1afbc5c6c42d33fcc7b97524f888ff","commits":[{"sha":"cf79996e894954b28db73a6bed54ba490c63f174","author":{"email":"[email protected]","name":"Gyu-Ho
 Lee"},"message":"Commit with markdownx at 2014-12-31 17:59:58" [...]
 1      
{"actor":{"avatar_url":"https://avatars.githubusercontent.com/u/4188511?","gravatar_id":"","id":4188511,"login":"iganari","url":"https://api.github.com/users/iganari"},"created_at":"2015-01-01T03:00:01Z","id":"2489436569","payload":{"action":"opened","number":44,"pull_request":{"_links":{"comments":{"href":"https://api.github.com/repos/iganari/mrtg/issues/44/comments"},"commits":{"href":"https://api.github.com/repos/iganari/mrtg/pulls/44/commits"},"html":{"href":"https://github.com/iga
 [...]
-1      
{"actor":{"avatar_url":"https://avatars.githubusercontent.com/u/100067519?","display_login":"savorfamily","gravatar_id":"123","id":100067519,"login":"savorfamily","url":"https://api.github.com/users/savorfamily"},"created_at":"2022-11-07T02:00:00Z","id":"25061216922","payload":{"before":"2bf823a4febcf809da126828ecef7617c8cc48ea","commits":[{"sha":"81106d369f763cb729d9d77610ace252c9db53f0","author":{"email":"[email protected]","name":"Upptime
 Bot"},"message": [...]
+1      
{"actor":{"avatar_url":"https://avatars.githubusercontent.com/u/100067519?","display_login":"savorfamily","gravatar_id":"123","id":100067519,"login":"savorfamily","url":"https://api.github.com/users/savorfamily"},"created_at":"2022-11-07T02:00:00Z","id":"25061216922","payload":{"before":"2bf823a4febcf809da126828ecef7617c8cc48ea","commits":[{"sha":"81106d369f763cb729d9d77610ace252c9db53f0","author":{"email":"[email protected]","name":"Upptime
 Bot"},"message": [...]
 1      
{"actor":{"avatar_url":"https://avatars.githubusercontent.com/u/100067519?","display_login":"savorfamily","gravatar_id":"123","id":100067519,"login":"savorfamily","url":"https://api.github.com/users/savorfamily"},"created_at":"2022-11-07T02:00:00Z","id":"25061216922","payload":{"before":"2bf823a4febcf809da126828ecef7617c8cc48ea","commits":[{"sha":"81106d369f763cb729d9d77610ace252c9db53f0","author":{"email":"[email protected]","name":"Upptime
 Bot"},"message": [...]
 1      
{"actor":{"avatar_url":"https://avatars.githubusercontent.com/u/100067519?","display_login":"savorfamily","gravatar_id":"123","id":100067519,"login":"savorfamily","url":"https://api.github.com/users/savorfamily"},"created_at":"2022-11-07T02:00:00Z","id":"25061216922","payload":{"before":"2bf823a4febcf809da126828ecef7617c8cc48ea","commits":[{"sha":"81106d369f763cb729d9d77610ace252c9db53f0","author":{"email":"[email protected]","name":"Upptime
 Bot"},"message": [...]
 1      
{"actor":{"avatar_url":"https://avatars.githubusercontent.com/u/100067519?","display_login":"savorfamily","gravatar_id":"123","id":100067519,"login":"savorfamily","url":"https://api.github.com/users/savorfamily"},"created_at":"2022-11-07T02:00:00Z","id":"25061216922","payload":{"before":"2bf823a4febcf809da126828ecef7617c8cc48ea","commits":[{"sha":"81106d369f763cb729d9d77610ace252c9db53f0","author":{"email":"[email protected]","name":"Upptime
 Bot"},"message": [...]
@@ -40,7 +40,7 @@ PullRequestEvent      2489395770      2015-01-01T01:00:02Z
 1      
{"actor":{"avatar_url":"https://avatars.githubusercontent.com/u/1310570?","gravatar_id":"","id":1310570,"login":"soumith","url":"https://api.github.com/users/soumith"},"created_at":"2015-01-01T01:00:00Z","id":"2489395767","payload":{"before":"2d06657267b32e0c8e193c617039da200f710195","commits":[{"sha":"dbd68d30ee1f7b60d404553fc1c6226ebb374c8e","author":{"email":"[email protected]","name":"Soumith
 Chintala"},"message":"back to old structure, except lua f [...]
 1      
{"actor":{"avatar_url":"https://avatars.githubusercontent.com/u/6799218?","gravatar_id":"","id":6799218,"login":"gyuho","url":"https://api.github.com/users/gyuho"},"created_at":"2015-01-01T02:00:00Z","id":"2489418154","payload":{"before":"79d9868b8a1afbc5c6c42d33fcc7b97524f888ff","commits":[{"sha":"cf79996e894954b28db73a6bed54ba490c63f174","author":{"email":"[email protected]","name":"Gyu-Ho
 Lee"},"message":"Commit with markdownx at 2014-12-31 17:59:58" [...]
 1      
{"actor":{"avatar_url":"https://avatars.githubusercontent.com/u/4188511?","gravatar_id":"","id":4188511,"login":"iganari","url":"https://api.github.com/users/iganari"},"created_at":"2015-01-01T03:00:01Z","id":"2489436569","payload":{"action":"opened","number":44,"pull_request":{"_links":{"comments":{"href":"https://api.github.com/repos/iganari/mrtg/issues/44/comments"},"commits":{"href":"https://api.github.com/repos/iganari/mrtg/pulls/44/commits"},"html":{"href":"https://github.com/iga
 [...]
-1      
{"actor":{"avatar_url":"https://avatars.githubusercontent.com/u/100067519?","display_login":"savorfamily","gravatar_id":"123","id":100067519,"login":"savorfamily","url":"https://api.github.com/users/savorfamily"},"created_at":"2022-11-07T02:00:00Z","id":"25061216922","payload":{"before":"2bf823a4febcf809da126828ecef7617c8cc48ea","commits":[{"sha":"81106d369f763cb729d9d77610ace252c9db53f0","author":{"email":"[email protected]","name":"Upptime
 Bot"},"message": [...]
+1      
{"actor":{"avatar_url":"https://avatars.githubusercontent.com/u/100067519?","display_login":"savorfamily","gravatar_id":"123","id":100067519,"login":"savorfamily","url":"https://api.github.com/users/savorfamily"},"created_at":"2022-11-07T02:00:00Z","id":"25061216922","payload":{"before":"2bf823a4febcf809da126828ecef7617c8cc48ea","commits":[{"sha":"81106d369f763cb729d9d77610ace252c9db53f0","author":{"email":"[email protected]","name":"Upptime
 Bot"},"message": [...]
 1      
{"actor":{"avatar_url":"https://avatars.githubusercontent.com/u/100067519?","display_login":"savorfamily","gravatar_id":"123","id":100067519,"login":"savorfamily","url":"https://api.github.com/users/savorfamily"},"created_at":"2022-11-07T02:00:00Z","id":"25061216922","payload":{"before":"2bf823a4febcf809da126828ecef7617c8cc48ea","commits":[{"sha":"81106d369f763cb729d9d77610ace252c9db53f0","author":{"email":"[email protected]","name":"Upptime
 Bot"},"message": [...]
 1      
{"actor":{"avatar_url":"https://avatars.githubusercontent.com/u/100067519?","display_login":"savorfamily","gravatar_id":"123","id":100067519,"login":"savorfamily","url":"https://api.github.com/users/savorfamily"},"created_at":"2022-11-07T02:00:00Z","id":"25061216922","payload":{"before":"2bf823a4febcf809da126828ecef7617c8cc48ea","commits":[{"sha":"81106d369f763cb729d9d77610ace252c9db53f0","author":{"email":"[email protected]","name":"Upptime
 Bot"},"message": [...]
 1      
{"actor":{"avatar_url":"https://avatars.githubusercontent.com/u/100067519?","display_login":"savorfamily","gravatar_id":"123","id":100067519,"login":"savorfamily","url":"https://api.github.com/users/savorfamily"},"created_at":"2022-11-07T02:00:00Z","id":"25061216922","payload":{"before":"2bf823a4febcf809da126828ecef7617c8cc48ea","commits":[{"sha":"81106d369f763cb729d9d77610ace252c9db53f0","author":{"email":"[email protected]","name":"Upptime
 Bot"},"message": [...]
@@ -58,4 +58,3 @@ PullRequestEvent      2489395770      2015-01-01T01:00:02Z
 5      
[{"sha":"97a402b54bfd562b8cefd11f1361cd5af41b0535","author":{"email":"[email protected]","name":"Mohit"},"message":"init","distinct":true,"url":"https://api.github.com/repos/git4ruby/movie_review1/commits/97a402b54bfd562b8cefd11f1361cd5af41b0535"}]
 6      
[{"sha":"0fb2391e7aabeb57f358d5d51c70c766e6fa00d1","author":{"email":"[email protected]","name":"Uygun
 
BODUR"},"message":".","distinct":true,"url":"https://api.github.com/repos/uygunuks/AsalSayiKalibi/commits/0fb2391e7aabeb57f358d5d51c70c766e6fa00d1"}]
 6      
[{"sha":"fe5a3431a486388f6011fa8db52fba8a53f9aa70","author":{"email":"[email protected]","name":"Cole
 Campbell"},"message":"Update 
README.md","distinct":false,"url":"https://api.github.com/repos/tlgkccampbell/ultraviolet/commits/fe5a3431a486388f6011fa8db52fba8a53f9aa70"},{"sha":"c71669b93924abc498af58855f8fe86564146673","author":{"email":"[email protected]","name":"Cole
 Campbell"},"message":"Added missing u [...]
-
diff --git 
a/regression-test/suites/variant_p0/schema_change/test_double_write_when_schema_change.groovy
 
b/regression-test/suites/variant_p0/schema_change/test_double_write_when_schema_change.groovy
index a2c1b7f6a7e..e419663afb9 100644
--- 
a/regression-test/suites/variant_p0/schema_change/test_double_write_when_schema_change.groovy
+++ 
b/regression-test/suites/variant_p0/schema_change/test_double_write_when_schema_change.groovy
@@ -123,7 +123,7 @@ suite("double_write_schema_change_with_variant", 
"nonConcurrent") {
         order by k, cast(v['id'] as string), cast(v['payload']['push_id'] as 
bigint), change_column desc limit 10"""
     order_qt_sql """select k, v['payload']['commits'] from github_events
         where length(cast(v['payload']['commits'] as text)) > 100 and k > 1
-        order by k, length(cast(v['payload']['commits'] as text)) limit 10"""
+        order by k, length(cast(v['payload']['commits'] as text)), 
cast(v['payload']['commits'][0]['sha'] as text), cast(v['payload']['commits'] 
as text) limit 10"""
 
     // createMV("create materialized view xxx as select k, sum(k) from 
${table_name} group by k order by k;")
     // qt_sql "select v['type'], v['id'], v['created_at'] from ${table_name} 
where cast(v['id'] as bigint) != 25061216922 order by k,  cast(v['id'] as 
bigint) limit 10"


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

Reply via email to