This is an automated email from the ASF dual-hosted git repository. adar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/kudu.git
commit 37bda7be50f5b0e280612c3dfa0cf10bd8cb6dcf Author: Adar Dembo <[email protected]> AuthorDate: Mon Mar 30 11:40:31 2020 -0700 Remove return types from various lambdas Only the ones that were absolutely necessary (i.e. for implicit conversions) were retained. Change-Id: Idb6cb2570121d47dee15d9e63b677126c30de4f9 Reviewed-on: http://gerrit.cloudera.org:8080/15599 Tested-by: Adar Dembo <[email protected]> Reviewed-by: Bankim Bhavsar <[email protected]> Reviewed-by: Andrew Wong <[email protected]> Reviewed-by: Alexey Serbin <[email protected]> --- src/kudu/client/client.cc | 2 +- src/kudu/fs/block_manager-test.cc | 4 +-- src/kudu/fs/log_block_manager-test.cc | 2 +- src/kudu/fs/log_block_manager.cc | 2 +- src/kudu/hms/hms_client-test.cc | 2 +- src/kudu/integration-tests/all_types-itest.cc | 2 +- src/kudu/integration-tests/alter_table-test.cc | 10 +++---- src/kudu/integration-tests/create-table-itest.cc | 4 +-- .../master_cert_authority-itest.cc | 2 +- .../integration-tests/tablet_history_gc-itest.cc | 2 +- .../integration-tests/ts_tablet_manager-itest.cc | 4 +-- src/kudu/master/catalog_manager.cc | 2 +- src/kudu/master/master-test.cc | 2 +- src/kudu/sentry/sentry_client-test.cc | 4 +-- src/kudu/tablet/rowset_tree-test.cc | 2 +- src/kudu/tablet/tablet_bootstrap.cc | 2 +- src/kudu/tablet/tablet_history_gc-test.cc | 2 +- src/kudu/tools/ksck.cc | 2 +- src/kudu/tools/kudu-admin-test.cc | 4 +-- src/kudu/tools/kudu-tool-test.cc | 2 +- src/kudu/tools/tool_action_common.cc | 2 +- src/kudu/tools/tool_action_perf.cc | 2 +- src/kudu/tools/tool_action_table.cc | 3 +- src/kudu/tserver/tablet_server-test.cc | 34 +++++++++++----------- src/kudu/util/env_posix.cc | 4 +-- src/kudu/util/threadpool-test.cc | 2 +- src/kudu/util/trace.h | 2 +- 27 files changed, 53 insertions(+), 54 deletions(-) diff --git a/src/kudu/client/client.cc b/src/kudu/client/client.cc index e602eb6..571844a 100644 --- a/src/kudu/client/client.cc +++ b/src/kudu/client/client.cc @@ -551,7 +551,7 @@ Status KuduClient::GetTablet(const string& tablet_id, KuduTablet** tablet) { auto add_replica_func = [](const TSInfoPB& ts_info, const RaftPeerPB::Role role, - vector<const KuduReplica*>* replicas) -> Status { + vector<const KuduReplica*>* replicas) { if (ts_info.rpc_addresses_size() == 0) { return Status::IllegalState(Substitute( "No RPC addresses found for tserver $0", diff --git a/src/kudu/fs/block_manager-test.cc b/src/kudu/fs/block_manager-test.cc index 1aca697..a29b730 100644 --- a/src/kudu/fs/block_manager-test.cc +++ b/src/kudu/fs/block_manager-test.cc @@ -941,7 +941,7 @@ TYPED_TEST(BlockManagerTest, TestMetadataOkayDespiteFailure) { // Creates a block with the given 'test_data', writing the result // to 'out' on success. - auto create_a_block = [&](BlockId* out, const string& test_data) -> Status { + auto create_a_block = [&](BlockId* out, const string& test_data) { unique_ptr<WritableBlock> block; RETURN_NOT_OK(this->bm_->CreateBlock(this->test_block_opts_, &block)); for (int i = 0; i < kNumAppends; i++) { @@ -957,7 +957,7 @@ TYPED_TEST(BlockManagerTest, TestMetadataOkayDespiteFailure) { // Reads a block given by 'id', comparing its contents. Note that // we need to compare with both kLongTestData and kShortTestData as we // do not know the blocks' content ahead. - auto read_a_block = [&](const BlockId& id) -> Status { + auto read_a_block = [&](const BlockId& id) { unique_ptr<ReadableBlock> block; RETURN_NOT_OK(this->bm_->OpenBlock(id, &block)); uint64_t size; diff --git a/src/kudu/fs/log_block_manager-test.cc b/src/kudu/fs/log_block_manager-test.cc index 37c13ec..0bf9cd3 100644 --- a/src/kudu/fs/log_block_manager-test.cc +++ b/src/kudu/fs/log_block_manager-test.cc @@ -1131,7 +1131,7 @@ TEST_F(LogBlockManagerTest, TestContainerBlockLimiting) { const int kNumBlocks = 1000; // Creates 'kNumBlocks' blocks with minimal data. - auto create_some_blocks = [&]() -> Status { + auto create_some_blocks = [&]() { for (int i = 0; i < kNumBlocks; i++) { unique_ptr<WritableBlock> block; RETURN_NOT_OK(bm_->CreateBlock(test_block_opts_, &block)); diff --git a/src/kudu/fs/log_block_manager.cc b/src/kudu/fs/log_block_manager.cc index 945d53f..eb47b08 100644 --- a/src/kudu/fs/log_block_manager.cc +++ b/src/kudu/fs/log_block_manager.cc @@ -1099,7 +1099,7 @@ Status LogBlockContainer::ProcessRecord( Status LogBlockContainer::DoCloseBlocks(const vector<LogWritableBlock*>& blocks, SyncMode mode) { - auto sync_blocks = [&]() -> Status { + auto sync_blocks = [&]() { if (mode == SYNC) { VLOG(3) << "Syncing data file " << data_file_->filename(); RETURN_NOT_OK(SyncData()); diff --git a/src/kudu/hms/hms_client-test.cc b/src/kudu/hms/hms_client-test.cc index 6343427..b2555bf 100644 --- a/src/kudu/hms/hms_client-test.cc +++ b/src/kudu/hms/hms_client-test.cc @@ -400,7 +400,7 @@ TEST_F(HmsClientTest, TestHmsConnect) { // client. options.verify_service_config = true; - auto start_client = [&options] (Sockaddr addr) -> Status { + auto start_client = [&options] (Sockaddr addr) { HmsClient client(HostPort(addr), options); return client.Start(); }; diff --git a/src/kudu/integration-tests/all_types-itest.cc b/src/kudu/integration-tests/all_types-itest.cc index 6362589..3b0b9d5 100644 --- a/src/kudu/integration-tests/all_types-itest.cc +++ b/src/kudu/integration-tests/all_types-itest.cc @@ -677,7 +677,7 @@ TYPED_TEST(AllTypesItest, TestAllKeyTypes) { TYPED_TEST(AllTypesItest, TestTimestampPadding) { vector<string> projection; this->SetupProjection(&projection); - auto scanner_setup = [&](KuduScanner* scanner) -> Status { + auto scanner_setup = [&](KuduScanner* scanner) { // Each time this function is called we shuffle the projection to get the chance // of having timestamps in different places of the projection and before/after // different types. diff --git a/src/kudu/integration-tests/alter_table-test.cc b/src/kudu/integration-tests/alter_table-test.cc index 1a40a8b..714e923 100644 --- a/src/kudu/integration-tests/alter_table-test.cc +++ b/src/kudu/integration-tests/alter_table-test.cc @@ -1776,7 +1776,7 @@ TEST_F(AlterTableTest, TestAddRangePartitionConflictExhaustive) { ->wait(true)->Alter()); // Turns an optional value into a row for the table. - auto fill_row = [&] (boost::optional<int32_t> value) -> unique_ptr<KuduPartialRow> { + auto fill_row = [&] (boost::optional<int32_t> value) { unique_ptr<KuduPartialRow> row(schema_.NewRow()); if (value) { CHECK_OK(row->SetInt32("c0", *value)); @@ -1786,7 +1786,7 @@ TEST_F(AlterTableTest, TestAddRangePartitionConflictExhaustive) { // Attempts to add a range partition to the table with the specified bounds. auto add_range_partition = [&] (boost::optional<int32_t> lower_bound, - boost::optional<int32_t> upper_bound) -> Status { + boost::optional<int32_t> upper_bound) { table_alterer.reset(client_->NewTableAlterer(table_name)); return table_alterer->AddRangePartition(fill_row(lower_bound).release(), fill_row(upper_bound).release()) @@ -1796,7 +1796,7 @@ TEST_F(AlterTableTest, TestAddRangePartitionConflictExhaustive) { // Attempts to drop a range partition to the table with the specified bounds. auto drop_range_partition = [&] (boost::optional<int32_t> lower_bound, - boost::optional<int32_t> upper_bound) -> Status { + boost::optional<int32_t> upper_bound) { table_alterer.reset(client_->NewTableAlterer(table_name)); return table_alterer->DropRangePartition(fill_row(lower_bound).release(), fill_row(upper_bound).release()) @@ -1808,7 +1808,7 @@ TEST_F(AlterTableTest, TestAddRangePartitionConflictExhaustive) { auto add_range_partitions = [&] (boost::optional<int32_t> a_lower_bound, boost::optional<int32_t> a_upper_bound, boost::optional<int32_t> b_lower_bound, - boost::optional<int32_t> b_upper_bound) -> Status { + boost::optional<int32_t> b_upper_bound) { table_alterer.reset(client_->NewTableAlterer(table_name)); return table_alterer->AddRangePartition(fill_row(a_lower_bound).release(), fill_row(a_upper_bound).release()) @@ -1822,7 +1822,7 @@ TEST_F(AlterTableTest, TestAddRangePartitionConflictExhaustive) { auto add_drop_range_partitions = [&] (boost::optional<int32_t> a_lower_bound, boost::optional<int32_t> a_upper_bound, boost::optional<int32_t> b_lower_bound, - boost::optional<int32_t> b_upper_bound) -> Status { + boost::optional<int32_t> b_upper_bound) { table_alterer.reset(client_->NewTableAlterer(table_name)); return table_alterer->AddRangePartition(fill_row(a_lower_bound).release(), fill_row(a_upper_bound).release()) diff --git a/src/kudu/integration-tests/create-table-itest.cc b/src/kudu/integration-tests/create-table-itest.cc index 9042252..dce0bd3 100644 --- a/src/kudu/integration-tests/create-table-itest.cc +++ b/src/kudu/integration-tests/create-table-itest.cc @@ -280,7 +280,7 @@ TEST_F(CreateTableITest, TestSpreadReplicasEvenlyWithDimension) { const string& table_name, int32_t range_lower_bound, int32_t range_upper_bound, - const string& dimension_label) -> Status { + const string& dimension_label) { unique_ptr<client::KuduTableCreator> table_creator(client->NewTableCreator()); unique_ptr<KuduPartialRow> lower_bound(client_schema->NewRow()); RETURN_NOT_OK(lower_bound->SetInt32("key2", range_lower_bound)); @@ -301,7 +301,7 @@ TEST_F(CreateTableITest, TestSpreadReplicasEvenlyWithDimension) { const string& table_name, int32_t range_lower_bound, int32_t range_upper_bound, - const string& dimension_label) -> Status { + const string& dimension_label) { unique_ptr<client::KuduTableAlterer> table_alterer(client->NewTableAlterer(table_name)); unique_ptr<KuduPartialRow> lower_bound(client_schema->NewRow()); RETURN_NOT_OK(lower_bound->SetInt32("key2", range_lower_bound)); diff --git a/src/kudu/integration-tests/master_cert_authority-itest.cc b/src/kudu/integration-tests/master_cert_authority-itest.cc index 29fcde9..f933fb3 100644 --- a/src/kudu/integration-tests/master_cert_authority-itest.cc +++ b/src/kudu/integration-tests/master_cert_authority-itest.cc @@ -376,7 +376,7 @@ class ConnectToClusterBaseTest : public KuduTest { builder.default_rpc_timeout(timeout); client::sp::shared_ptr<KuduClient> client; ASSERT_OK(cluster_->CreateClient(&builder, &client)); - ASSERT_EQ(1, client->data_->messenger_-> tls_context().trusted_cert_count_for_tests()); + ASSERT_EQ(1, client->data_->messenger_->tls_context().trusted_cert_count_for_tests()); ASSERT_NE(boost::none, client->data_->messenger_->authn_token()); } diff --git a/src/kudu/integration-tests/tablet_history_gc-itest.cc b/src/kudu/integration-tests/tablet_history_gc-itest.cc index 1f5b684..c9a7d81 100644 --- a/src/kudu/integration-tests/tablet_history_gc-itest.cc +++ b/src/kudu/integration-tests/tablet_history_gc-itest.cc @@ -141,7 +141,7 @@ TEST_F(TabletHistoryGcITest, TestSnapshotScanBeforeAHM) { TestWorkload workload(cluster_.get()); workload.Setup(); - auto open_scanner_func = [](KuduClient* client) -> Status { + auto open_scanner_func = [](KuduClient* client) { shared_ptr<KuduTable> table; RETURN_NOT_OK(client->OpenTable(TestWorkload::kDefaultTableName, &table)); KuduScanner scanner(table.get()); diff --git a/src/kudu/integration-tests/ts_tablet_manager-itest.cc b/src/kudu/integration-tests/ts_tablet_manager-itest.cc index 859295b..b03a011 100644 --- a/src/kudu/integration-tests/ts_tablet_manager-itest.cc +++ b/src/kudu/integration-tests/ts_tablet_manager-itest.cc @@ -717,7 +717,7 @@ TEST_F(TsTabletManagerITest, TestTableStats) { FLAGS_raft_heartbeat_interval_ms * FLAGS_leader_failure_max_missed_heartbeat_periods; // Get the LEADER master. - const auto GetLeaderMaster = [&] () -> Master* { + const auto GetLeaderMaster = [&] () { int idx = 0; Master* master = nullptr; Status s = cluster_->GetLeaderMasterIndex(&idx); @@ -727,7 +727,7 @@ TEST_F(TsTabletManagerITest, TestTableStats) { return CHECK_NOTNULL(master); }; // Get the LEADER master's service proxy. - const auto GetLeaderMasterServiceProxy = [&] () -> shared_ptr<MasterServiceProxy> { + const auto GetLeaderMasterServiceProxy = [&]() { const auto& addr = GetLeaderMaster()->first_rpc_address(); shared_ptr<MasterServiceProxy> proxy( new MasterServiceProxy(client_messenger_, addr, addr.host())); diff --git a/src/kudu/master/catalog_manager.cc b/src/kudu/master/catalog_manager.cc index 19218ce..4ddf84c 100644 --- a/src/kudu/master/catalog_manager.cc +++ b/src/kudu/master/catalog_manager.cc @@ -1303,7 +1303,7 @@ Status CatalogManager::VisitTablesAndTablets() { Status CatalogManager::InitSysCatalogAsync(bool is_first_run) { std::lock_guard<LockType> l(lock_); unique_ptr<SysCatalogTable> new_catalog(new SysCatalogTable( - master_, [this]() -> Status { return this->ElectedAsLeaderCb(); })); + master_, [this]() { return this->ElectedAsLeaderCb(); })); if (is_first_run) { RETURN_NOT_OK(new_catalog->CreateNew(master_->fs_manager())); } else { diff --git a/src/kudu/master/master-test.cc b/src/kudu/master/master-test.cc index 56434ce..52b8037 100644 --- a/src/kudu/master/master-test.cc +++ b/src/kudu/master/master-test.cc @@ -2012,7 +2012,7 @@ TEST_P(AuthzTokenMasterTest, TestGenerateAuthzTokens) { FLAGS_master_support_authz_tokens = supports_authz; const char* kTableName = "testtb"; const Schema kTableSchema({ ColumnSchema("key", INT32) }, 1); - const auto send_req = [&] (GetTableSchemaResponsePB* resp) -> Status { + const auto send_req = [&] (GetTableSchemaResponsePB* resp) { RpcController rpc; GetTableSchemaRequestPB req; req.mutable_table()->set_table_name(kTableName); diff --git a/src/kudu/sentry/sentry_client-test.cc b/src/kudu/sentry/sentry_client-test.cc index a284568..c548473 100644 --- a/src/kudu/sentry/sentry_client-test.cc +++ b/src/kudu/sentry/sentry_client-test.cc @@ -72,8 +72,8 @@ TEST_P(SentryClientTest, TestMiniSentryLifecycle) { ASSERT_OK(client.Start(vector<HostPort>({sentry_->address()}), sentry_client_opts)); - auto smoketest = [&]() -> Status { - return client.Execute([](SentryClient* client) -> Status { + auto smoketest = [&]() { + return client.Execute([](SentryClient* client) { TCreateSentryRoleRequest create_req; create_req.requestorUserName = "test-admin"; create_req.roleName = "test-role"; diff --git a/src/kudu/tablet/rowset_tree-test.cc b/src/kudu/tablet/rowset_tree-test.cc index 400f2dc..62e7281 100644 --- a/src/kudu/tablet/rowset_tree-test.cc +++ b/src/kudu/tablet/rowset_tree-test.cc @@ -219,7 +219,7 @@ TEST_F(TestRowSetTree, TestTreeRandomized) { BOUND_GREATER_EQUAL, BOUND_EQUAL }; - const auto& GetStringPair = [] (const BoundOperator op) -> std::pair<string, string> { + const auto& GetStringPair = [] (const BoundOperator op) { while (true) { string s1 = Substitute("$0", rand() % 100); string s2 = Substitute("$0", rand() % 100); diff --git a/src/kudu/tablet/tablet_bootstrap.cc b/src/kudu/tablet/tablet_bootstrap.cc index 7521d85..0d0f4e3 100644 --- a/src/kudu/tablet/tablet_bootstrap.cc +++ b/src/kudu/tablet/tablet_bootstrap.cc @@ -532,7 +532,7 @@ Status TabletBootstrap::Bootstrap(shared_ptr<Tablet>* rebuilt_tablet, auto cb = make_scoped_refptr(new FlushInflightsToLogCallback( rebuilt_tablet->get(), *rebuilt_log)); tablet_meta_->SetPreFlushCallback( - [cb]() -> Status { return cb->WaitForInflightsAndFlushLog(); }); + [cb]() { return cb->WaitForInflightsAndFlushLog(); }); } // This will cause any pending TabletMetadata flush to be executed. diff --git a/src/kudu/tablet/tablet_history_gc-test.cc b/src/kudu/tablet/tablet_history_gc-test.cc index b92ee85..049d774 100644 --- a/src/kudu/tablet/tablet_history_gc-test.cc +++ b/src/kudu/tablet/tablet_history_gc-test.cc @@ -137,7 +137,7 @@ class TabletHistoryGcTest : public TabletTestBase<IntKeyTestSetup<INT64>> { // Returns a functor that returns whether all rows have 'expected_val' for // their values. static TestRowVerifier GenRowsEqualVerifier(int32_t expected_val) { - return [=](int32_t /*key*/, int32_t val) -> bool { return val == expected_val; }; + return [=](int32_t /*key*/, int32_t val) { return val == expected_val; }; } const TestRowVerifier kRowsEqual0 = GenRowsEqualVerifier(0); const TestRowVerifier kRowsEqual1 = GenRowsEqualVerifier(1); diff --git a/src/kudu/tools/ksck.cc b/src/kudu/tools/ksck.cc index 32a2af5..971deb1 100644 --- a/src/kudu/tools/ksck.cc +++ b/src/kudu/tools/ksck.cc @@ -869,7 +869,7 @@ HealthCheckResult Ksck::VerifyTablet(const shared_ptr<KsckTablet>& tablet, tablet->id(), tablet->table()->name()); auto leader_it = std::find_if(tablet->replicas().cbegin(), tablet->replicas().cend(), - [](const shared_ptr<KsckTabletReplica>& r) -> bool { return r->is_leader(); }); + [](const shared_ptr<KsckTabletReplica>& r) { return r->is_leader(); }); boost::optional<string> leader_uuid; if (leader_it != tablet->replicas().cend()) { leader_uuid = (*leader_it)->ts_uuid(); diff --git a/src/kudu/tools/kudu-admin-test.cc b/src/kudu/tools/kudu-admin-test.cc index 4f6dde9..eae3b14 100644 --- a/src/kudu/tools/kudu-admin-test.cc +++ b/src/kudu/tools/kudu-admin-test.cc @@ -2509,7 +2509,7 @@ TEST_F(AdminCliTest, TestAddAndDropRangePartition) { const auto add_range_partition_using_CLI = [&] (const string& lower_bound_json, const string& upper_bound_json, const string& lower_bound_type, - const string& upper_bound_type) -> Status { + const string& upper_bound_type) { string error, out; Status s = RunKuduTool({ "table", @@ -2528,7 +2528,7 @@ TEST_F(AdminCliTest, TestAddAndDropRangePartition) { const auto drop_range_partition_using_CLI = [&] (const string& lower_bound_json, const string& upper_bound_json, const string& lower_bound_type, - const string& upper_bound_type) -> Status { + const string& upper_bound_type) { string error, out; Status s = RunKuduTool({ "table", diff --git a/src/kudu/tools/kudu-tool-test.cc b/src/kudu/tools/kudu-tool-test.cc index 6755183..4bc44c5 100644 --- a/src/kudu/tools/kudu-tool-test.cc +++ b/src/kudu/tools/kudu-tool-test.cc @@ -5333,7 +5333,7 @@ TEST_F(ToolTest, TestReplaceTablet) { ts = ts_map_[cluster_->tablet_server(i)->uuid()]; ASSERT_OK(ListRunningTabletIds(ts, kTimeout, &tablet_ids)); ASSERT_TRUE(std::none_of(tablet_ids.begin(), tablet_ids.end(), - [&](const string& tablet_id) -> bool { return tablet_id == old_tablet_id; })); + [&](const string& tablet_id) { return tablet_id == old_tablet_id; })); } }); diff --git a/src/kudu/tools/tool_action_common.cc b/src/kudu/tools/tool_action_common.cc index c725448..df71ca0 100644 --- a/src/kudu/tools/tool_action_common.cc +++ b/src/kudu/tools/tool_action_common.cc @@ -445,7 +445,7 @@ Status PrintServerFlags(const string& address, uint16_t default_port) { std::sort(flags.begin(), flags.end(), [](const GetFlagsResponsePB::Flag& left, - const GetFlagsResponsePB::Flag& right) -> bool { + const GetFlagsResponsePB::Flag& right) { return left.name() < right.name(); }); DataTable table({ "flag", "value", "default value?", "tags" }); diff --git a/src/kudu/tools/tool_action_perf.cc b/src/kudu/tools/tool_action_perf.cc index 4a88105..a8f6951 100644 --- a/src/kudu/tools/tool_action_perf.cc +++ b/src/kudu/tools/tool_action_perf.cc @@ -543,7 +543,7 @@ void GeneratorThread( client::sp::shared_ptr<KuduSession> session(client->NewSession()); int64_t idx = 0; - auto generator = [&]() -> Status { + auto generator = [&]() { const int64_t num_rows_per_gen = FLAGS_num_rows_per_thread; if (num_rows_per_gen == 0) { return Status::OK(); diff --git a/src/kudu/tools/tool_action_table.cc b/src/kudu/tools/tool_action_table.cc index c6552f4..006cc71 100644 --- a/src/kudu/tools/tool_action_table.cc +++ b/src/kudu/tools/tool_action_table.cc @@ -630,8 +630,7 @@ Status ModifyRangePartition(const RunnerContext& context, PartitionAction action const auto convert_bounds_type = [&] (const string& range_bound, const string& flags_range_bound_type, - KuduTableCreator::RangePartitionBound* range_bound_type) - -> Status { + KuduTableCreator::RangePartitionBound* range_bound_type) { string inclusive_bound = boost::iequals(flags_range_bound_type, "INCLUSIVE_BOUND") ? "INCLUSIVE_BOUND" : ""; string exclusive_bound = boost::iequals(flags_range_bound_type, "EXCLUSIVE_BOUND") ? diff --git a/src/kudu/tserver/tablet_server-test.cc b/src/kudu/tserver/tablet_server-test.cc index 65446cb..4c49e3f 100644 --- a/src/kudu/tserver/tablet_server-test.cc +++ b/src/kudu/tserver/tablet_server-test.cc @@ -302,11 +302,11 @@ TEST_F(TabletServerTest, TestGetFlags) { ASSERT_OK(proxy.GetFlags(req, &resp, &controller)); SCOPED_TRACE(SecureDebugString(resp)); EXPECT_TRUE(std::any_of(resp.flags().begin(), resp.flags().end(), - [](const server::GetFlagsResponsePB::Flag& flag) -> bool { + [](const server::GetFlagsResponsePB::Flag& flag) { return flag.name() == "log_dir"; })); EXPECT_TRUE(std::none_of(resp.flags().begin(), resp.flags().end(), - [](const server::GetFlagsResponsePB::Flag& flag) -> bool { + [](const server::GetFlagsResponsePB::Flag& flag) { return flag.name() == "help"; })); } @@ -318,15 +318,15 @@ TEST_F(TabletServerTest, TestGetFlags) { ASSERT_OK(proxy.GetFlags(req, &resp, &controller)); SCOPED_TRACE(SecureDebugString(resp)); EXPECT_TRUE(std::any_of(resp.flags().begin(), resp.flags().end(), - [](const server::GetFlagsResponsePB::Flag& flag) -> bool { + [](const server::GetFlagsResponsePB::Flag& flag) { return flag.name() == "log_dir"; })); EXPECT_TRUE(std::any_of(resp.flags().begin(), resp.flags().end(), - [](const server::GetFlagsResponsePB::Flag& flag) -> bool { + [](const server::GetFlagsResponsePB::Flag& flag) { return flag.name() == "help"; })); EXPECT_TRUE(std::any_of(resp.flags().begin(), resp.flags().end(), - [](const server::GetFlagsResponsePB::Flag& flag) -> bool { + [](const server::GetFlagsResponsePB::Flag& flag) { return flag.name() == "logemaillevel"; })); } @@ -338,15 +338,15 @@ TEST_F(TabletServerTest, TestGetFlags) { ASSERT_OK(proxy.GetFlags(req, &resp, &controller)); SCOPED_TRACE(SecureDebugString(resp)); EXPECT_TRUE(std::any_of(resp.flags().begin(), resp.flags().end(), - [](const server::GetFlagsResponsePB::Flag& flag) -> bool { + [](const server::GetFlagsResponsePB::Flag& flag) { return flag.name() == "log_dir"; })); EXPECT_TRUE(std::any_of(resp.flags().begin(), resp.flags().end(), - [](const server::GetFlagsResponsePB::Flag& flag) -> bool { + [](const server::GetFlagsResponsePB::Flag& flag) { return flag.name() == "help"; })); EXPECT_TRUE(std::none_of(resp.flags().begin(), resp.flags().end(), - [](const server::GetFlagsResponsePB::Flag& flag) -> bool { + [](const server::GetFlagsResponsePB::Flag& flag) { return flag.name() == "logemaillevel"; })); } @@ -360,15 +360,15 @@ TEST_F(TabletServerTest, TestGetFlags) { ASSERT_OK(proxy.GetFlags(req, &resp, &controller)); SCOPED_TRACE(SecureDebugString(resp)); EXPECT_TRUE(std::any_of(resp.flags().begin(), resp.flags().end(), - [](const server::GetFlagsResponsePB::Flag& flag) -> bool { + [](const server::GetFlagsResponsePB::Flag& flag) { return flag.name() == "log_dir"; })); EXPECT_TRUE(std::none_of(resp.flags().begin(), resp.flags().end(), - [](const server::GetFlagsResponsePB::Flag& flag) -> bool { + [](const server::GetFlagsResponsePB::Flag& flag) { return flag.name() == "help"; })); EXPECT_TRUE(std::any_of(resp.flags().begin(), resp.flags().end(), - [](const server::GetFlagsResponsePB::Flag& flag) -> bool { + [](const server::GetFlagsResponsePB::Flag& flag) { return flag.name() == "logemaillevel"; })); } @@ -382,15 +382,15 @@ TEST_F(TabletServerTest, TestGetFlags) { ASSERT_OK(proxy.GetFlags(req, &resp, &controller)); SCOPED_TRACE(SecureDebugString(resp)); EXPECT_TRUE(std::none_of(resp.flags().begin(), resp.flags().end(), - [](const server::GetFlagsResponsePB::Flag& flag) -> bool { + [](const server::GetFlagsResponsePB::Flag& flag) { return flag.name() == "log_dir"; })); EXPECT_TRUE(std::none_of(resp.flags().begin(), resp.flags().end(), - [](const server::GetFlagsResponsePB::Flag& flag) -> bool { + [](const server::GetFlagsResponsePB::Flag& flag) { return flag.name() == "help"; })); EXPECT_TRUE(std::any_of(resp.flags().begin(), resp.flags().end(), - [](const server::GetFlagsResponsePB::Flag& flag) -> bool { + [](const server::GetFlagsResponsePB::Flag& flag) { return flag.name() == "logemaillevel"; })); } @@ -404,15 +404,15 @@ TEST_F(TabletServerTest, TestGetFlags) { ASSERT_OK(proxy.GetFlags(req, &resp, &controller)); SCOPED_TRACE(SecureDebugString(resp)); EXPECT_TRUE(std::none_of(resp.flags().begin(), resp.flags().end(), - [](const server::GetFlagsResponsePB::Flag& flag) -> bool { + [](const server::GetFlagsResponsePB::Flag& flag) { return flag.name() == "log_dir"; })); EXPECT_TRUE(std::none_of(resp.flags().begin(), resp.flags().end(), - [](const server::GetFlagsResponsePB::Flag& flag) -> bool { + [](const server::GetFlagsResponsePB::Flag& flag) { return flag.name() == "help"; })); EXPECT_TRUE(std::none_of(resp.flags().begin(), resp.flags().end(), - [](const server::GetFlagsResponsePB::Flag& flag) -> bool { + [](const server::GetFlagsResponsePB::Flag& flag) { return flag.name() == "logemaillevel"; })); } diff --git a/src/kudu/util/env_posix.cc b/src/kudu/util/env_posix.cc index 586b333..2657452 100644 --- a/src/kudu/util/env_posix.cc +++ b/src/kudu/util/env_posix.cc @@ -1333,7 +1333,7 @@ class PosixEnv : public Env { virtual Status DeleteRecursively(const string &name) OVERRIDE { return Walk( name, POST_ORDER, - [this](FileType type, const string& dirname, const string& basename) -> Status { + [this](FileType type, const string& dirname, const string& basename) { return this->DeleteRecursivelyCb(type, dirname, basename); }); } @@ -1377,7 +1377,7 @@ class PosixEnv : public Env { uint64_t total = 0; RETURN_NOT_OK(Walk( root, PRE_ORDER, - [this, &total](FileType type, const string& dirname, const string& basename) -> Status { + [this, &total](FileType type, const string& dirname, const string& basename) { return this->GetFileSizeOnDiskRecursivelyCb(&total, type, dirname, basename); })); *bytes_used = total; diff --git a/src/kudu/util/threadpool-test.cc b/src/kudu/util/threadpool-test.cc index 374b1bc..b8faac4 100644 --- a/src/kudu/util/threadpool-test.cc +++ b/src/kudu/util/threadpool-test.cc @@ -774,7 +774,7 @@ TEST_F(ThreadPoolTest, TestTokenConcurrency) { simple_spinlock lock; // Fetch a token from 'tokens' at random. - auto GetRandomToken = [&]() -> shared_ptr<ThreadPoolToken> { + auto GetRandomToken = [&]() { std::lock_guard<simple_spinlock> l(lock); int idx = rng.Uniform(kNumTokens); return tokens[idx]; diff --git a/src/kudu/util/trace.h b/src/kudu/util/trace.h index 27d56dd..c30e241 100644 --- a/src/kudu/util/trace.h +++ b/src/kudu/util/trace.h @@ -99,7 +99,7 @@ class Trace; // Construct a constant C string counter name which acts as a sort of // coarse-grained histogram for trace metrics. #define BUCKETED_COUNTER_NAME(prefix, duration_us) \ - [=]() -> const char* { \ + [=]() { \ if (duration_us >= 100 * 1000) { \ return prefix "_gt_100_ms"; \ } else if (duration_us >= 10 * 1000) { \
