Skip to content

[Fix](Top-N opt) evicting quering rowsets in prior to correct use_count #30904

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

Merged
yiguolei merged 2 commits into from
Feb 8, 2024
Merged

[Fix](Top-N opt) evicting quering rowsets in prior to correct use_count #30904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32a2352
[Fix](Top-N opt) evicting quering rowsets in prior to correct use_cou…
eldenmoon Feb 6, 2024
59c54f3
Merge branch 'master' into fix-rs-cnt
eldenmoon Feb 7, 2024
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
2 changes: 1 addition & 1 deletion be/src/exec/rowid_fetcher.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ Status RowIDFetcher::fetch(const vectorized::ColumnPtr& column_row_ids,
std::vector<PRowLocation> rows_locs;
rows_locs.reserve(rows_locs.size());
RETURN_IF_ERROR(_merge_rpc_results(mget_req, resps, cntls, res_block, &rows_locs));
if (rows_locs.size() != res_block->rows()) {
if (rows_locs.size() != res_block->rows() || rows_locs.size() != column_row_ids->size()) {
return Status::InternalError("Miss matched return row loc count {}, expected {}, input {}",
rows_locs.size(), res_block->rows(), column_row_ids->size());
}
Expand Down
5 changes: 3 additions & 2 deletions be/src/olap/storage_engine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1079,10 +1079,11 @@ void StorageEngine::start_delete_unused_rowset() {
for (auto it = _unused_rowsets.begin(); it != _unused_rowsets.end();) {
uint64_t now = UnixSeconds();
auto&& rs = it->second;
if (rs.use_count() == 1 && rs->need_delete_file() &&
if (now > rs->delayed_expired_timestamp()) {
// We delay the GC time of this rowset since it's maybe still needed, see #20732
now > rs->delayed_expired_timestamp()) {
evict_querying_rowset(it->second->rowset_id());
}
if (rs.use_count() == 1 && rs->need_delete_file()) {
// remote rowset data will be reclaimed by `remove_unused_remote_files`
if (rs->is_local()) {
unused_rowsets_copy.push_back(std::move(rs));
Expand Down