Skip to content

manual pick #62141 into branch 4.1 to keep consistency with used test framework - #63682

Closed
iaorekhov-1980 wants to merge 1878 commits into
apache:masterfrom
iaorekhov-1980:manual-pick-62141-branch-4.1
Closed

manual pick #62141 into branch 4.1 to keep consistency with used test framework#63682
iaorekhov-1980 wants to merge 1878 commits into
apache:masterfrom
iaorekhov-1980:manual-pick-62141-branch-4.1

Conversation

@iaorekhov-1980

@iaorekhov-1980iaorekhov-1980 commented May 26, 2026•
edited
Loading

Copy link
Copy Markdown
Contributor

What problem does this PR solve?

Issue Number: close#62140

Related PR: #62141, #63038

Problem Summary:

#62141 can't be automatically merged into branch-4.1 as it depends on new test framework.
so I've executed manual merge with previous test framework to keep compatibility

Release note

None

Check List (For Author)

  • Test

    • Regression test
    • Unit Test
    • Manual test (add detailed scripts or steps below)
    • No need to test or manual test. Explain why:
      • This is a refactor/code format and no logic has been changed.
      • Previous test can cover this change.
      • No code files have been changed.
      • Other reason

  • Behavior changed:

    • No.
    • Yes.

  • Does this need documentation?

    • No.
    • Yes.

Check List (For Reviewer who merge this PR)

  • Confirm the release note
  • Confirm test cases
  • Confirm document
  • Add branch pick label

