Skip to content

[fix](broker-load) Fix the COLUMNS FROM PATH feature #57309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[fix](broker-load) Fix the COLUMNS FROM PATH feature #57309

wants to merge 2 commits into from
+223 −8

Conversation

@0AyanamiRei
Copy link
Contributor

@0AyanamiRei 0AyanamiRei commented Oct 24, 2025 •
edited
Loading

What problem does this PR solve?

Issue Number: close #xxx

Related PR: ##53399

Problem Summary:

if (partition_name_to_key_index_map.find(it->second->col_name()) !=
    partition_name_to_key_index_map.end()) {
    if (slot_info.is_file_slot) {
        // If there is slot which is both a partition column and a file column,
        // we should not fill the partition column from path.
        _fill_partition_from_path = false;
    } else if (!_fill_partition_from_path) {
        // This should not happen
        return Status::InternalError(
                "Partition column {} is not a file column, but there is already a column "
                "which is both a partition column and a file column.",
                it->second->col_name());
    }
    _partition_slot_descs.emplace_back(it->second);

cuz we do not pass the columnsFromPathKeys to BE, so the added check partition_name_to_key_index_map in pr53399 will cuz the COLUMNS FROM PATH to be NULL

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

@Thearas
Copy link
Contributor

Thearas commented Oct 24, 2025

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?

@0AyanamiRei 0AyanamiRei mentioned this pull request Oct 24, 2025
Closed
16 tasks
@0AyanamiRei
Copy link
Contributor Author

run buildall

@doris-robot
Copy link

ClickBench: Total hot run time: 28.02 s 
machine: 'aliyun_ecs.c7a.8xlarge_32C64G'
scripts: https://github.com/apache/doris/tree/master/tools/clickbench-tools
ClickBench test result on commit b1e5ae671fcaf5b12a9eada092c59e9721dd9f01, data reload: false

query1	0.05	0.05	0.05
query2	0.10	0.05	0.06
query3	0.26	0.08	0.09
query4	1.61	0.12	0.12
query5	0.28	0.26	0.27
query6	1.18	0.68	0.68
query7	0.04	0.03	0.03
query8	0.06	0.04	0.04
query9	0.62	0.54	0.54
query10	0.58	0.58	0.59
query11	0.18	0.12	0.12
query12	0.16	0.14	0.13
query13	0.65	0.62	0.59
query14	1.03	1.04	1.01
query15	0.88	0.85	0.89
query16	0.41	0.41	0.40
query17	1.06	1.06	1.05
query18	0.22	0.20	0.20
query19	1.94	1.87	1.89
query20	0.01	0.01	0.01
query21	15.43	0.18	0.13
query22	5.09	0.08	0.05
query23	15.66	0.28	0.11
query24	2.74	0.61	0.33
query25	0.08	0.07	0.06
query26	0.17	0.15	0.14
query27	0.09	0.07	0.05
query28	3.85	1.16	0.95
query29	12.71	4.08	3.42
query30	0.29	0.14	0.13
query31	2.84	0.60	0.40
query32	3.24	0.58	0.47
query33	3.10	3.14	3.17
query34	15.74	5.22	4.52
query35	4.62	4.56	4.60
query36	0.70	0.55	0.51
query37	0.12	0.07	0.07
query38	0.07	0.05	0.04
query39	0.04	0.03	0.03
query40	0.19	0.14	0.15
query41	0.09	0.04	0.04
query42	0.05	0.04	0.03
query43	0.05	0.04	0.04
Total cold run time: 98.28 s
Total hot run time: 28.02 s

@hello-stephen
Copy link
Contributor

FE UT Coverage Report

Increment line coverage 0.00% (0/10) 🎉
Increment coverage report
Complete coverage report

@hello-stephen
Copy link
Contributor

FE Regression Coverage Report

Increment line coverage 50.00% (5/10) 🎉
Increment coverage report
Complete coverage report

@0AyanamiRei
Copy link
Contributor Author

run buildall

@doris-robot
Copy link

ClickBench: Total hot run time: 28.32 s 
machine: 'aliyun_ecs.c7a.8xlarge_32C64G'
scripts: https://github.com/apache/doris/tree/master/tools/clickbench-tools
ClickBench test result on commit b1e5ae671fcaf5b12a9eada092c59e9721dd9f01, data reload: false

query1	0.06	0.05	0.06
query2	0.10	0.06	0.06
query3	0.26	0.09	0.09
query4	1.61	0.12	0.12
query5	0.29	0.27	0.27
query6	1.16	0.68	0.66
query7	0.04	0.02	0.03
query8	0.06	0.05	0.06
query9	0.63	0.54	0.52
query10	0.60	0.60	0.59
query11	0.17	0.11	0.12
query12	0.16	0.13	0.14
query13	0.63	0.61	0.60
query14	1.03	1.05	1.01
query15	0.87	0.84	0.90
query16	0.39	0.40	0.39
query17	1.08	1.06	1.08
query18	0.23	0.21	0.21
query19	1.94	1.86	1.86
query20	0.02	0.02	0.02
query21	15.42	0.17	0.13
query22	5.15	0.08	0.05
query23	15.64	0.28	0.10
query24	2.90	1.28	0.66
query25	0.08	0.07	0.06
query26	0.16	0.14	0.14
query27	0.07	0.06	0.06
query28	5.01	1.18	0.93
query29	12.62	4.11	3.36
query30	0.29	0.14	0.12
query31	2.82	0.60	0.39
query32	3.25	0.57	0.48
query33	3.08	3.12	3.09
query34	15.89	5.23	4.59
query35	4.59	4.58	4.60
query36	0.70	0.51	0.51
query37	0.11	0.07	0.07
query38	0.07	0.05	0.04
query39	0.04	0.04	0.03
query40	0.19	0.16	0.16
query41	0.09	0.04	0.04
query42	0.05	0.04	0.03
query43	0.05	0.04	0.04
Total cold run time: 99.6 s
Total hot run time: 28.32 s

@hello-stephen
Copy link
Contributor

FE Regression Coverage Report

Increment line coverage 50.00% (5/10) 🎉
Increment coverage report
Complete coverage report

@0AyanamiRei
Copy link
Contributor Author

run buildall

@doris-robot
Copy link

ClickBench: Total hot run time: 28.09 s 
machine: 'aliyun_ecs.c7a.8xlarge_32C64G'
scripts: https://github.com/apache/doris/tree/master/tools/clickbench-tools
ClickBench test result on commit 6fae4ad9f4e4a74bd14286b2eba4766f0d6daa62, data reload: false

query1	0.06	0.05	0.05
query2	0.10	0.06	0.06
query3	0.26	0.08	0.08
query4	1.61	0.12	0.13
query5	0.28	0.28	0.25
query6	1.16	0.67	0.67
query7	0.03	0.03	0.03
query8	0.05	0.04	0.04
query9	0.64	0.54	0.52
query10	0.60	0.60	0.58
query11	0.17	0.12	0.12
query12	0.16	0.12	0.12
query13	0.63	0.62	0.61
query14	1.01	1.03	1.02
query15	0.86	0.86	0.86
query16	0.42	0.42	0.40
query17	1.07	1.02	1.05
query18	0.23	0.21	0.21
query19	1.90	1.85	1.83
query20	0.02	0.02	0.01
query21	15.45	0.20	0.13
query22	4.94	0.08	0.05
query23	15.63	0.28	0.12
query24	2.95	0.77	0.42
query25	0.09	0.08	0.06
query26	0.15	0.15	0.15
query27	0.07	0.06	0.05
query28	5.27	1.17	0.95
query29	12.58	4.13	3.41
query30	0.29	0.14	0.12
query31	2.84	0.62	0.40
query32	3.24	0.57	0.49
query33	3.09	3.07	3.09
query34	15.89	5.22	4.59
query35	4.60	4.59	4.60
query36	0.68	0.52	0.51
query37	0.11	0.07	0.07
query38	0.06	0.04	0.05
query39	0.04	0.03	0.04
query40	0.17	0.14	0.14
query41	0.10	0.03	0.03
query42	0.05	0.04	0.03
query43	0.04	0.04	0.04
Total cold run time: 99.59 s
Total hot run time: 28.09 s

@hello-stephen
Copy link
Contributor

FE Regression Coverage Report

Increment line coverage 50.00% (5/10) 🎉
Increment coverage report
Complete coverage report

liaoxin01
liaoxin01 approved these changes Oct 31, 2025
View reviewed changes
Copy link
Contributor

@liaoxin01 liaoxin01 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@github-actions github-actions bot added the approved Indicates a PR has been approved by one committer. label Oct 31, 2025
@github-actions
Copy link
Contributor

PR approved by at least one committer and no changes requested.

@github-actions
Copy link
Contributor

PR approved by anyone and no changes requested.

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

Reviewers

@liaoxin01 liaoxin01 liaoxin01 approved these changes

Assignees

No one assigned

Labels

approved Indicates a PR has been approved by one committer. dev/3.1.x dev/4.0.x reviewed

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@0AyanamiRei @Thearas @doris-robot @hello-stephen @liaoxin01