Skip to content
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

Always use readable pathname in DMFileReader #5958

Merged
merged 6 commits into from
Sep 21, 2022
Merged

Always use readable pathname in DMFileReader #5958

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5513417
Update pathname of DMFileReader.
JinheLin Sep 20, 2022
5915b09
Add test.
JinheLin Sep 21, 2022
3bc77f9
fix
JinheLin Sep 21, 2022
fc5f78d
Merge branch 'master' into fix-dm-file-reader-pool
ti-chi-bot Sep 21, 2022
e5689f7
Merge branch 'master' into fix-dm-file-reader-pool
ti-chi-bot Sep 21, 2022
b7fd5ca
fix ut
JinheLin Sep 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions dbms/src/Storages/DeltaMerge/File/DMFileBlockInputStream.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,7 @@ DMFileBlockInputStreamBuilder::DMFileBlockInputStreamBuilder(const Context & con

DMFileBlockInputStreamPtr DMFileBlockInputStreamBuilder::build(const DMFilePtr & dmfile, const ColumnDefines & read_columns, const RowKeyRanges & rowkey_ranges)
{
if (dmfile->getStatus() != DMFile::Status::READABLE)
throw Exception(fmt::format(
"DMFile [{}] is expected to be in READABLE status, but: {}",
dmfile->fileId(),
DMFile::statusString(dmfile->getStatus())),
ErrorCodes::LOGICAL_ERROR);
RUNTIME_CHECK(dmfile->getStatus() == DMFile::Status::READABLE, dmfile->fileId(), DMFile::statusString(dmfile->getStatus()));

// if `rowkey_ranges` is empty, we unconditionally read all packs
// `rowkey_ranges` and `is_common_handle` will only be useful in clean read mode.
Expand Down
8 changes: 3 additions & 5 deletions dbms/src/Storages/DeltaMerge/File/DMFileReader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,11 @@ class DMFileReader
/// Return false if it is the end of stream.
bool getSkippedRows(size_t & skip_rows);
Block read();
UInt64 fileId() const
{
return dmfile->fileId();
}
std::string path() const
{
return dmfile->path();
// Status of DMFile can be updated when DMFileReader in used and the pathname will be changed.
JinheLin marked this conversation as resolved.
Show resolved Hide resolved
// For DMFileReader, always use the readable path.
return DMFile::getPathByStatus(dmfile->parentPath(), dmfile->fileId(), DMFile::Status::READABLE);
}
void addCachedPacks(ColId col_id, size_t start_pack_id, size_t pack_count, ColumnPtr & col);

Expand Down