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

feat: remove the dependency of tls memory for redis_parser #686

Merged
merged 8 commits into from
Jan 27, 2021
+3 −6
Merged

feat: remove the dependency of tls memory for redis_parser #686

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a75314f
feat: remove the dependency of tls memory for redis_parser
levy5307 Jan 21, 2021
6fc7971
Merge branch 'master' into redis_parser
levy5307 Jan 25, 2021
1f5d7e3
fix
levy5307 Jan 25, 2021
140842f
Merge branch 'redis_parser' of github.com:levy5307/pegasus into redis…
levy5307 Jan 25, 2021
da88a22
Merge branch 'master' into redis_parser
levy5307 Jan 25, 2021
c7d784d
fix
levy5307 Jan 26, 2021
12ad9f5
Merge branch 'redis_parser' of github.com:levy5307/pegasus into redis…
levy5307 Jan 26, 2021
6574a02
fix
levy5307 Jan 26, 2021
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
9 changes: 3 additions & 6 deletions src/redis_protocol/proxy_lib/redis_parser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,12 +299,9 @@ bool redis_parser::parse_stream()
// string content + CR + LF
if (_total_length >= _current_str.length + 2) {
if (_current_str.length > 0) {
char *ptr =
reinterpret_cast<char *>(dsn::tls_trans_malloc(_current_str.length));
std::shared_ptr<char> str_data(ptr,
[](char *ptr) { dsn::tls_trans_free(ptr); });
eat_all(str_data.get(), _current_str.length);
_current_str.data.assign(std::move(str_data), 0, _current_str.length);
std::string str_data(_current_str.length, '\0');
eat_all(const_cast<char *>(str_data.data()), _current_str.length);
_current_str.data = dsn::blob::create_from_bytes(std::move(str_data));
}
dverify(eat(CR));
dverify(eat(LF));
Expand Down