manual pick #62141 into branch 4.1 to keep consistency with used test framework#63682
Closed
iaorekhov-1980 wants to merge 1878 commits into
Closed
manual pick #62141 into branch 4.1 to keep consistency with used test framework#63682iaorekhov-1980 wants to merge 1878 commits into
iaorekhov-1980 wants to merge 1878 commits into
Conversation
… 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>
…ache#62450) Cherry-picked from apache#62447 Co-authored-by: TengJianPing <tengjianping@selectdb.com>
### 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 -->
…pache#62212 (apache#62430) Cherry-picked from apache#62212 Co-authored-by: wudi <wudi@selectdb.com>
…sed after FE restart apache#62298 (apache#62432) Cherry-picked from apache#62298 Co-authored-by: wudi <wudi@selectdb.com>
…cket-endpoin… apache#62429 (apache#62436) Cherry-picked from apache#62429 Co-authored-by: Calvin Kirs <guoqiang@selectdb.com>
…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 -->
…0 to 1000 apache#61979 (apache#62444) Cherry-picked from apache#61979 Co-authored-by: Chenyang Sun <sunchenyang@selectdb.com>
…pache#62473) Cherry-picked from apache#61893 Co-authored-by: Calvin Kirs <guoqiang@selectdb.com>
…t segment apache#62342 (apache#62508) Cherry-picked from apache#62342 Co-authored-by: Xin Liao <liaoxin@selectdb.com>
… 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>
…xt to remove callback parameter from ctor (apache#62500) (apache#62549)
…OnCommitted during EditLog replay apache#62416 (apache#62516) Cherry-picked from apache#62416 Co-authored-by: wudi <wudi@selectdb.com>
…ta directory introduced by apache#59489 apache#62480 (apache#62543) Cherry-picked from apache#62480 Co-authored-by: Gavin Chou <gavin@selectdb.com>
…#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>
… after FE restart apache#62331 (apache#62546) Cherry-picked from apache#62331 Co-authored-by: hui lai <laihui@selectdb.com>
## 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 close apache#60366 Co-authored-by: Sivarajan Narayanan <narayanan_sivarajan@apple.com>
…ListCache apache#62442 (apache#62567) Cherry-picked from apache#62442 Co-authored-by: zhiqiang <seuhezhiqiang@163.com>
…pache#62555 (apache#62564) Cherry-picked from apache#62555 Co-authored-by: zclllyybb <zhaochangle@selectdb.com>
…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 close apache#60608 --------- Co-authored-by: gavinchou <gavinchou@apache.org>
…erialization apache#62533 (apache#62573) Cherry-picked from apache#62533 Co-authored-by: minghong <zhouminghong@selectdb.com>
… TLS connections apache#61951 (apache#62574) Cherry-picked from apache#61951 Co-authored-by: Jimmy <lianyukang@selectdb.com>
…p commit apache#62110 (apache#62592) Cherry-picked from apache#62110 Co-authored-by: Xin Liao <liaoxin@selectdb.com>
…he#62108 (apache#62594) Cherry-picked from apache#62108 Co-authored-by: Xin Liao <liaoxin@selectdb.com>
…apache#62612) This picks apache#62587 to branch-4.1.
…62622) Cherry-pick apache#62584 the S3 filesystem accepts AWS_ROLE_ARN-based configuration and can build STS assume-role credentials.
…#62303 (apache#62618) Cherry-picked from apache#62303 Co-authored-by: Yixuan Wang <wangyixuan@selectdb.com>
…lumn paths on read apache#62409 (apache#62630) Cherry-picked from apache#62409 Co-authored-by: Chenyang Sun <sunchenyang@selectdb.com>
…MOR tables apache#60513 (apache#62451) pick apache#60513 Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
… (apache#63488) Cherry-picked from apache#63396 Co-authored-by: Jerry Hu <hushenggang@selectdb.com>
… on terminal task apache#63427 (apache#63502) Cherry-picked from apache#63427 Co-authored-by: wudi <wudi@selectdb.com>
…snapshot chunk read apache#63435 (apache#63503) Cherry-picked from apache#63435 Co-authored-by: wudi <wudi@selectdb.com>
…ache#63456 (apache#63532) Cherry-picked from apache#63456 Co-authored-by: Pxl <xl@selectdb.com>
…che#63180 (apache#63511) Cherry-picked from apache#63180 Co-authored-by: hui lai <laihui@selectdb.com>
## 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.
…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 -->
…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>
…sub txn load apache#63545 (apache#63590) Cherry-picked from apache#63545 Co-authored-by: Yixuan Wang <wangyixuan@selectdb.com>
…pache#63592) Cherry-picked from apache#63506 Co-authored-by: Calvin Kirs <guoqiang@selectdb.com>
…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>
…pache#63616) Cherry-picked from apache#63344 Co-authored-by: Xin Liao <liaoxin@selectdb.com>
…63340 (apache#63601) Cherry-picked from apache#63340 Co-authored-by: hui lai <laihui@selectdb.com>
…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: close apache#62140 (cherry picked from commit 8209b79)
iaorekhov-1980
requested review from
BiteTheDDDDt,
Gabriel39,
airborne12,
deardeng,
eldenmoon,
gavinchou,
liaoxin01,
luwei16,
morningman,
yiguolei and
zclllyybb
as code owners
Contributor
|
Thank you for your contribution to Apache Doris. Please clearly describe your PR:
|
Contributor
Author
|
this was definetely mistake :( |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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
Behavior changed:
Does this need documentation?
Check List (For Reviewer who merge this PR)