Fix max_caps may not been update after GC

[jiaqizho]

Signed-off-by: jiaqizho [email protected]

What problem does this PR solve?

Issue Number: ref #3594

Problem Summary:

1. we need to update sm_max_caps after removing the position from the blob.
2. also need to call recalculateCapability after restore.

What is changed and how it works?

Check List

Tests

• Unit test
• Integration test
• Manual test (add detailed scripts or steps below)
• No code

Side effects

• Performance regression: Consumes more CPU
• Performance regression: Consumes more Memory
• Breaking backward compatibility

Documentation

• Affects user behaviors
• Contains syntax changes
• Contains variable changes
• Contains experimental features
• Changes MySQL compatibility

Release note

None

[ti-chi-bot]

[REVIEW NOTIFICATION]

This pull request has been approved by:

• CalvinNeo
• JaySon-Huang

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

[JaySon-Huang]

Seems existing_file_ids in restore is not needed after #4247

tiflash/dbms/src/Storages/Page/V3/BlobStore.cpp

Lines 761 to 773 in a7f9bab

	void BlobStore::BlobStats::restore()
	{
	BlobFileId max_restored_file_id = 0;
	std::set<BlobFileId> existing_file_ids;
	for (const auto & stat : stats_map)
	{
	stat->recalculateSpaceMap();
	max_restored_file_id = std::max(stat->id, max_restored_file_id);
	existing_file_ids.insert(stat->id);
	}
	// restore `roll_id`
	roll_id = max_restored_file_id + 1;
	}

[jiaqizho]

Seems existing_file_ids in restore is not needed after #4247

tiflash/dbms/src/Storages/Page/V3/BlobStore.cpp

Lines 761 to 773 in a7f9bab

	void BlobStore::BlobStats::restore()
	{
	BlobFileId max_restored_file_id = 0;
	std::set<BlobFileId> existing_file_ids;
	for (const auto & stat : stats_map)
	{
	stat->recalculateSpaceMap();
	max_restored_file_id = std::max(stat->id, max_restored_file_id);
	existing_file_ids.insert(stat->id);
	}
	// restore `roll_id`
	roll_id = max_restored_file_id + 1;
	}

removed existing_file_ids

[JaySon-Huang]

LGTM with nit comment

[CalvinNeo]

LGTM

[jiaqizho]

/merge

[ti-chi-bot]

@jiaqizho: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and if the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

If you have any questions about the PR merge process, please refer to pr process.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

[ti-chi-bot]

This pull request has been accepted and is ready to merge.

Commit hash: 7ba4e7b

[sre-bot]

Coverage for changed files

Filename                        Regions    Missed Regions     Cover   Functions  Missed Functions  Executed       Lines      Missed Lines     Cover    Branches   Missed Branches     Cover
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
BlobStore.cpp                       358               112    68.72%          39                 3    92.31%         769               206    73.21%         224                89    60.27%
BlobStore.h                           7                 1    85.71%           7                 1    85.71%          25                10    60.00%           0                 0         -
spacemap/SpaceMap.h                   7                 2    71.43%           4                 1    75.00%          18                 5    72.22%           6                 1    83.33%
spacemap/SpaceMapRBTree.cpp         341                82    75.95%          18                 1    94.44%         566               114    79.86%         202                64    68.32%
spacemap/SpaceMapRBTree.h             2                 0   100.00%           2                 0   100.00%           5                 0   100.00%           0                 0         -
spacemap/SpaceMapSTDMap.h           143                11    92.31%          11                 0   100.00%         245                20    91.84%          92                18    80.43%
tests/gtest_blob_store.cpp         3548               590    83.37%          17                 0   100.00%         686                 0   100.00%        1102               520    52.81%
tests/gtest_free_map.cpp           1848               309    83.28%          12                 0   100.00%         241                 0   100.00%         616               308    50.00%
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
TOTAL                              6254              1107    82.30%         110                 6    94.55%        2555               355    86.11%        2242              1000    55.40%

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
16926      9502             43.86%    190721  96488        49.41%

full coverage report (for internal network access only)

[jiaqizho]

/merge

[ti-chi-bot]

@jiaqizho: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and if the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

If you have any questions about the PR merge process, please refer to pr process.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

[ti-chi-bot]

@jiaqizho: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

[sre-bot]

Coverage for changed files

Filename                        Regions    Missed Regions     Cover   Functions  Missed Functions  Executed       Lines      Missed Lines     Cover    Branches   Missed Branches     Cover
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
BlobStore.cpp                       361               113    68.70%          39                 3    92.31%         777               209    73.10%         224                89    60.27%
BlobStore.h                           7                 1    85.71%           7                 1    85.71%          25                10    60.00%           0                 0         -
spacemap/SpaceMap.h                   7                 2    71.43%           4                 1    75.00%          18                 5    72.22%           6                 1    83.33%
spacemap/SpaceMapRBTree.cpp         341                82    75.95%          18                 1    94.44%         566               114    79.86%         202                64    68.32%
spacemap/SpaceMapRBTree.h             2                 0   100.00%           2                 0   100.00%           5                 0   100.00%           0                 0         -
spacemap/SpaceMapSTDMap.h           143                11    92.31%          11                 0   100.00%         245                20    91.84%          92                18    80.43%
tests/gtest_blob_store.cpp         3548               590    83.37%          17                 0   100.00%         686                 0   100.00%        1102               520    52.81%
tests/gtest_free_map.cpp           1848               309    83.28%          12                 0   100.00%         241                 0   100.00%         616               308    50.00%
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
TOTAL                              6257              1108    82.29%         110                 6    94.55%        2563               358    86.03%        2242              1000    55.40%

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
17020      9573             43.75%    191706  97053        49.37%

full coverage report (for internal network access only)