Minor modifications

alexey-milovidov · alexey-milovidov · commit 843f8303b019 · 2019-09-03T23:27:46.000+03:00
diff --git a/dbms/src/Common/SensitiveDataMasker.cpp b/dbms/src/Common/SensitiveDataMasker.cpp
@@ -18,6 +18,7 @@
 #    include <iostream>
 #endif
 
+
 namespace DB
 {
 namespace ErrorCodes
@@ -57,7 +58,7 @@ class SensitiveDataMasker::MaskingRule
                 DB::ErrorCodes::CANNOT_COMPILE_REGEXP);
     }
 
-    int apply(std::string & data) const
+    uint64_t apply(std::string & data) const
     {
         auto m = RE2::GlobalReplace(&data, regexp, replacement);
         matches_count += m;
@@ -69,6 +70,7 @@ class SensitiveDataMasker::MaskingRule
     uint64_t getMatchesCount() const { return matches_count; }
 };
 
+
 SensitiveDataMasker::SensitiveDataMasker(const Poco::Util::AbstractConfiguration & config, const std::string & config_prefix)
 {
     Poco::Util::AbstractConfiguration::Keys keys;
@@ -85,23 +87,19 @@ SensitiveDataMasker::SensitiveDataMasker(const Poco::Util::AbstractConfiguration
 
             auto rule_name = config.getString(rule_config_prefix + ".name", rule_config_prefix);
 
-            if (used_names.count(rule_name) == 0)
-            {
-                used_names.insert(rule_name);
-            }
-            else
+            if (!used_names.insert(rule_name).second)
             {
                 throw Exception(
-                    "query_masking_rules configuration contains more than one rule named '" + rule_name + "'.",
+                    "Query_masking_rules configuration contains more than one rule named '" + rule_name + "'.",
                     ErrorCodes::INVALID_CONFIG_PARAMETER);
             }
 
             auto regexp = config.getString(rule_config_prefix + ".regexp", "");
 
-            if (regexp == "")
+            if (regexp.empty())
             {
                 throw Exception(
-                    "query_masking_rules configuration, rule '" + rule_name + "' has no <regexp> node or <regexp> is empty.",
+                    "Query_masking_rules configuration, rule '" + rule_name + "' has no <regexp> node or <regexp> is empty.",
                     ErrorCodes::NO_ELEMENTS_IN_CONFIG);
             }
 
@@ -122,7 +120,8 @@ SensitiveDataMasker::SensitiveDataMasker(const Poco::Util::AbstractConfiguration
             LOG_WARNING(logger, "Unused param " << config_prefix << '.' << rule);
         }
     }
-    auto rules_count = this->rulesCount();
+
+    auto rules_count = rulesCount();
     if (rules_count > 0)
     {
         LOG_INFO(logger, rules_count << " query masking rules loaded.");
@@ -138,13 +137,11 @@ void SensitiveDataMasker::addMaskingRule(
 }
 
 
-int SensitiveDataMasker::wipeSensitiveData(std::string & data) const
+size_t SensitiveDataMasker::wipeSensitiveData(std::string & data) const
 {
-    int matches = 0;
+    size_t matches = 0;
     for (auto & rule : all_masking_rules)
-    {
         matches += rule->apply(data);
-    }
     return matches;
 }
 
@@ -159,7 +156,7 @@ void SensitiveDataMasker::printStats()
 }
 #endif
 
-unsigned long SensitiveDataMasker::rulesCount() const
+size_t SensitiveDataMasker::rulesCount() const
 {
     return all_masking_rules.size();
 }
diff --git a/dbms/src/Common/SensitiveDataMasker.h b/dbms/src/Common/SensitiveDataMasker.h
@@ -2,6 +2,8 @@
 
 #include <memory>
 #include <vector>
+#include <cstdint>
+
 
 namespace Poco
 {
@@ -22,14 +24,18 @@ class SensitiveDataMasker
 public:
     SensitiveDataMasker(const Poco::Util::AbstractConfiguration & config, const std::string & config_prefix);
     ~SensitiveDataMasker();
+
+    /// Returns the number of matched rules.
+    size_t wipeSensitiveData(std::string & data) const;
+
+    /// Used in tests.
     void addMaskingRule(const std::string & name, const std::string & regexp_string, const std::string & replacement_string);
-    int wipeSensitiveData(std::string & data) const;
 
 #ifndef NDEBUG
     void printStats();
 #endif
 
-    unsigned long rulesCount() const;
+    size_t rulesCount() const;
 };
 
 };

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`# include <iostream>`
`19`	`19`	`#endif`
`20`	`20`
	`21`	`+`
`21`	`22`	`namespace DB`
`22`	`23`	`{`
`23`	`24`	`namespace ErrorCodes`
`@@ -57,7 +58,7 @@ class SensitiveDataMasker::MaskingRule`
`57`	`58`	`DB::ErrorCodes::CANNOT_COMPILE_REGEXP);`
`58`	`59`	`}`
`59`	`60`
`60`		`- int apply(std::string & data) const`
	`61`	`+ uint64_t apply(std::string & data) const`
`61`	`62`	`{`
`62`	`63`	`auto m = RE2::GlobalReplace(&data, regexp, replacement);`
`63`	`64`	`matches_count += m;`
`@@ -69,6 +70,7 @@ class SensitiveDataMasker::MaskingRule`
`69`	`70`	`uint64_t getMatchesCount() const { return matches_count; }`
`70`	`71`	`};`
`71`	`72`
	`73`	`+`
`72`	`74`	`SensitiveDataMasker::SensitiveDataMasker(const Poco::Util::AbstractConfiguration & config, const std::string & config_prefix)`
`73`	`75`	`{`
`74`	`76`	`Poco::Util::AbstractConfiguration::Keys keys;`
`@@ -85,23 +87,19 @@ SensitiveDataMasker::SensitiveDataMasker(const Poco::Util::AbstractConfiguration`
`85`	`87`
`86`	`88`	`auto rule_name = config.getString(rule_config_prefix + ".name", rule_config_prefix);`
`87`	`89`
`88`		`- if (used_names.count(rule_name) == 0)`
`89`		`- {`
`90`		`- used_names.insert(rule_name);`
`91`		`- }`
`92`		`- else`
	`90`	`+ if (!used_names.insert(rule_name).second)`
`93`	`91`	`{`
`94`	`92`	`throw Exception(`
`95`		`- "query_masking_rules configuration contains more than one rule named '" + rule_name + "'.",`
	`93`	`+ "Query_masking_rules configuration contains more than one rule named '" + rule_name + "'.",`
`96`	`94`	`ErrorCodes::INVALID_CONFIG_PARAMETER);`
`97`	`95`	`}`
`98`	`96`
`99`	`97`	`auto regexp = config.getString(rule_config_prefix + ".regexp", "");`
`100`	`98`
`101`		`- if (regexp == "")`
	`99`	`+ if (regexp.empty())`
`102`	`100`	`{`
`103`	`101`	`throw Exception(`
`104`		`- "query_masking_rules configuration, rule '" + rule_name + "' has no <regexp> node or <regexp> is empty.",`
	`102`	`+ "Query_masking_rules configuration, rule '" + rule_name + "' has no <regexp> node or <regexp> is empty.",`
`105`	`103`	`ErrorCodes::NO_ELEMENTS_IN_CONFIG);`
`106`	`104`	`}`
`107`	`105`
`@@ -122,7 +120,8 @@ SensitiveDataMasker::SensitiveDataMasker(const Poco::Util::AbstractConfiguration`
`122`	`120`	`LOG_WARNING(logger, "Unused param " << config_prefix << '.' << rule);`
`123`	`121`	`}`
`124`	`122`	`}`
`125`		`- auto rules_count = this->rulesCount();`
	`123`	`+`
	`124`	`+ auto rules_count = rulesCount();`
`126`	`125`	`if (rules_count > 0)`
`127`	`126`	`{`
`128`	`127`	`LOG_INFO(logger, rules_count << " query masking rules loaded.");`
`@@ -138,13 +137,11 @@ void SensitiveDataMasker::addMaskingRule(`
`138`	`137`	`}`
`139`	`138`
`140`	`139`
`141`		`-int SensitiveDataMasker::wipeSensitiveData(std::string & data) const`
	`140`	`+size_t SensitiveDataMasker::wipeSensitiveData(std::string & data) const`
`142`	`141`	`{`
`143`		`- int matches = 0;`
	`142`	`+ size_t matches = 0;`
`144`	`143`	`for (auto & rule : all_masking_rules)`
`145`		`- {`
`146`	`144`	`matches += rule->apply(data);`
`147`		`- }`
`148`	`145`	`return matches;`
`149`	`146`	`}`
`150`	`147`
`@@ -159,7 +156,7 @@ void SensitiveDataMasker::printStats()`
`159`	`156`	`}`
`160`	`157`	`#endif`
`161`	`158`
`162`		`-unsigned long SensitiveDataMasker::rulesCount() const`
	`159`	`+size_t SensitiveDataMasker::rulesCount() const`
`163`	`160`	`{`
`164`	`161`	`return all_masking_rules.size();`
`165`	`162`	`}`