github-actionsBotand others added 30 commits April 13, 2026 17:06
@github-actions@feiniaofeiafei
branch-4.1: [fix](fe) Fix no_use_cbo_rule hint being silently ignored…
1e8d85f
… in EliminateLogicalSelectHint apache#62358 (apache#62425)
Cherry-picked from apache#62358
Co-authored-by: feiniaofeiafei <moailing@selectdb.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@github-actions@jacktengg
branch-4.1: [fix](regression) fix p2 opensky failureapache#62447(ap…
bbf5022
…ache#62450)
Cherry-picked from apache#62447
Co-authored-by: TengJianPing <tengjianping@selectdb.com>
@hubgeter
branch-4.1:[fix](case)fix maxcompute p2 case. (apache#62421)
f90f0de
### What problem does this PR solve?
Problem Summary:
just fix case.
### Release note
None
### Check List (For Author)
- Test <!-- At least one of them must be included. -->
- [ ] Regression test
- [ ] Unit Test
- [ ] Manual test (add detailed scripts or steps below)
- [ ] No need to test or manual test. Explain why:
- [ ] This is a refactor/code format and no logic has been changed.
- [ ] Previous test can cover this change.
- [ ] No code files have been changed.
- [ ] Other reason <!-- Add your reason? -->
- Behavior changed:
- [ ] No.
- [ ] Yes. <!-- Explain the behavior change -->
- Does this need documentation?
- [ ] No.
- [ ] Yes. <!-- Add document PR link here. eg:
apache/doris-website#1214 -->
### Check List (For Reviewer who merge this PR)
- [ ] Confirm the release note
- [ ] Confirm test cases
- [ ] Confirm document
- [ ] Add branch pick label <!-- Add branch pick label that this PR
should merge into -->
@CalvinKirs
[test](regression) Enable standard URI parsing for OSS bucket-endpoin… (
6820b0e
apache#62397)
apache#62429
@github-actions@JNSimba
branch-4.1: [Improve](job) update flink cdc version for streaming joba…
48bfd04
…pache#62212 (apache#62430)
Cherry-picked from apache#62212
Co-authored-by: wudi <wudi@selectdb.com>
@github-actions@JNSimba
branch-4.1: [fix](streaming-job) fix streaming job properties not par…
ece0572
…sed after FE restart apache#62298 (apache#62432)
Cherry-picked from apache#62298
Co-authored-by: wudi <wudi@selectdb.com>
@github-actions@CalvinKirs
branch-4.1: [test](regression) Enable standard URI parsing for OSS bu…
7cf7115
…cket-endpoin… apache#62429 (apache#62436)
Cherry-picked from apache#62429
Co-authored-by: Calvin Kirs <guoqiang@selectdb.com>
@suxiaogang223
[fix](regression) disable unstable case test_hudi_rewrite_mtmv (apach…
ec18865
…e#62445)
### What problem does this PR solve?
Issue Number: close #xxx
Related PR: #xxx
Problem Summary:
### Release note
None
### Check List (For Author)
- Test <!-- At least one of them must be included. -->
- [ ] Regression test
- [ ] Unit Test
- [ ] Manual test (add detailed scripts or steps below)
- [ ] No need to test or manual test. Explain why:
- [ ] This is a refactor/code format and no logic has been changed.
- [ ] Previous test can cover this change.
- [ ] No code files have been changed.
- [ ] Other reason <!-- Add your reason? -->
- Behavior changed:
- [ ] No.
- [ ] Yes. <!-- Explain the behavior change -->
- Does this need documentation?
- [ ] No.
- [ ] Yes. <!-- Add document PR link here. eg:
apache/doris-website#1214 -->
### Check List (For Reviewer who merge this PR)
- [ ] Confirm the release note
- [ ] Confirm test cases
- [ ] Confirm document
- [ ] Add branch pick label <!-- Add branch pick label that this PR
should merge into -->
@github-actions@csun5285
branch-4.1: [chore](compaction) change time series threshold from 200…
d079be2
…0 to 1000 apache#61979 (apache#62444)
Cherry-picked from apache#61979
Co-authored-by: Chenyang Sun <sunchenyang@selectdb.com>
@github-actions@CalvinKirs
branch-4.1: [chore](dep)upgrade vulnerable dependenciesapache#61893(a…
f1f4850
…pache#62473)
Cherry-picked from apache#61893
Co-authored-by: Calvin Kirs <guoqiang@selectdb.com>
@github-actions@liaoxin01
branch-4.1: [improvement](be) Limit packed file writes to rowset firs…
a19ec32
…t segment apache#62342 (apache#62508)
Cherry-picked from apache#62342
Co-authored-by: Xin Liao <liaoxin@selectdb.com>
@github-actions@LuGuangming
branch-4.1: [fix](Reliability)Fix Doris query service fails after the…
bb97072
… file handles on the BE node are used up apache#62393 (apache#62540)
Cherry-picked from apache#62393
Co-authored-by: Guangming Lu <71873108+LuGuangming@users.noreply.github.com>
@yiguolei
[refactor](fragment mgr) move report logic to pipeline fragment conte…
8de7a90
…xt to remove callback parameter from ctor (apache#62500) (apache#62549)
@github-actions@JNSimba
branch-4.1: [fix](streaming-job) Fix NPE in StreamingInsertJob.replay…
19bba18
…OnCommitted during EditLog replay apache#62416 (apache#62516)
Cherry-picked from apache#62416
Co-authored-by: wudi <wudi@selectdb.com>
@github-actions@gavinchou
branch-4.1: [fix](regression) Fix typo in different_serialize test da…
b8167c7
…ta directory introduced by apache#59489apache#62480 (apache#62543)
Cherry-picked from apache#62480
Co-authored-by: Gavin Chou <gavin@selectdb.com>
@github-actions@Gabriel39
branch-4.1: [fix](column) Fix incorrect for-loopapache#62517(apache…
26e0115
…#62568)
Cherry-picked from apache#62517
Co-authored-by: Gabriel <liwenqiang@selectdb.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@github-actions@sollhui
branch-4.1: [fix](insert) fix INSERT job statistics lost in show load…
925840d
… after FE restart apache#62331 (apache#62546)
Cherry-picked from apache#62331
Co-authored-by: hui lai <laihui@selectdb.com>
@gavinchouSivarajan Narayanan
[fix](web) FE startup fail due to websocket startup (apache#62560)
ee12830
## Summary
Pick apache#60369 to branch-4.1
## Changes
- Fix FE startup failure when enable_https=true by using Spring Boot's
addServerCustomizers() hook to initialize WebSocket support before
WebAppContext starts
- Compatible with branch-4.1's existing HTTP header size configuration
## Test
- [x] FE build passed
## Related Issue
closeapache#60366
Co-authored-by: Sivarajan Narayanan <narayanan_sivarajan@apple.com>
@github-actions@RoanHeNaN
branch-4.1: [improvement](be) Add stampede protection for AnnIndexIVF…
e77064f
…ListCache apache#62442 (apache#62567)
Cherry-picked from apache#62442
Co-authored-by: zhiqiang <seuhezhiqiang@163.com>
@github-actions@zclllyybb
branch-4.1: [fix](errmsg) Fix wrong error message of insert overwritea…
2b233a4
…pache#62555 (apache#62564)
Cherry-picked from apache#62555
Co-authored-by: zclllyybb <zhaochangle@selectdb.com>
@gavinchougavinchou
branch-4.1: (tools) Add show_segment_data operation to meta_tool (apa…
3105e9d
…che#62385)
## Summary
Pick apache#60608 to branch-4.1
Add new operation show_segment_data to meta_tool for reading and
displaying segment file column metadata and statistics.
## Changes
- Add get_field_type_string() to convert FieldType to readable string
- Add get_encoding_string() to convert EncodingTypePB to readable string
- Add get_compression_string() to convert CompressionTypePB to readable
string
- Add print_column_meta() to print column metadata recursively
- Add show_segment_data() to display segment file info and statistics
- Add common/cpp/private_member_accessor.hpp helper for accessing
private members
## Test
- [x] Compilation passed (BE meta_tool target)
## Related Issue
closeapache#60608
---------
Co-authored-by: gavinchou <gavinchou@apache.org>
@github-actions@englefly
branch-4.1: [fix](fe) Fix view columns losing colUniqueId in lazy mat…
5dbba7a
…erialization apache#62533 (apache#62573)
Cherry-picked from apache#62533
Co-authored-by: minghong <zhouminghong@selectdb.com>
@github-actions@Yukang-Lian
branch-4.1: [fix](rpc) fix GenericPool reopen blocking 18min on stale…
d6196d9
… TLS connections apache#61951 (apache#62574)
Cherry-picked from apache#61951
Co-authored-by: Jimmy <lianyukang@selectdb.com>
@github-actions@liaoxin01
branch-4.1: [fix](be) Validate stream load content length before grou…
9769856
…p commit apache#62110 (apache#62592)
Cherry-picked from apache#62110
Co-authored-by: Xin Liao <liaoxin@selectdb.com>
@github-actions@liaoxin01
branch-4.1: [fix](fe) Mask sensitive headers in stream load logsapac…
f10368e
…he#62108 (apache#62594)
Cherry-picked from apache#62108
Co-authored-by: Xin Liao <liaoxin@selectdb.com>
@w41ter
branch-4.1: [fix](fe) Fix FE startup argument forwardingapache#62587(…
057c2d4
…apache#62612)
This picks apache#62587 to branch-4.1.
@w41ter
branch-4.1: [fix](fe) Support IAM role auth in S3 filesystem (apache#…
07e4b90
…62622)
Cherry-pick apache#62584
the S3 filesystem accepts AWS_ROLE_ARN-based configuration and can build
STS assume-role credentials.
@github-actions@wyxxxcat
branch-4.1: [opt](test) Support IAM Role for s3 client ut testapache…
99c8b38
…#62303 (apache#62618)
Cherry-picked from apache#62303
Co-authored-by: Yixuan Wang <wangyixuan@selectdb.com>
@github-actions@csun5285
branch-4.1: [fix](variant) normalize legacy single-part dot-key subco…
e892dc5
…lumn paths on read apache#62409 (apache#62630)
Cherry-picked from apache#62409
Co-authored-by: Chenyang Sun <sunchenyang@selectdb.com>
@dataroaring@claude
branch-4.1: [feature](scan) Add value predicate pushdown control for …
84676d4
…MOR tables apache#60513 (apache#62451)
pick apache#60513
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
github-actionsBotand others added 16 commits May 22, 2026 21:56
@github-actions@mrhhsg
branch-4.1: [fix](be) Compare JSON numeric values by valueapache#63396…
8a67e76
… (apache#63488)
Cherry-picked from apache#63396
Co-authored-by: Jerry Hu <hushenggang@selectdb.com>
@github-actions@JNSimba
branch-4.1: [fix](streaming-job) keep isCanceled set when cancel runs…
0b016f9
… on terminal task apache#63427 (apache#63502)
Cherry-picked from apache#63427
Co-authored-by: wudi <wudi@selectdb.com>
@github-actions@JNSimba
branch-4.1: [fix](streaming-job) Avoid NPE on cross-table DML during …
f4d6208
…snapshot chunk read apache#63435 (apache#63503)
Cherry-picked from apache#63435
Co-authored-by: wudi <wudi@selectdb.com>
@github-actions@BiteTheDDDDt
branch-4.1: [Chore](be) Stop spill hash join repartition on cancelap…
e191478
…ache#63456 (apache#63532)
Cherry-picked from apache#63456
Co-authored-by: Pxl <xl@selectdb.com>
@github-actions@sollhui
branch-4.1: [fix](job) fix NPE in routine load Kafka meta requestapa…
8616265
…che#63180 (apache#63511)
Cherry-picked from apache#63180
Co-authored-by: hui lai <laihui@selectdb.com>
@mrhhsg
[fix](scan) Respect byte budget when merging scan blocks (apache#63296)
880e9e0
## Summary
Fix scanner scheduler block merging so the adaptive batch size byte
budget is respected when multiple scanned blocks are stitched into a
cached block.
## Root Cause
The scheduler merge path only checked the row count against
`batch_size()`. When adaptive batch size produced multiple blocks that
were individually acceptable, the scheduler could still merge them into
a much larger block because it ignored `preferred_block_size_bytes()`.
## Changes
- Capture `preferred_block_size_bytes()` for the scan task.
- Merge into the last cached block only when both the row budget and
byte budget are satisfied.
- Keep empty-block merge behavior unchanged so eos/filtered-empty blocks
are not emitted separately.
- Preserve `allocated_bytes()` for memory accounting while using
`bytes()` for the adaptive data-size budget.
## Validation
- `git diff --check -- be/src/exec/scan/scanner_scheduler.cpp`
- `ninja -C be/ut_build_ASAN
src/exec/CMakeFiles/Exec.dir/scan/scanner_scheduler.cpp.o`
Note: `./run-be-ut.sh --run --filter=ScannerContextTest.*` was started
earlier but stopped after it triggered a broad ASAN UT build; the
changed object had already compiled successfully.
@mymeiyi
branch-4.1: [fix](fe) add --drop_backends param to start_fe.sh (apach…
a501a6c
…e#63306) (apache#63515)
pick apache#63306
@englefly
branch-4.1 [fix](fe) Fix simple aggregate cache after partition recyc…
722d5a6
…le (apache#63530)
### What problem does this PR solve?
pick apache#63175
Issue Number: close #xxx
Related PR: #xxx
Problem Summary:
### Release note
None
### Check List (For Author)
- Test <!-- At least one of them must be included. -->
- [ ] Regression test
- [ ] Unit Test
- [ ] Manual test (add detailed scripts or steps below)
- [ ] No need to test or manual test. Explain why:
- [ ] This is a refactor/code format and no logic has been changed.
- [ ] Previous test can cover this change.
- [ ] No code files have been changed.
- [ ] Other reason <!-- Add your reason? -->
- Behavior changed:
- [ ] No.
- [ ] Yes. <!-- Explain the behavior change -->
- Does this need documentation?
- [ ] No.
- [ ] Yes. <!-- Add document PR link here. eg:
apache/doris-website#1214 -->
### Check List (For Reviewer who merge this PR)
- [ ] Confirm the release note
- [ ] Confirm test cases
- [ ] Confirm document
- [ ] Add branch pick label <!-- Add branch pick label that this PR
should merge into -->
@github-actions@yx-keith
@morningman@claude
branch-4.1: [fix](fe) avoid concurrent tablet stat iteration failuresa…
69b523d
…pache#63298 (apache#63560)
Cherry-picked from apache#63298
Co-authored-by: yaoxiao <yx136264032@163.com>
Co-authored-by: morningman <yunyou@selectdb.com>
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
@github-actions@wyxxxcat
branch-4.1: [feat](txn) Add txn write amplification brpc metrics for …
2154c9c
…sub txn load apache#63545 (apache#63590)
Cherry-picked from apache#63545
Co-authored-by: Yixuan Wang <wangyixuan@selectdb.com>
@feiniaofeiafei
branch-4.1:[fix](fe) Fix redundant aggregation in agg-union query plan…
93af55d
…apache#62231 (apache#63577)
picked from apache#62231
@github-actions@CalvinKirs
branch-4.1: [fix](auth)Fix arrow flight client ip authapache#63506(a…
b672f27
…pache#63592)
Cherry-picked from apache#63506
Co-authored-by: Calvin Kirs <guoqiang@selectdb.com>
@github-actions@morningman@claude
branch-4.1: [fix](workload) enforce explicit compute group form for w…
a8bbe79
…orkload DDLs apache#63505 (apache#63596)
Cherry-picked from apache#63505
Co-authored-by: Mingyu Chen (Rayner) <yunyou@selectdb.com>
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
@github-actions@liaoxin01
branch-4.1: [fix](filecache) clean empty v3 cache dirsapache#63344(a…
da6ff4d
…pache#63616)
Cherry-picked from apache#63344
Co-authored-by: Xin Liao <liaoxin@selectdb.com>
@github-actions@sollhui
branch-4.1: [fix](test) stabilize internal copy recycler caseapache#…
f530fcb
…63340 (apache#63601)
Cherry-picked from apache#63340
Co-authored-by: hui lai <laihui@selectdb.com>
@iaorekhov-1980
[enhance](nereids) improve masking of user's password for ALTER USER …
50748fa
…and CREATE USER commands in audit logs (apache#62141)
### What problem does this PR solve?
This PR adds masking for users passwords for **CREATE USER** and **ALTER
USER** commands.
The masked values will be stored in audit table and audit files instead
of actual values.
The same functionality already exists for **SET USER PASSWORD** and
**SET LDAP_ADMIN_PASSWORD** commands, so we other commands related to
passwords should be masked as well.
**Could you please include this PR into 4.x branches, please!**
Issue Number: closeapache#62140
(cherry picked from commit 8209b79)
@hello-stephen

hello-stephen commented May 26, 2026

Copy link
Copy Markdown
Contributor

Thank you for your contribution to Apache Doris.
Don't know what should be done next? See How to process your PR.

Please clearly describe your PR:

  1. What problem was fixed (it's best to include specific error reporting information). How it was fixed.
  2. Which behaviors were modified. What was the previous behavior, what is it now, why was it modified, and what possible impacts might there be.
  3. What features were added. Why was this function added?
  4. Which code was refactored and why was this part of the code refactored?
  5. Which functions were optimized and what is the difference before and after the optimization?

@iaorekhov-1980

iaorekhov-1980 commented May 26, 2026

Copy link
Copy Markdown
ContributorAuthor

this was definetely mistake :(
wrong branch was selected

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@gavinchougavinchouAwaiting requested review from gavinchougavinchou is a code owner
@liaoxin01liaoxin01Awaiting requested review from liaoxin01liaoxin01 is a code owner
@deardengdeardengAwaiting requested review from deardengdeardeng is a code owner
@luwei16luwei16Awaiting requested review from luwei16luwei16 is a code owner
@yiguoleiyiguoleiAwaiting requested review from yiguoleiyiguolei is a code owner
@morningmanmorningmanAwaiting requested review from morningmanmorningman is a code owner
@Gabriel39Gabriel39Awaiting requested review from Gabriel39Gabriel39 is a code owner
@airborne12airborne12Awaiting requested review from airborne12airborne12 is a code owner
@eldenmooneldenmoonAwaiting requested review from eldenmooneldenmoon is a code owner
@zclllyybbzclllyybbAwaiting requested review from zclllyybb
@BiteTheDDDDtBiteTheDDDDtAwaiting requested review from BiteTheDDDDt

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[Enhancement] (nereids) improve masking of users' password for ALTER USER and CREATE USER in audit logs

20 participants

@iaorekhov-1980@hello-stephen@hubgeter@CalvinKirs@suxiaogang223@yiguolei@gavinchou@w41ter@dataroaring@BiteTheDDDDt@csun5285@zgxme@shuke987@Yukang-Lian@JNSimba@xylaaaaa@deardeng@HonestManXin@freemandealer@morningman