[fix](filecache) pass tablet_id through FileReaderOptions instead of parsing from path#61683
Merged
gavinchou merged 3 commits intoapache:masterfrom Mar 28, 2026
Merged
Conversation
deardeng
requested review from
airborne12,
dataroaring and
gavinchou
as code owners
Contributor
|
Thank you for your contribution to Apache Doris. Please clearly describe your PR:
|
Collaborator
Author
|
run buildall |
TPC-H: Total hot run time: 26700 ms |
TPC-DS: Total hot run time: 169861 ms |
…parsing from path
CachedRemoteFileReader::_execute_remote_read previously parsed tablet_id
from file paths at runtime via extract_tablet_id(). This breaks when
enable_packed_file (small file merging) is enabled because packed file
paths don't follow the expected data/{tablet_id}/... format.
Fix: store tablet_id from FileReaderOptions at construction time and use
it directly, eliminating runtime path parsing. Propagate tablet_id through
all code paths: Segment, InvertedIndexFileReader, FSIndexInput::open,
DownloadFileMeta (warmup/preheating), and beta_rowset consistency checks.
deardeng
force-pushed
the
fix-extract-tablet-id
branch
from
b387dc0 to
7c91d8c
Compare
Collaborator
Author
|
run buildall |
deardeng
force-pushed
the
fix-extract-tablet-id
branch
from
7c91d8c to
ca2ccb5
Compare
Collaborator
Author
|
run buildall |
TPC-H: Total hot run time: 26994 ms |
TPC-DS: Total hot run time: 169654 ms |
Contributor
BE UT Coverage ReportIncrement line coverage Increment coverage report
|
Collaborator
Author
|
run buildall |
Contributor
BE Regression && UT Coverage ReportIncrement line coverage Increment coverage report
|
deardeng
force-pushed
the
fix-extract-tablet-id
branch
from
43d21c6 to
a6c6a36
Compare
Collaborator
Author
|
run buildall |
TPC-H: Total hot run time: 26719 ms |
TPC-DS: Total hot run time: 169228 ms |
Contributor
BE UT Coverage ReportIncrement line coverage Increment coverage report
|
Contributor
BE Regression && UT Coverage ReportIncrement line coverage Increment coverage report
|
Collaborator
Author
|
run p0 |
Contributor
BE Regression && UT Coverage ReportIncrement line coverage Increment coverage report
|
Collaborator
Author
|
run nonConcurrent |
Contributor
BE Regression && UT Coverage ReportIncrement line coverage Increment coverage report
|
Contributor
|
PR approved by anyone and no changes requested. |
gavinchou
approved these changes
Mar 27, 2026
github-actions
bot
added
the
approved
Contributor
|
PR approved by at least one committer and no changes requested. |
airborne12
approved these changes
Mar 28, 2026
Member
airborne12
left a comment
airborne12
left a comment
There was a problem hiding this comment.
LGTM. Clean and thorough fix that eliminates fragile runtime path parsing for tablet_id.
Key strengths:
- Correctly replaces TOCTOU-style
extract_tablet_id()with construction-time data propagation throughFileReaderOptions - All 26 files covered — every
is_doris_table=truecallsite now setstablet_id - DCHECK safety net catches missed propagation paths in debug builds
- Test updates are comprehensive (14 CachedRemoteFileReader tests updated)
Minor suggestions (non-blocking):
- Consider removing default
tablet_id = -1from function signatures once all callsites are confirmed migrated, to get compile-time enforcement Segment::openredundantly overridestablet_idfrom the parameter even though all callers already set it in reader_options — defensive but could be simplified
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
7 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.
CachedRemoteFileReader::_execute_remote_read previously parsed tablet_id from file paths at runtime via extract_tablet_id(). This breaks when enable_packed_file (small file merging) is enabled because packed file paths don't follow the expected data/{tablet_id}/... format.
Fix: store tablet_id from FileReaderOptions at construction time and use it directly, eliminating runtime path parsing. Propagate tablet_id through all code paths: Segment, InvertedIndexFileReader, FSIndexInput::open, DownloadFileMeta (warmup/preheating), and beta_rowset consistency checks.
What problem does this PR solve?
Issue Number: close #xxx
Related PR: #xxx
Problem Summary:
Release note
None
Check List (For Author)
Test
Behavior changed:
Does this need documentation?
Check List (For Reviewer who merge this PR)