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

[TUBEMQ-373]Reduce the redundant code of Utils::Split functions #284

Merged
merged 1 commit into from
Oct 12, 2020
Merged

[TUBEMQ-373]Reduce the redundant code of Utils::Split functions #284

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
54 changes: 9 additions & 45 deletions tubemq-client-twins/tubemq-client-cpp/src/utils.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,51 +144,15 @@ void Utils::Split(const string& source, vector<string>& result, const string& de
}
}

void Utils::Split(const string& source, map<string, int32_t>& result, const string& delimiter_step1,
const string& delimiter_step2) {
string item_str;
string key_str;
string val_str;
string::size_type pos1 = 0;
string::size_type pos2 = 0;
string::size_type pos3 = 0;
if (!source.empty()) {
pos1 = 0;
pos2 = source.find(delimiter_step1);
while (string::npos != pos2) {
item_str = source.substr(pos1, pos2 - pos1);
item_str = Utils::Trim(item_str);
pos1 = pos2 + delimiter_step1.length();
pos2 = source.find(delimiter_step1, pos1);
if (item_str.empty()) {
continue;
}
pos3 = item_str.find(delimiter_step2);
if (string::npos == pos3) {
continue;
}
key_str = item_str.substr(0, pos3);
val_str = item_str.substr(pos3 + delimiter_step2.length());
key_str = Utils::Trim(key_str);
val_str = Utils::Trim(val_str);
if (key_str.empty()) {
continue;
}
result[key_str] = atoi(val_str.c_str());
}
if (pos1 != source.length()) {
item_str = source.substr(pos1);
item_str = Utils::Trim(item_str);
pos3 = item_str.find(delimiter_step2);
if (string::npos != pos3) {
key_str = item_str.substr(0, pos3);
val_str = item_str.substr(pos3 + delimiter_step2.length());
key_str = Utils::Trim(key_str);
val_str = Utils::Trim(val_str);
if (!key_str.empty()) {
result[key_str] = atoi(val_str.c_str());
}
}
void Utils::Split(const string& source, map<string, int32_t>& result,
const string& delimiter_step1, const string& delimiter_step2) {
map<string, string> tmp_result;
map<string, string>::iterator it;
result.clear();
Split(source, tmp_result, delimiter_step1, delimiter_step2);
if (!tmp_result.empty()) {
for (it = tmp_result.begin(); it != tmp_result.end(); ++it) {
result[it->first] = atoi(it->second.c_str());
}
}
}
Expand Down