dnsdist: Change dnsdist stats functions to always return lowercase names #5383
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rgacogne
requested changes
Jun 7, 2017
| @@ -158,7 +158,7 @@ std::unordered_map<int, vector<boost::variant<string,double>>> getGenResponses(u | |||
| vector<pair<int, DNSName>> rcounts; | |||
| rcounts.reserve(counts.size()); | |||
| for(const auto& c : counts) | |||
| rcounts.push_back(make_pair(c.second, c.first)); | |||
| rcounts.push_back(make_pair(c.second, c.first.makeLowerCase())); | |||
There was a problem hiding this comment.
I think you need to lowercase earlier otherwise the counts are going to be off.
There was a problem hiding this comment.
Nope since it uses maps, which uses the default compare and less operators, which in turn lowercase everything themselves.
There was a problem hiding this comment.
I wonder if it wouldn't be better to lowercase a bit later then, replacing rc.second.toString() by something like rc.second.makeLowerCase().toString(), so we only do the lowercasing for the names we are going to print, not all of them.
| @@ -1351,7 +1351,7 @@ vector<std::function<void(void)>> setupLua(bool client, const std::string& confi | |||
| vector<pair<int, DNSName>> rcounts; | |||
| rcounts.reserve(counts.size()); | |||
| for(const auto& c : counts) | |||
| rcounts.push_back(make_pair(c.second, c.first)); | |||
| rcounts.push_back(make_pair(c.second, c.first.makeLowerCase())); | |||
rgacogne
approved these changes
Jun 7, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Short description
Changes getTopQueries and getGenResponses to return lowercase versions for all names. Closes #5287
Checklist
I have: