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

Jump to bottom

Add a protect if snapshot can't get any valid version #4171

Merged
merged 5 commits into from
Mar 7, 2022
Merged

Add a protect if snapshot can't get any valid version #4171

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6e6d263
Add a protect if snapshot can't get any valid version
jiaqizho Mar 2, 2022
ec8374f
add shutdown call
jiaqizho Mar 2, 2022
811d789
update
jiaqizho Mar 2, 2022
686fbe8
fix tidy
jiaqizho Mar 2, 2022
de07bb8
Merge branch 'master' into nullptr-from-ps2-version
JaySon-Huang Mar 4, 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
39 changes: 30 additions & 9 deletions dbms/src/Storages/DeltaMerge/DeltaMergeStore.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2239,9 +2239,16 @@ DeltaMergeStoreStat DeltaMergeStore::getStat()
= storage_pool.data()->getSnapshotsStat();
PageStorage::SnapshotPtr stable_snapshot = storage_pool.data()->getSnapshot();
const auto * concrete_snap = toConcreteSnapshot(stable_snapshot);
stat.storage_stable_num_pages = concrete_snap->version()->numPages();
stat.storage_stable_num_normal_pages = concrete_snap->version()->numNormalPages();
stat.storage_stable_max_page_id = concrete_snap->version()->maxId();
if (const auto version = concrete_snap->version(); version != nullptr)
{
stat.storage_stable_num_pages = version->numPages();
stat.storage_stable_num_normal_pages = version->numNormalPages();
stat.storage_stable_max_page_id = version->maxId();
}
else
{
LOG_FMT_ERROR(log, "Can't get any version from current snapshot.[Type=data, DB={}, Table={}]", db_name, table_name);
jiaqizho marked this conversation as resolved.
Show resolved Hide resolved
}
}
{
std::tie(stat.storage_delta_num_snapshots, //
Expand All @@ -2250,9 +2257,16 @@ DeltaMergeStoreStat DeltaMergeStore::getStat()
= storage_pool.log()->getSnapshotsStat();
PageStorage::SnapshotPtr log_snapshot = storage_pool.log()->getSnapshot();
const auto * concrete_snap = toConcreteSnapshot(log_snapshot);
stat.storage_delta_num_pages = concrete_snap->version()->numPages();
stat.storage_delta_num_normal_pages = concrete_snap->version()->numNormalPages();
stat.storage_delta_max_page_id = concrete_snap->version()->maxId();
if (const auto version = concrete_snap->version(); version != nullptr)
{
stat.storage_delta_num_pages = version->numPages();
stat.storage_delta_num_normal_pages = version->numNormalPages();
stat.storage_delta_max_page_id = version->maxId();
}
else
{
LOG_FMT_ERROR(log, "Can't get any version from current snapshot.[Type=log, DB={}, Table={}]", db_name, table_name);
jiaqizho marked this conversation as resolved.
Show resolved Hide resolved
}
}
{
std::tie(stat.storage_meta_num_snapshots, //
Expand All @@ -2261,9 +2275,16 @@ DeltaMergeStoreStat DeltaMergeStore::getStat()
= storage_pool.meta()->getSnapshotsStat();
PageStorage::SnapshotPtr meta_snapshot = storage_pool.meta()->getSnapshot();
const auto * concrete_snap = toConcreteSnapshot(meta_snapshot);
stat.storage_meta_num_pages = concrete_snap->version()->numPages();
stat.storage_meta_num_normal_pages = concrete_snap->version()->numNormalPages();
stat.storage_meta_max_page_id = concrete_snap->version()->maxId();
if (const auto version = concrete_snap->version(); version != nullptr)
{
stat.storage_meta_num_pages = version->numPages();
stat.storage_meta_num_normal_pages = version->numNormalPages();
stat.storage_meta_max_page_id = version->maxId();
}
else
{
LOG_FMT_ERROR(log, "Can't get any version from current snapshot.[Type=log, DB={}, Table={}]", db_name, table_name);
jiaqizho marked this conversation as resolved.
Show resolved Hide resolved
}
}

stat.background_tasks_length = background_tasks.length();
Expand Down