Merge pull request #60450 from rschu1ze/starts_with

rschu1ze · web-flow · commit 466cf93ee248 · 2024-02-27T16:21:02.000+01:00
Minor: Replace `boost::algorithm::starts_with()` by `std::string::starts_with()`
diff --git a/src/IO/S3/tests/gtest_aws_s3_client.cpp b/src/IO/S3/tests/gtest_aws_s3_client.cpp
@@ -45,7 +45,7 @@ String getSSEAndSignedHeaders(const Poco::Net::MessageHeader & message_header)
     String content;
     for (const auto & [header_name, header_value] : message_header)
     {
-        if (boost::algorithm::starts_with(header_name, "x-amz-server-side-encryption"))
+        if (header_name.starts_with("x-amz-server-side-encryption"))
         {
             content += header_name + ": " + header_value + "\n";
         }
@@ -55,7 +55,7 @@ String getSSEAndSignedHeaders(const Poco::Net::MessageHeader & message_header)
             boost::split(parts, header_value, [](char c){ return c == ' '; });
             for (const auto & part : parts)
             {
-                if (boost::algorithm::starts_with(part, "SignedHeaders="))
+                if (part.starts_with("SignedHeaders="))
                     content += header_name + ": ... " + part + " ...\n";
             }
         }
diff --git a/src/Storages/StorageS3Settings.cpp b/src/Storages/StorageS3Settings.cpp
@@ -8,7 +8,6 @@
 #include <Common/Throttler.h>
 #include <Common/formatReadable.h>
 #include <Interpreters/Context.h>
-#include <boost/algorithm/string/predicate.hpp>
 
 
 namespace DB
@@ -303,7 +302,7 @@ S3Settings StorageS3Settings::getSettings(const String & endpoint, const String
     {
         std::advance(possible_prefix_setting, -1);
         const auto & [endpoint_prefix, settings] = *possible_prefix_setting;
-        if (boost::algorithm::starts_with(endpoint, endpoint_prefix) && settings.auth_settings.canBeUsedByUser(user))
+        if (endpoint.starts_with(endpoint_prefix) && settings.auth_settings.canBeUsedByUser(user))
             return possible_prefix_setting->second;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ String getSSEAndSignedHeaders(const Poco::Net::MessageHeader & message_header)`
`45`	`45`	`String content;`
`46`	`46`	`for (const auto & [header_name, header_value] : message_header)`
`47`	`47`	`{`
`48`		`- if (boost::algorithm::starts_with(header_name, "x-amz-server-side-encryption"))`
	`48`	`+ if (header_name.starts_with("x-amz-server-side-encryption"))`
`49`	`49`	`{`
`50`	`50`	`content += header_name + ": " + header_value + "\n";`
`51`	`51`	`}`
`@@ -55,7 +55,7 @@ String getSSEAndSignedHeaders(const Poco::Net::MessageHeader & message_header)`
`55`	`55`	`boost::split(parts, header_value, [](char c){ return c == ' '; });`
`56`	`56`	`for (const auto & part : parts)`
`57`	`57`	`{`
`58`		`- if (boost::algorithm::starts_with(part, "SignedHeaders="))`
	`58`	`+ if (part.starts_with("SignedHeaders="))`
`59`	`59`	`content += header_name + ": ... " + part + " ...\n";`
`60`	`60`	`}`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`#include <Common/Throttler.h>`
`9`	`9`	`#include <Common/formatReadable.h>`
`10`	`10`	`#include <Interpreters/Context.h>`
`11`		`-#include <boost/algorithm/string/predicate.hpp>`
`12`	`11`
`13`	`12`
`14`	`13`	`namespace DB`
`@@ -303,7 +302,7 @@ S3Settings StorageS3Settings::getSettings(const String & endpoint, const String`
`303`	`302`	`{`
`304`	`303`	`std::advance(possible_prefix_setting, -1);`
`305`	`304`	`const auto & [endpoint_prefix, settings] = *possible_prefix_setting;`
`306`		`- if (boost::algorithm::starts_with(endpoint, endpoint_prefix) && settings.auth_settings.canBeUsedByUser(user))`
	`305`	`+ if (endpoint.starts_with(endpoint_prefix) && settings.auth_settings.canBeUsedByUser(user))`
`307`	`306`	`return possible_prefix_setting->second;`
`308`	`307`	`}`
`309`	`308`