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

yiguolei 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 6969d59c128 [fix](regression) Stabilize variant schema change and SNII 
cases (#70196)
6969d59c128 is described below

commit 6969d59c128763bbe86f83648df340127245a751
Author: lihangyu <[email protected]>
AuthorDate: Fri Nov 6 11:09:10 2026 +0800

    [fix](regression) Stabilize variant schema change and SNII cases (#70196)
    
    ## What problem does this PR solve?
    
    Two VARIANT regression cases can fail despite correct results:
    
    - The schema-change double-write case compares JSON booleans against
    numeric values in its expected output. The input contains booleans,
    which are preserved before and after schema change. Regenerate the
    expected output and add a tie breaker to the limited query.
    - The SNII range case checks a cumulative filtered-row counter during
    each segment's initialization. When a segment that filters no rows runs
    first, it fails before the segment containing the filtered row is
    processed. Check the completed query profile instead, and write the test
    data in separate rowsets to cover this ordering.
    
    ## Release note
    
    None
    
    ## Check List (For Author)
    
    - Test: ASAN BE and FE build; `double_write_schema_change_with_variant`
    regression (generated expected output and ordinary comparison);
    `regression_test_variant_var_index_snii` regression (five consecutive
    runs). The original schema-change mismatch and a multi-rowset counter
    failure were reproduced before the fixes.
    - Behavior changed: No product behavior change.
    - Does this need documentation: No.
---
 .../test_double_write_when_schema_change.out       | 60 +++++++++++-----------
 .../test_double_write_when_schema_change.groovy    |  2 +-
 .../variant_p0/with_index/var_index_snii.groovy    | 52 ++++++++-----------
 3 files changed, 52 insertions(+), 62 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 1190a5f30bd..e07343e2a42 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
@@ -24,38 +24,38 @@ CreateEvent 2489368089      2015-01-01T00:00:01Z
 PullRequestEvent       2489395770      2015-01-01T01:00:02Z
 
 -- !two_phase_off --
-1      
{"actor":{"avatar_url":"https://avatars.githubusercontent.com/u/9152315?","gravatar_id":"","id":9152315,"login":"davidjhulse","url":"https://api.github.com/users/davidjhulse"},"created_at":"2015-01-01T00:00:00Z","id":"2489368070","payload":{"before":"86ffa724b4d70fce46e760f8cc080f5ec3d7d85f","commits":[{"sha":"a9b22a6d80c1e0bb49c1cf75a3c075b642c28f81","author":{"email":"[email protected]","name":"davidjhulse"},"message":"Altered
 BingBot.jar\\n\\nFixed is [...]
-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": [...]
-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/9152315?","gravatar_id":"","id":9152315,"login":"davidjhulse","url":"https://api.github.com/users/davidjhulse"},"created_at":"2015-01-01T00:00:00Z","id":"2489368070","payload":{"before":"86ffa724b4d70fce46e760f8cc080f5ec3d7d85f","commits":[{"author":{"email":"[email protected]","name":"davidjhulse"},"distinct":true,"message":"Altered
 BingBot.jar\\n\\nFixed issue with multiple account support [...]
+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":[{"author":{"email":"[email protected]","name":"Soumith
 Chintala"},"distinct":true,"message":"back to old structure, except lua files 
moved out","sha":"dbd68d30ee [...]
+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":[{"author":{"email":"[email protected]","name":"Gyu-Ho
 Lee"},"distinct":true,"message":"Commit with markdownx at 2014-12-31 
17:59:58","sha":"cf79996e894954b28db73a6be [...]
+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":[{"author":{"email":"[email protected]","name":"Upptime
 Bot"},"distinct":true,"message":":bento: Update graphs [skip ci]" [...]
+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":[{"author":{"email":"[email protected]","name":"Upptime
 Bot"},"distinct":true,"message":":bento: Update graphs [skip ci]" [...]
+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":[{"author":{"email":"[email protected]","name":"Upptime
 Bot"},"distinct":true,"message":":bento: Update graphs [skip ci]" [...]
+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":[{"author":{"email":"[email protected]","name":"Upptime
 Bot"},"distinct":true,"message":":bento: Update graphs [skip ci]" [...]
+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":[{"author":{"email":"[email protected]","name":"Upptime
 Bot"},"distinct":true,"message":":bento: Update graphs [skip ci]" [...]
+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":[{"author":{"email":"[email protected]","name":"Upptime
 Bot"},"distinct":true,"message":":bento: Update graphs [skip ci]" [...]
 
 -- !two_phase_on --
-1      
{"actor":{"avatar_url":"https://avatars.githubusercontent.com/u/9152315?","gravatar_id":"","id":9152315,"login":"davidjhulse","url":"https://api.github.com/users/davidjhulse"},"created_at":"2015-01-01T00:00:00Z","id":"2489368070","payload":{"before":"86ffa724b4d70fce46e760f8cc080f5ec3d7d85f","commits":[{"sha":"a9b22a6d80c1e0bb49c1cf75a3c075b642c28f81","author":{"email":"[email protected]","name":"davidjhulse"},"message":"Altered
 BingBot.jar\\n\\nFixed is [...]
-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": [...]
-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/9152315?","gravatar_id":"","id":9152315,"login":"davidjhulse","url":"https://api.github.com/users/davidjhulse"},"created_at":"2015-01-01T00:00:00Z","id":"2489368070","payload":{"before":"86ffa724b4d70fce46e760f8cc080f5ec3d7d85f","commits":[{"author":{"email":"[email protected]","name":"davidjhulse"},"distinct":true,"message":"Altered
 BingBot.jar\\n\\nFixed issue with multiple account support [...]
+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":[{"author":{"email":"[email protected]","name":"Soumith
 Chintala"},"distinct":true,"message":"back to old structure, except lua files 
moved out","sha":"dbd68d30ee [...]
+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":[{"author":{"email":"[email protected]","name":"Gyu-Ho
 Lee"},"distinct":true,"message":"Commit with markdownx at 2014-12-31 
17:59:58","sha":"cf79996e894954b28db73a6be [...]
+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":[{"author":{"email":"[email protected]","name":"Upptime
 Bot"},"distinct":true,"message":":bento: Update graphs [skip ci]" [...]
+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":[{"author":{"email":"[email protected]","name":"Upptime
 Bot"},"distinct":true,"message":":bento: Update graphs [skip ci]" [...]
+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":[{"author":{"email":"[email protected]","name":"Upptime
 Bot"},"distinct":true,"message":":bento: Update graphs [skip ci]" [...]
+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":[{"author":{"email":"[email protected]","name":"Upptime
 Bot"},"distinct":true,"message":":bento: Update graphs [skip ci]" [...]
+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":[{"author":{"email":"[email protected]","name":"Upptime
 Bot"},"distinct":true,"message":":bento: Update graphs [skip ci]" [...]
+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":[{"author":{"email":"[email protected]","name":"Upptime
 Bot"},"distinct":true,"message":":bento: Update graphs [skip ci]" [...]
 
 -- !sql --
-2      
[{"sha":"56688cc528224d40679b7e83c105b27367443a8c","author":{"email":"[email protected]","name":"Jamal
 Moon"},"message":"Can be run from outside of bin. Fixed multi-line 
issue","distinct":true,"url":"https://api.github.com/repos/jmoon018/rshell-unit-tester/commits/56688cc528224d40679b7e83c105b27367443a8c"}]
-2      
[{"sha":"defdbe78db98ad69d72f42b09194309f47616592","author":{"email":"[email protected]","name":"Christopher
 Armstrong"},"message":"put the auto-generated API docs in the repository so 
readthedocs will 
work.\\nsigh.","distinct":true,"url":"https://api.github.com/repos/radix/effect/commits/defdbe78db98ad69d72f42b09194309f47616592"}]
-2      
[{"sha":"f38a055078e5e19a19f9e58ac975c7e815d09a24","author":{"email":"[email protected]","name":"Earnestly"},"message":"Change
 the PFM family to monospace from 
serif.","distinct":true,"url":"https://api.github.com/repos/Earnestly/fncp6/commits/f38a055078e5e19a19f9e58ac975c7e815d09a24"}]
-3      
[{"sha":"a9df8f52df7bea62a9ddbd2779a22755aa7d2258","author":{"email":"[email protected]","name":"Kubo
 Takehiro"},"message":"Use SSE4.2 to calculate 
crc32c.","distinct":true,"url":"https://api.github.com/repos/kubo/snzip/commits/a9df8f52df7bea62a9ddbd2779a22755aa7d2258"}]
-4      
[{"sha":"216d05c696eac3fa606289c7f1934f965ffa8f5b","author":{"email":"[email protected]","name":"Oliver
 Gupte"},"message":"updated 
manifests","distinct":true,"url":"https://api.github.com/repos/ogupte/trope/commits/216d05c696eac3fa606289c7f1934f965ffa8f5b"}]
-4      
[{"sha":"4bb12488d56ea651c56d9688996b464b99095582","author":{"email":"[email protected]","name":"Sean
 Owen"},"message":"SPARK-2757 [BUILD] [STREAMING] Add Mima test for Spark Sink 
after 1.10 is released\\n\\nRe-enable MiMa for Streaming Flume Sink module, now 
that 1.1.0 is released, per the JIRA TO-DO. That's pretty much all there is to 
this.\\n\\nAuthor: Sean Owen <[email protected]>\\n\\nCloses #3842 from 
srowen/SPARK-2757 and squashes the followi [...]
-4      
[{"sha":"ec572201658b566373845657a8aca7bc6d6214a4","author":{"email":"[email protected]","name":"Jake
 Wharton"},"message":"Remove unused 
method.","distinct":false,"url":"https://api.github.com/repos/square/okhttp/commits/ec572201658b566373845657a8aca7bc6d6214a4"},{"sha":"bfa25f05bd5786c990fccb513f56375a4f98d95b","author":{"email":"[email protected]","name":"Jesse
 Wilson"},"message":"Merge pull request #1262 from square [...]
-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 [...]
+2      
[{"author":{"email":"[email protected]","name":"Christopher
 Armstrong"},"distinct":true,"message":"put the auto-generated API docs in the 
repository so readthedocs will 
work.\\nsigh.","sha":"defdbe78db98ad69d72f42b09194309f47616592","url":"https://api.github.com/repos/radix/effect/commits/defdbe78db98ad69d72f42b09194309f47616592"}]
+2      
[{"author":{"email":"[email protected]","name":"Jamal
 Moon"},"distinct":true,"message":"Can be run from outside of bin. Fixed 
multi-line 
issue","sha":"56688cc528224d40679b7e83c105b27367443a8c","url":"https://api.github.com/repos/jmoon018/rshell-unit-tester/commits/56688cc528224d40679b7e83c105b27367443a8c"}]
+2      
[{"author":{"email":"[email protected]","name":"Earnestly"},"distinct":true,"message":"Change
 the PFM family to monospace from 
serif.","sha":"f38a055078e5e19a19f9e58ac975c7e815d09a24","url":"https://api.github.com/repos/Earnestly/fncp6/commits/f38a055078e5e19a19f9e58ac975c7e815d09a24"}]
+3      
[{"author":{"email":"[email protected]","name":"Kubo
 Takehiro"},"distinct":true,"message":"Use SSE4.2 to calculate 
crc32c.","sha":"a9df8f52df7bea62a9ddbd2779a22755aa7d2258","url":"https://api.github.com/repos/kubo/snzip/commits/a9df8f52df7bea62a9ddbd2779a22755aa7d2258"}]
+4      
[{"author":{"email":"[email protected]","name":"Sean
 Owen"},"distinct":true,"message":"SPARK-2757 [BUILD] [STREAMING] Add Mima test 
for Spark Sink after 1.10 is released\\n\\nRe-enable MiMa for Streaming Flume 
Sink module, now that 1.1.0 is released, per the JIRA TO-DO. That's pretty much 
all there is to this.\\n\\nAuthor: Sean Owen <[email protected]>\\n\\nCloses 
#3842 from srowen/SPARK-2757 and squashes the following commits:\\n\\n50ff80e 
[Sean Ow [...]
+4      
[{"author":{"email":"[email protected]","name":"Jake
 Wharton"},"distinct":false,"message":"Remove unused 
method.","sha":"ec572201658b566373845657a8aca7bc6d6214a4","url":"https://api.github.com/repos/square/okhttp/commits/ec572201658b566373845657a8aca7bc6d6214a4"},{"author":{"email":"[email protected]","name":"Jesse
 Wilson"},"distinct":false,"message":"Merge pull request #1262 from 
square/jw/unused\\n\\nRemove unused me [...]
+4      
[{"author":{"email":"[email protected]","name":"Oliver
 Gupte"},"distinct":true,"message":"updated 
manifests","sha":"216d05c696eac3fa606289c7f1934f965ffa8f5b","url":"https://api.github.com/repos/ogupte/trope/commits/216d05c696eac3fa606289c7f1934f965ffa8f5b"}]
+5      
[{"author":{"email":"[email protected]","name":"Mohit"},"distinct":true,"message":"init","sha":"97a402b54bfd562b8cefd11f1361cd5af41b0535","url":"https://api.github.com/repos/git4ruby/movie_review1/commits/97a402b54bfd562b8cefd11f1361cd5af41b0535"}]
+6      
[{"author":{"email":"[email protected]","name":"Cole
 Campbell"},"distinct":false,"message":"Update 
README.md","sha":"fe5a3431a486388f6011fa8db52fba8a53f9aa70","url":"https://api.github.com/repos/tlgkccampbell/ultraviolet/commits/fe5a3431a486388f6011fa8db52fba8a53f9aa70"},{"author":{"email":"[email protected]","name":"Cole
 Campbell"},"distinct":false,"message":"Added missing update scripts for sample 
depende [...]
+6      
[{"author":{"email":"[email protected]","name":"Uygun
 
BODUR"},"distinct":true,"message":".","sha":"0fb2391e7aabeb57f358d5d51c70c766e6fa00d1","url":"https://api.github.com/repos/uygunuks/AsalSayiKalibi/commits/0fb2391e7aabeb57f358d5d51c70c766e6fa00d1"}]
 
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 be0f8bce00a..111913626dc 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
@@ -125,7 +125,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'] 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"
diff --git a/regression-test/suites/variant_p0/with_index/var_index_snii.groovy 
b/regression-test/suites/variant_p0/with_index/var_index_snii.groovy
index bcf9933ffdd..06a5152f560 100644
--- a/regression-test/suites/variant_p0/with_index/var_index_snii.groovy
+++ b/regression-test/suites/variant_p0/with_index/var_index_snii.groovy
@@ -15,6 +15,8 @@
 // specific language governing permissions and limitations
 // under the License.
 
+import org.apache.doris.regression.action.ProfileAction
+
 suite("regression_test_variant_var_index_snii", "p0, nonConcurrent"){
     sql """ set default_variant_enable_typed_paths_to_sparse = false """
     sql """ set default_variant_enable_doc_mode = false """
@@ -24,29 +26,10 @@ suite("regression_test_variant_var_index_snii", "p0, 
nonConcurrent"){
     // so the assertions measure index participation rather than how the rows 
happen to be laid out.
     sql """ set inverted_index_skip_threshold = 0 """
 
-    // enable_match_without_inverted_index only gates MATCH_PRED's residual 
row-level fallback
-    // (see match.cpp / olap_scan_operator.cpp); it has no effect on a plain 
`>` predicate, so a
-    // correct qt_*_range result alone does not show the SNII native BKD 
reader served the query
-    // -- it could equally be a full scan reaching the same rows.
-    //
-    // segment_iterator.apply_inverted_index (demands zero residual predicates 
after index
-    // application) is NOT the right instrument here: a cast()-wrapped 
comparison always leaves
-    // the cast expression as a residual, on every storage format, so that 
debug point can never
-    // pass for these queries regardless of whether the index served them. Use
-    // segment_iterator.inverted_index.filtered_rows instead: it fails the 
query unless the
-    // inverted index actually filtered out exactly the expected number of 
rows, which is a direct
-    // measurement of index participation rather than a residual-predicate 
check.
-    def assertRangeFilteredRowCount = { String sqlQuery, int 
expectedFilteredRows ->
-        def checkpoint = "segment_iterator.inverted_index.filtered_rows"
-        try {
-            GetDebugPoint().enableDebugPointForAllBEs(checkpoint, 
[filtered_rows: "${expectedFilteredRows}"])
-            sql "set experimental_enable_parallel_scan = false"
-            sql "sync"
-            sql "${sqlQuery}"
-        } finally {
-            GetDebugPoint().disableDebugPointForAllBEs(checkpoint)
-        }
-    }
+    sql "set enable_profile = true"
+    sql "set profile_level = 2"
+    sql "set enable_condition_cache = false"
+    sql "set enable_sql_cache = false"
 
     // Declared sub-column types: FE validates each path type through
     // CreateTableInfo, and the BE gets subcolumn_indexes already initialized.
@@ -65,22 +48,29 @@ suite("regression_test_variant_var_index_snii", "p0, 
nonConcurrent"){
         properties("replication_num" = "1", "disable_auto_compaction" = "true",
                    "inverted_index_storage_format" = "SNII");
     """
-    // Load in one INSERT so every row lands in the same segment. The 
filtered-row assertions run
-    // once per segment 
(SegmentIterator::_get_row_ranges_by_column_conditions) but compare against
-    // a scan-wide counter, so splitting the rows across single-row segments 
would only reach the
-    // expected total on whichever segment happens to be processed after the 
filtering one.
+    // Separate writes exercise the index check across multiple rowsets.
     sql """insert into ${typed_table} values
                (1, 'alpha plain', parse_to_variant('{"a" : 123, "b" : 
"xxxyyy", "c" : 111999111}')),
-               (2, 'beta plain', parse_to_variant('{"a" : 18811, "b" : "hello 
world", "c" : 1181111}')),
+               (2, 'beta plain', parse_to_variant('{"a" : 18811, "b" : "hello 
world", "c" : 1181111}'))"""
+    sql """insert into ${typed_table} values
                (3, 'alpha other', parse_to_variant('{"a" : 18811, "b" : "hello 
wworld", "c" : 11111}')),
                (4, 'gamma plain', parse_to_variant('{"a" : 1234, "b" : "hello 
xxx world", "c" : 8181111}'))"""
 
     sql """set enable_match_without_inverted_index = false"""
     qt_typed_match """select k from ${typed_table} where cast(v["b"] as 
string) match 'hello' order by k"""
     qt_typed_range """select k from ${typed_table} where cast(v["a"] as int) > 
1000 order by k"""
-    // typed_table has 4 rows with a = 123, 18811, 18811, 1234; `> 1000` 
filters out exactly the
-    // a=123 row (k=1), so the index must report filtered_rows: 1.
-    assertRangeFilteredRowCount("select k from ${typed_table} where 
cast(v[\"a\"] as int) > 1000 order by k", 1)
+    // Check the completed query profile, since the debug point runs once per 
segment
+    // and its cumulative counter may not yet include all rowsets.
+    def profileToken = "snii_typed_range_" + UUID.randomUUID().toString()
+    sql """select /* ${profileToken} */ k from ${typed_table}
+           where cast(v["a"] as int) > 1000 order by k"""
+    def profile = new ProfileAction(context).getProfileBySql(profileToken, 
["RowsInvertedIndexFiltered"])
+    def matches = (profile =~ /RowsInvertedIndexFiltered:\s*([0-9,]+)/)
+    long filteredRows = 0
+    while (matches.find()) {
+        filteredRows += Long.parseLong(matches.group(1).replace(",", ""))
+    }
+    assertTrue(filteredRows > 0, "Expected inverted index to filter rows, 
profile: ${profile}")
     qt_typed_both """select k from ${typed_table} where cast(v["a"] as int) > 
123 and cast(v["b"] as string) match 'hello' and cast(v["c"] as int) > 1024 
order by k"""
     // A plain column and a variant column carry SNII indexes in one table: 
the plain one is
     // keyed by its own index id, the variant sub-columns by suffix path under 
theirs.


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

Reply via email to