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

Fix some memory problem in blob ut. #4064

Merged
merged 2 commits into from
Feb 17, 2022
Merged

Fix some memory problem in blob ut. #4064

merged 2 commits into from
Feb 17, 2022

Conversation

jiaqizho
Copy link
Contributor

What problem does this PR solve?

Issue Number: close #4054

Problem Summary:

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
Copy link
Member

ti-chi-bot commented Feb 17, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • 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.

@ti-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Feb 17, 2022
@jiaqizho
Fix some memory problem in blob ut
c8ce49f 
Signed-off-by: jiaqizho <zhoujiaqi@pingcap.com>
JaySon-Huang
JaySon-Huang reviewed Feb 17, 2022
View reviewed changes
dbms/src/Storages/Page/V3/tests/gtest_page_storage.cpp
Comment on lines -181 to +196
DB::MemHolder holder;

auto buff = [page_id] {
std::mt19937 size_gen;
size_gen.seed(time(nullptr));
std::uniform_int_distribution<> dist(0, 3000);

const size_t buff_sz = 2 * DB::MB + dist(size_gen);
char * buff = static_cast<char *>(malloc(buff_sz));
if (buff == nullptr)
{
throw DB::Exception("Alloc fix memory failed.", DB::ErrorCodes::LOGICAL_ERROR);
}

const char buff_ch = page_id % 0xFF;
memset(buff, buff_ch, buff_sz);
DB::createMemHolder(buff, [&](char * p) { free(p); });
return std::make_shared<DB::ReadBufferFromMemory>(const_cast<char *>(buff), buff_sz);
}();
std::mt19937 size_gen;
size_gen.seed(time(nullptr));
std::uniform_int_distribution<> dist(0, 3000);

const size_t buff_sz = 2 * DB::MB + dist(size_gen);
char * buff = static_cast<char *>(malloc(buff_sz));
if (buff == nullptr)
{
throw DB::Exception("Alloc fix memory failed.", DB::ErrorCodes::LOGICAL_ERROR);
}

const char buff_ch = page_id % 0xFF;
memset(buff, buff_ch, buff_sz);
DB::MemHolder holder = DB::createMemHolder(buff, [&](char * p) { free(p); });

auto read_buff = std::make_shared<DB::ReadBufferFromMemory>(const_cast<char *>(buff), buff_sz);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or you can make the return type be std::pair<shared_ptr, MemHolder> for this lambda.

Nevertheless, this is also ok for me.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just remove lambda may more clear for me. :)

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Feb 17, 2022
@jiaqizho
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

@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
Copy link
Member

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

Commit hash: c8ce49f

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Feb 17, 2022
@sre-bot
Copy link
Collaborator

sre-bot commented Feb 17, 2022

Coverage for changed files

Filename                      Regions    Missed Regions     Cover   Functions  Missed Functions  Executed       Lines      Missed Lines     Cover    Branches   Missed Branches     Cover
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
gtest_blob_store.cpp             3479               559    83.93%          16                 0   100.00%         694                 0   100.00%        1080               508    52.96%
gtest_page_storage.cpp           2140               866    59.53%          23                 8    65.22%         554               161    70.94%         690               425    38.41%
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
TOTAL                            5619              1425    74.64%          39                 8    79.49%        1248               161    87.10%        1770               933    47.29%

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
16544      9502             42.57%    182834  96102        47.44%

full coverage report (for internal network access only)

@ti-chi-bot ti-chi-bot merged commit 4222d92 into pingcap:master Feb 17, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JaySon-Huang JaySon-Huang JaySon-Huang approved these changes

Assignees
No one assigned
Labels
release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

AddressSanitizer: stack-buffer-underflow in BlobStore::write
4 participants
@jiaqizho @ti-chi-bot @sre-bot @JaySon-Huang