This is an automated email from the ASF dual-hosted git repository.
alexey pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kudu.git
commit 1b523322cb786d650ee5122ff26e45986f896761
Author: Alexey Serbin <ale...@apache.org>
AuthorDate: Wed Apr 3 23:01:34 2024 -0700
[c++17] address std::move() warnings
This patch addresses warnings about unqualified calls to std::move()
produced by CLANG15. For more context, discussion, and references,
see [1]. As a part of this patch, follow-up warnings issued by IWYU
and TidyBot are addressed as well.
Prior to this patch, there were many warnings output when compiling
the project with CLANG from Xcode 15.3 on macOS Sonoma, for example:
src/kudu/codegen/module_builder.cc:334:26: warning: unqualified call to
'std::move' [-Wunqualified-std-cast-call]
EngineBuilder ebuilder(move(module_));
^
std::
This patch doesn't contain any functional modifications.
[1] https://reviews.llvm.org/D119670?id=408276
Change-Id: Id05c4d002fabc5fbd6d7b9cc8b886ddc7a8da0a1
Reviewed-on: http://gerrit.cloudera.org:8080/21241
Reviewed-by: Mahesh Reddy <mre...@cloudera.com>
Tested-by: Alexey Serbin <ale...@apache.org>
Reviewed-by: Abhishek Chennaka <achenn...@cloudera.com>
---
src/kudu/client/scan_predicate.cc | 6 ++--
src/kudu/codegen/module_builder.cc | 3 +-
src/kudu/common/column_predicate.cc | 38 +++++++++++-------------
src/kudu/common/partition_pruner.cc | 1 -
src/kudu/common/scan_spec.cc | 5 ++--
src/kudu/hms/hms_catalog.cc | 1 -
src/kudu/integration-tests/master_authz-itest.cc | 31 ++++++++++---------
src/kudu/ranger/ranger_client-test.cc | 11 ++++---
src/kudu/ranger/ranger_client.cc | 13 ++++----
src/kudu/rpc/outbound_call.cc | 2 +-
src/kudu/rpc/result_tracker.cc | 1 -
src/kudu/security/ca/cert_management.cc | 3 +-
src/kudu/security/ca/cert_management.h | 3 +-
src/kudu/tools/tool_action_fs.cc | 1 -
src/kudu/tools/tool_action_local_replica.cc | 26 ++++++++--------
src/kudu/util/block_bloom_filter-test.cc | 2 +-
16 files changed, 68 insertions(+), 79 deletions(-)
diff --git a/src/kudu/client/scan_predicate.cc
b/src/kudu/client/scan_predicate.cc
index 98a72e616..8e446c101 100644
--- a/src/kudu/client/scan_predicate.cc
+++ b/src/kudu/client/scan_predicate.cc
@@ -19,6 +19,7 @@
#include <memory>
#include <optional>
+#include <type_traits>
#include <utility>
#include <vector>
@@ -38,7 +39,6 @@
#include "kudu/util/status.h"
using std::optional;
-using std::move;
using std::shared_ptr;
using std::unique_ptr;
using std::vector;
@@ -71,7 +71,7 @@ KuduPredicate* KuduPredicate::Clone() const {
ComparisonPredicateData::ComparisonPredicateData(ColumnSchema col,
KuduPredicate::ComparisonOp
op,
KuduValue* val)
- : col_(move(col)),
+ : col_(std::move(col)),
op_(op),
val_(val) {
}
@@ -122,7 +122,7 @@ Status ComparisonPredicateData::AddToScanSpec(ScanSpec*
spec, Arena* arena) {
InListPredicateData::InListPredicateData(ColumnSchema col,
vector<KuduValue*>* values)
- : col_(move(col)) {
+ : col_(std::move(col)) {
vals_.swap(*values);
}
diff --git a/src/kudu/codegen/module_builder.cc
b/src/kudu/codegen/module_builder.cc
index 59f3ec4af..cd5d4c022 100644
--- a/src/kudu/codegen/module_builder.cc
+++ b/src/kudu/codegen/module_builder.cc
@@ -94,7 +94,6 @@ using llvm::SMDiagnostic;
using llvm::TargetMachine;
using llvm::Type;
using llvm::Value;
-using std::move;
using std::ostream;
using std::ostringstream;
using std::string;
@@ -331,7 +330,7 @@ Status ModuleBuilder::Compile(unique_ptr<ExecutionEngine>*
out) {
Level opt_level = llvm::CodeGenOpt::None;
#endif
Module* module = module_.get();
- EngineBuilder ebuilder(move(module_));
+ EngineBuilder ebuilder(std::move(module_));
ebuilder.setErrorStr(&str);
ebuilder.setOptLevel(opt_level);
ebuilder.setMCPU(llvm::sys::getHostCPUName());
diff --git a/src/kudu/common/column_predicate.cc
b/src/kudu/common/column_predicate.cc
index 4b163da9e..80f41bb77 100644
--- a/src/kudu/common/column_predicate.cc
+++ b/src/kudu/common/column_predicate.cc
@@ -35,7 +35,6 @@
#include "kudu/util/logging.h"
#include "kudu/util/memory/arena.h"
-using std::move;
using std::string;
using std::vector;
@@ -46,7 +45,7 @@ ColumnPredicate::ColumnPredicate(PredicateType predicate_type,
const void* lower,
const void* upper)
: predicate_type_(predicate_type),
- column_(move(column)),
+ column_(std::move(column)),
lower_(lower),
upper_(upper) {
}
@@ -55,7 +54,7 @@ ColumnPredicate::ColumnPredicate(PredicateType predicate_type,
ColumnSchema column,
vector<const void*>* values)
: predicate_type_(predicate_type),
- column_(move(column)),
+ column_(std::move(column)),
lower_(nullptr),
upper_(nullptr) {
values_.swap(*values);
@@ -67,21 +66,21 @@ ColumnPredicate::ColumnPredicate(PredicateType
predicate_type,
const void* lower,
const void* upper)
: predicate_type_(predicate_type),
- column_(move(column)),
+ column_(std::move(column)),
lower_(lower),
upper_(upper),
- bloom_filters_(move(bfs)) {}
+ bloom_filters_(std::move(bfs)) {}
ColumnPredicate ColumnPredicate::Equality(ColumnSchema column, const void*
value) {
CHECK(value != nullptr);
- return ColumnPredicate(PredicateType::Equality, move(column), value,
nullptr);
+ return ColumnPredicate(PredicateType::Equality, std::move(column), value,
nullptr);
}
ColumnPredicate ColumnPredicate::Range(ColumnSchema column,
const void* lower,
const void* upper) {
CHECK(lower != nullptr || upper != nullptr);
- ColumnPredicate pred(PredicateType::Range, move(column), lower, upper);
+ ColumnPredicate pred(PredicateType::Range, std::move(column), lower, upper);
pred.Simplify();
return pred;
}
@@ -101,7 +100,7 @@ ColumnPredicate ColumnPredicate::InList(ColumnSchema column,
}),
values->end());
- ColumnPredicate pred(PredicateType::InList, move(column), values);
+ ColumnPredicate pred(PredicateType::InList, std::move(column), values);
pred.Simplify();
return pred;
}
@@ -111,8 +110,8 @@ ColumnPredicate ColumnPredicate::InBloomFilter(ColumnSchema
column,
const void* lower,
const void* upper) {
CHECK(!bfs.empty());
- ColumnPredicate pred(PredicateType::InBloomFilter, move(column), move(bfs),
lower,
- upper);
+ ColumnPredicate pred(
+ PredicateType::InBloomFilter, std::move(column), std::move(bfs), lower,
upper);
pred.Simplify();
return pred;
}
@@ -135,7 +134,7 @@ std::optional<ColumnPredicate>
ColumnPredicate::InclusiveRange(ColumnSchema colu
// If incrementing the upper bound fails and the column is nullable,
// then return an IS NOT NULL predicate, so that null values will be
// filtered.
- return ColumnPredicate::IsNotNull(move(column));
+ return ColumnPredicate::IsNotNull(std::move(column));
}
return std::nullopt;
}
@@ -144,7 +143,7 @@ std::optional<ColumnPredicate>
ColumnPredicate::InclusiveRange(ColumnSchema colu
upper = buf;
}
}
- return ColumnPredicate::Range(move(column), lower, upper);
+ return ColumnPredicate::Range(std::move(column), lower, upper);
}
ColumnPredicate ColumnPredicate::ExclusiveRange(ColumnSchema column,
@@ -161,26 +160,25 @@ ColumnPredicate
ColumnPredicate::ExclusiveRange(ColumnSchema column,
memcpy(buf, lower, size);
if (!key_util::IncrementCell(column, buf, arena)) {
// If incrementing the lower bound fails then the predicate can match no
values.
- return ColumnPredicate::None(move(column));
- } else {
- lower = buf;
+ return ColumnPredicate::None(std::move(column));
}
+ lower = buf;
}
- return ColumnPredicate::Range(move(column), lower, upper);
+ return ColumnPredicate::Range(std::move(column), lower, upper);
}
ColumnPredicate ColumnPredicate::IsNotNull(ColumnSchema column) {
- return ColumnPredicate(PredicateType::IsNotNull, move(column), nullptr,
nullptr);
+ return ColumnPredicate(PredicateType::IsNotNull, std::move(column), nullptr,
nullptr);
}
ColumnPredicate ColumnPredicate::IsNull(ColumnSchema column) {
return column.is_nullable() ?
- ColumnPredicate(PredicateType::IsNull, move(column), nullptr,
nullptr) :
- None(move(column));
+ ColumnPredicate(PredicateType::IsNull, std::move(column), nullptr,
nullptr) :
+ None(std::move(column));
}
ColumnPredicate ColumnPredicate::None(ColumnSchema column) {
- return ColumnPredicate(PredicateType::None, move(column), nullptr, nullptr);
+ return ColumnPredicate(PredicateType::None, std::move(column), nullptr,
nullptr);
}
void ColumnPredicate::SetToNone() {
diff --git a/src/kudu/common/partition_pruner.cc
b/src/kudu/common/partition_pruner.cc
index af01a69ae..4a2a6e17b 100644
--- a/src/kudu/common/partition_pruner.cc
+++ b/src/kudu/common/partition_pruner.cc
@@ -51,7 +51,6 @@ using std::find;
using std::iota;
using std::lower_bound;
using std::memcpy;
-using std::move;
using std::string;
using std::unique_ptr;
using std::unordered_map;
diff --git a/src/kudu/common/scan_spec.cc b/src/kudu/common/scan_spec.cc
index 3fdfaa837..c5e0b2e38 100644
--- a/src/kudu/common/scan_spec.cc
+++ b/src/kudu/common/scan_spec.cc
@@ -46,7 +46,6 @@
using std::any_of;
using std::max;
-using std::move;
using std::pair;
using std::string;
using std::unordered_set;
@@ -61,7 +60,7 @@ void ScanSpec::AddPredicate(ColumnPredicate pred) {
predicate->Merge(pred);
} else {
string column_name = pred.column().name();
- predicates_.emplace(move(column_name), move(pred));
+ predicates_.emplace(std::move(column_name), std::move(pred));
}
}
@@ -341,7 +340,7 @@ void ScanSpec::LiftPrimaryKeyBounds(const Schema& schema,
Arena* arena) {
lower_bound_key_->raw_keys()[col_idx + 1],
nullptr));
}
- AddPredicate(move(predicate));
+ AddPredicate(std::move(predicate));
} else {
auto pred = ColumnPredicate::InclusiveRange(column, lower, upper,
arena);
if (pred) AddPredicate(*pred);
diff --git a/src/kudu/hms/hms_catalog.cc b/src/kudu/hms/hms_catalog.cc
index 4570dd26e..db6060423 100644
--- a/src/kudu/hms/hms_catalog.cc
+++ b/src/kudu/hms/hms_catalog.cc
@@ -49,7 +49,6 @@
#include "kudu/util/thread.h"
using std::optional;
-using std::move;
using std::string;
using std::vector;
using strings::Substitute;
diff --git a/src/kudu/integration-tests/master_authz-itest.cc
b/src/kudu/integration-tests/master_authz-itest.cc
index 1137c3381..22ae078be 100644
--- a/src/kudu/integration-tests/master_authz-itest.cc
+++ b/src/kudu/integration-tests/master_authz-itest.cc
@@ -82,7 +82,6 @@ using kudu::rpc::RpcController;
using kudu::rpc::UserCredentials;
using kudu::transactions::TxnSystemClient;
using std::function;
-using std::move;
using std::nullopt;
using std::optional;
using std::ostream;
@@ -393,7 +392,7 @@ class RangerITestHarness : public MasterAuthzITestHarness {
// IsCreateTableDone() requires METADATA on the table level.
policy.tables.emplace_back("*");
policy.items.emplace_back(PolicyItem({p.user_name}, {ActionPB::CREATE},
false));
- ASSERT_OK(ranger_->AddPolicy(move(policy)));
+ ASSERT_OK(ranger_->AddPolicy(std::move(policy)));
NO_FATALS(RefreshAuthzPolicies(cluster));
}
@@ -403,7 +402,7 @@ class RangerITestHarness : public MasterAuthzITestHarness {
policy.databases.emplace_back(p.db_name);
policy.tables.emplace_back(p.table_name);
policy.items.emplace_back(PolicyItem({p.user_name}, {ActionPB::DROP},
false));
- ASSERT_OK(ranger_->AddPolicy(move(policy)));
+ ASSERT_OK(ranger_->AddPolicy(std::move(policy)));
NO_FATALS(RefreshAuthzPolicies(cluster));
}
@@ -420,7 +419,7 @@ class RangerITestHarness : public MasterAuthzITestHarness {
policy.databases.emplace_back(p.db_name);
policy.tables.emplace_back(p.table_name);
policy.items.emplace_back(PolicyItem({p.user_name}, {ActionPB::ALTER},
false));
- ASSERT_OK(ranger_->AddPolicy(move(policy)));
+ ASSERT_OK(ranger_->AddPolicy(std::move(policy)));
NO_FATALS(RefreshAuthzPolicies(cluster));
}
@@ -431,7 +430,7 @@ class RangerITestHarness : public MasterAuthzITestHarness {
policy.databases.emplace_back(p.db_name);
policy.tables.emplace_back(p.table_name);
policy.items.emplace_back(PolicyItem({p.user_name}, {ActionPB::ALTER},
true));
- ASSERT_OK(ranger_->AddPolicy(move(policy)));
+ ASSERT_OK(ranger_->AddPolicy(std::move(policy)));
NO_FATALS(RefreshAuthzPolicies(cluster));
}
@@ -442,13 +441,13 @@ class RangerITestHarness : public MasterAuthzITestHarness
{
// IsCreateTableDone() requires METADATA on the table level.
policy_new_table.tables.emplace_back("*");
policy_new_table.items.emplace_back(PolicyItem({p.user_name},
{ActionPB::CREATE}, false));
- ASSERT_OK(ranger_->AddPolicy(move(policy_new_table)));
+ ASSERT_OK(ranger_->AddPolicy(std::move(policy_new_table)));
AuthorizationPolicy policy;
policy.databases.emplace_back(p.db_name);
policy.tables.emplace_back(p.table_name);
policy.items.emplace_back(PolicyItem({p.user_name}, {ActionPB::ALL},
false));
- ASSERT_OK(ranger_->AddPolicy(move(policy)));
+ ASSERT_OK(ranger_->AddPolicy(std::move(policy)));
NO_FATALS(RefreshAuthzPolicies(cluster));
}
@@ -458,7 +457,7 @@ class RangerITestHarness : public MasterAuthzITestHarness {
AuthorizationPolicy policy;
policy.databases.emplace_back(p.db_name);
policy.items.emplace_back(PolicyItem({p.user_name}, {ActionPB::METADATA},
false));
- ASSERT_OK(ranger_->AddPolicy(move(policy)));
+ ASSERT_OK(ranger_->AddPolicy(std::move(policy)));
NO_FATALS(RefreshAuthzPolicies(cluster));
}
@@ -468,7 +467,7 @@ class RangerITestHarness : public MasterAuthzITestHarness {
policy.databases.emplace_back(p.db_name);
policy.tables.emplace_back(p.table_name);
policy.items.emplace_back(PolicyItem({p.user_name}, {ActionPB::METADATA},
false));
- ASSERT_OK(ranger_->AddPolicy(move(policy)));
+ ASSERT_OK(ranger_->AddPolicy(std::move(policy)));
NO_FATALS(RefreshAuthzPolicies(cluster));
}
@@ -478,7 +477,7 @@ class RangerITestHarness : public MasterAuthzITestHarness {
policy.databases.emplace_back(p.db_name);
policy.tables.emplace_back(p.table_name);
policy.items.emplace_back(PolicyItem({p.user_name}, {ActionPB::ALL},
false));
- ASSERT_OK(ranger_->AddPolicy(move(policy)));
+ ASSERT_OK(ranger_->AddPolicy(std::move(policy)));
NO_FATALS(RefreshAuthzPolicies(cluster));
}
@@ -487,12 +486,12 @@ class RangerITestHarness : public MasterAuthzITestHarness
{
AuthorizationPolicy db_policy;
db_policy.databases.emplace_back(p.db_name);
db_policy.items.emplace_back(PolicyItem({p.user_name}, {ActionPB::ALL},
false));
- ASSERT_OK(ranger_->AddPolicy(move(db_policy)));
+ ASSERT_OK(ranger_->AddPolicy(std::move(db_policy)));
AuthorizationPolicy tbl_policy;
tbl_policy.databases.emplace_back(p.db_name);
tbl_policy.tables.emplace_back("*");
tbl_policy.items.emplace_back(PolicyItem({p.user_name}, {ActionPB::ALL},
false));
- ASSERT_OK(ranger_->AddPolicy(move(tbl_policy)));
+ ASSERT_OK(ranger_->AddPolicy(std::move(tbl_policy)));
NO_FATALS(RefreshAuthzPolicies(cluster));
}
@@ -502,7 +501,7 @@ class RangerITestHarness : public MasterAuthzITestHarness {
policy.databases.emplace_back(p.db_name);
policy.tables.emplace_back(p.table_name);
policy.items.emplace_back(PolicyItem({p.user_name}, {ActionPB::ALL},
true));
- ASSERT_OK(ranger_->AddPolicy(move(policy)));
+ ASSERT_OK(ranger_->AddPolicy(std::move(policy)));
NO_FATALS(RefreshAuthzPolicies(cluster));
}
@@ -512,12 +511,12 @@ class RangerITestHarness : public MasterAuthzITestHarness
{
AuthorizationPolicy db_policy;
db_policy.databases.emplace_back(p.db_name);
db_policy.items.emplace_back(PolicyItem({p.user_name}, {ActionPB::ALL},
true));
- ASSERT_OK(ranger_->AddPolicy(move(db_policy)));
+ ASSERT_OK(ranger_->AddPolicy(std::move(db_policy)));
AuthorizationPolicy tbl_policy;
tbl_policy.databases.emplace_back(p.db_name);
tbl_policy.tables.emplace_back("*");
tbl_policy.items.emplace_back(PolicyItem({p.user_name}, {ActionPB::ALL},
true));
- ASSERT_OK(ranger_->AddPolicy(move(tbl_policy)));
+ ASSERT_OK(ranger_->AddPolicy(std::move(tbl_policy)));
NO_FATALS(RefreshAuthzPolicies(cluster));
}
@@ -555,7 +554,7 @@ class RangerITestHarness : public MasterAuthzITestHarness {
policy.databases.emplace_back(kDatabaseName);
policy.tables.emplace_back("*");
policy.items.emplace_back(PolicyItem({kAdminUser}, {ActionPB::ALL}, true));
- return ranger_->AddPolicy(move(policy));
+ return ranger_->AddPolicy(std::move(policy));
}
private:
diff --git a/src/kudu/ranger/ranger_client-test.cc
b/src/kudu/ranger/ranger_client-test.cc
index 4b2e02c44..0208bed63 100644
--- a/src/kudu/ranger/ranger_client-test.cc
+++ b/src/kudu/ranger/ranger_client-test.cc
@@ -25,7 +25,7 @@
#include <utility>
#include <vector>
-#include <boost/container_hash/extensions.hpp>
+#include <boost/container_hash/hash.hpp>
#include <gflags/gflags_declare.h>
#include <glog/logging.h>
#include <google/protobuf/any.pb.h>
@@ -66,7 +66,6 @@ using kudu::subprocess::SubprocessMetrics;
using kudu::subprocess::SubprocessRequestPB;
using kudu::subprocess::SubprocessResponsePB;
using kudu::subprocess::SubprocessServer;
-using std::move;
using std::string;
using std::unordered_map;
using std::unordered_set;
@@ -162,11 +161,11 @@ class RangerClientTest : public KuduTest {
void Allow(string user_name, ActionPB action, string database_name,
string table_name, string column_name = "") {
AuthorizedAction authorized_action;
- authorized_action.user_name = move(user_name);
+ authorized_action.user_name = std::move(user_name);
authorized_action.action = action;
- authorized_action.database_name = move(database_name);
- authorized_action.table_name = move(table_name);
- authorized_action.column_name = move(column_name);
+ authorized_action.database_name = std::move(database_name);
+ authorized_action.table_name = std::move(table_name);
+ authorized_action.column_name = std::move(column_name);
next_response_->emplace(authorized_action);
}
diff --git a/src/kudu/ranger/ranger_client.cc b/src/kudu/ranger/ranger_client.cc
index da79fe96d..d931c4562 100644
--- a/src/kudu/ranger/ranger_client.cc
+++ b/src/kudu/ranger/ranger_client.cc
@@ -186,7 +186,6 @@ namespace ranger {
using kudu::security::GetKrb5ConfigFile;
using kudu::subprocess::SubprocessMetrics;
using kudu::subprocess::SubprocessServer;
-using std::move;
using std::pair;
using std::string;
using std::unique_ptr;
@@ -493,11 +492,11 @@ Status RangerClient::AuthorizeActionMultipleColumns(const
string& user_name, con
unordered_set<string> allowed_columns;
for (auto i = 0; i < req_list.requests_size(); ++i) {
if (resp_list.responses(i).allowed()) {
- EmplaceOrDie(&allowed_columns, move(req_list.requests(i).column()));
+ EmplaceOrDie(&allowed_columns, req_list.requests(i).column());
}
}
- *column_names = move(allowed_columns);
+ *column_names = std::move(allowed_columns);
return Status::OK();
}
@@ -537,11 +536,11 @@ Status RangerClient::AuthorizeActionMultipleTables(const
string& user_name, cons
unordered_map<string, bool> allowed_tables;
for (auto i = 0; i < orig_table_names.size(); ++i) {
if (resp_list.responses(i).allowed()) {
- EmplaceOrDie(&allowed_tables, move(orig_table_names[i]));
+ EmplaceOrDie(&allowed_tables, std::move(orig_table_names[i]));
}
}
- *tables = move(allowed_tables);
+ *tables = std::move(allowed_tables);
return Status::OK();
}
@@ -574,11 +573,11 @@ Status RangerClient::AuthorizeActions(const string&
user_name, const string& dat
unordered_set<ActionPB, ActionHash> allowed_actions;
for (auto i = 0; i < req_list.requests_size(); ++i) {
if (resp_list.responses(i).allowed()) {
- EmplaceOrDie(&allowed_actions, move(req_list.requests(i).action()));
+ EmplaceOrDie(&allowed_actions, req_list.requests(i).action());
}
}
- *actions = move(allowed_actions);
+ *actions = std::move(allowed_actions);
return Status::OK();
}
diff --git a/src/kudu/rpc/outbound_call.cc b/src/kudu/rpc/outbound_call.cc
index 151195fb5..60145981c 100644
--- a/src/kudu/rpc/outbound_call.cc
+++ b/src/kudu/rpc/outbound_call.cc
@@ -169,7 +169,7 @@ void RequestPayload::PopulateRequestPayload(const Message&
req,
vector<unique_ptr<RpcSidecar>>&& sidecars) {
DCHECK_EQ(-1, sidecar_byte_size_);
- sidecars_ = move(sidecars);
+ sidecars_ = std::move(sidecars);
DCHECK_LE(sidecars_.size(), TransferLimits::kMaxSidecars);
// Compute total size of sidecar payload so that extra space can be reserved
as part of
diff --git a/src/kudu/rpc/result_tracker.cc b/src/kudu/rpc/result_tracker.cc
index 7d2c3fe3c..fa5c048a6 100644
--- a/src/kudu/rpc/result_tracker.cc
+++ b/src/kudu/rpc/result_tracker.cc
@@ -67,7 +67,6 @@ using kudu::pb_util::SecureDebugString;
using kudu::pb_util::SecureShortDebugString;
using rpc::InboundCall;
using std::make_pair;
-using std::move;
using std::lock_guard;
using std::pair;
using std::shared_ptr;
diff --git a/src/kudu/security/ca/cert_management.cc
b/src/kudu/security/ca/cert_management.cc
index 26debcb84..a8dc8ae08 100644
--- a/src/kudu/security/ca/cert_management.cc
+++ b/src/kudu/security/ca/cert_management.cc
@@ -23,12 +23,12 @@
#include <openssl/x509.h>
#include <openssl/x509v3.h>
-#include <algorithm>
#include <cstdio>
#include <functional>
#include <memory>
#include <mutex>
#include <string>
+#include <utility>
#include <glog/logging.h>
@@ -40,7 +40,6 @@
#include "kudu/util/status.h"
using std::lock_guard;
-using std::move;
using std::string;
using strings::Substitute;
diff --git a/src/kudu/security/ca/cert_management.h
b/src/kudu/security/ca/cert_management.h
index 12549e6f7..be7fa88a6 100644
--- a/src/kudu/security/ca/cert_management.h
+++ b/src/kudu/security/ca/cert_management.h
@@ -23,7 +23,6 @@
#include <openssl/x509.h>
#include <cstdint>
-#include <memory>
#include <optional>
#include <string>
@@ -33,8 +32,8 @@
#include "kudu/gutil/port.h"
#include "kudu/gutil/strings/stringpiece.h"
#include "kudu/util/locks.h"
-#include "kudu/util/openssl_util.h"
#include "kudu/util/monotime.h"
+#include "kudu/util/openssl_util.h"
#include "kudu/util/status.h"
// Forward declarations for the relevant OpenSSL typedefs
diff --git a/src/kudu/tools/tool_action_fs.cc b/src/kudu/tools/tool_action_fs.cc
index 8085d821c..29b020fc1 100644
--- a/src/kudu/tools/tool_action_fs.cc
+++ b/src/kudu/tools/tool_action_fs.cc
@@ -162,7 +162,6 @@ using kudu::tablet::TabletDataState;
using kudu::tablet::TabletMetadata;
using std::cout;
using std::endl;
-using std::move;
using std::nullopt;
using std::optional;
using std::shared_ptr;
diff --git a/src/kudu/tools/tool_action_local_replica.cc
b/src/kudu/tools/tool_action_local_replica.cc
index 012f72850..2449db455 100644
--- a/src/kudu/tools/tool_action_local_replica.cc
+++ b/src/kudu/tools/tool_action_local_replica.cc
@@ -194,7 +194,6 @@ using kudu::tserver::TSTabletManager;
using std::cout;
using std::endl;
using std::map;
-using std::move;
using std::pair;
using std::shared_ptr;
using std::set;
@@ -257,10 +256,10 @@ class TabletCopier {
FsManager* dst_fs_manager,
scoped_refptr<ConsensusMetadataManager> dst_cmeta_manager,
HostPort source_addr) :
- tablet_ids_to_copy_(move(tablet_ids_to_copy)),
+ tablet_ids_to_copy_(std::move(tablet_ids_to_copy)),
dst_fs_manager_(dst_fs_manager),
- dst_cmeta_manager_(move(dst_cmeta_manager)),
- source_addr_(move(source_addr)),
+ dst_cmeta_manager_(std::move(dst_cmeta_manager)),
+ source_addr_(std::move(source_addr)),
copy_type_(CopyType::FROM_REMOTE) {
}
@@ -269,11 +268,11 @@ class TabletCopier {
scoped_refptr<ConsensusMetadataManager> dst_cmeta_manager,
FsManager* src_fs_manager,
set<string> src_tablet_ids_set) :
- tablet_ids_to_copy_(move(tablet_ids_to_copy)),
+ tablet_ids_to_copy_(std::move(tablet_ids_to_copy)),
dst_fs_manager_(dst_fs_manager),
- dst_cmeta_manager_(move(dst_cmeta_manager)),
- src_fs_manager_(move(src_fs_manager)),
- src_tablet_ids_set_(move(src_tablet_ids_set)),
+ dst_cmeta_manager_(std::move(dst_cmeta_manager)),
+ src_fs_manager_(src_fs_manager),
+ src_tablet_ids_set_(std::move(src_tablet_ids_set)),
copy_type_(CopyType::FROM_LOCAL) {
}
@@ -753,7 +752,10 @@ Status CopyFromRemote(const RunnerContext& context) {
RETURN_NOT_OK(fs_manager.Open());
scoped_refptr<ConsensusMetadataManager> cmeta_manager(new
ConsensusMetadataManager(&fs_manager));
- TabletCopier copier(move(tablet_ids_to_copy), &fs_manager,
move(cmeta_manager), move(hp));
+ TabletCopier copier(std::move(tablet_ids_to_copy),
+ &fs_manager,
+ std::move(cmeta_manager),
+ std::move(hp));
return copier.CopyTablets();
}
@@ -787,11 +789,11 @@ Status CopyFromLocal(const RunnerContext& context) {
RETURN_NOT_OK(src_fs_manager.ListTabletIds(&src_tablet_ids));
set<string> src_tablet_ids_set(src_tablet_ids.begin(), src_tablet_ids.end());
- TabletCopier copier(move(tablet_ids_to_copy),
+ TabletCopier copier(std::move(tablet_ids_to_copy),
&dst_fs_manager,
- move(dst_cmeta_manager),
+ std::move(dst_cmeta_manager),
&src_fs_manager,
- move(src_tablet_ids_set));
+ std::move(src_tablet_ids_set));
return copier.CopyTablets();
}
diff --git a/src/kudu/util/block_bloom_filter-test.cc
b/src/kudu/util/block_bloom_filter-test.cc
index 9dcb934b7..6f5c43e18 100644
--- a/src/kudu/util/block_bloom_filter-test.cc
+++ b/src/kudu/util/block_bloom_filter-test.cc
@@ -67,7 +67,7 @@ class BlockBloomFilterTest : public KuduTest {
unique_ptr<BlockBloomFilter> bf(new BlockBloomFilter(allocator_));
CHECK_OK(bf->Init(log_space_bytes, FAST_HASH, 0));
- bloom_filters_.emplace_back(move(bf));
+ bloom_filters_.emplace_back(std::move(bf));
return bloom_filters_.back().get();
}
