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
The following commit(s) were added to refs/heads/master by this push:
new d0a9383 small cleanup: remove unnecessary semicolons (part 2)
d0a9383 is described below
commit d0a93831ce39418c7d5c7d854a32aeb40b29dee7
Author: Alexey Serbin <[email protected]>
AuthorDate: Sun Aug 18 00:17:56 2019 -0700
small cleanup: remove unnecessary semicolons (part 2)
Removed trailing semicolon from the definitions of various macros
that are defined using the `do { ... } while (false)` clause.
Updated all call sites where the trailing semicolon was missing.
Being a minor change, this patch might break compilation of client
applications using Kudu C++ client's headers of prior versions
if RETURN_NOT_OK() and other macros were used without trailing semicolon
at call sites. However, due to the prevalent usage patterns of the
RETURN_NOT_OK() macro and friends in the existing code base and examples,
we should not expect anybody to be affected by this small cleanup.
The motivation for this change was finding numerous warnings output
by the built-in static analysis tools while browsing through the code
using the newer version of QtCreator IDE.
This patch does not contain any functional changes.
Change-Id: I59cbffccdfe9ca0dcd634515d041213420675dec
Reviewed-on: http://gerrit.cloudera.org:8080/14095
Tested-by: Kudu Jenkins
Reviewed-by: Adar Dembo <[email protected]>
---
src/kudu/client/client-test.cc | 4 +--
src/kudu/codegen/codegen-test.cc | 2 +-
src/kudu/common/partial_row.cc | 34 +++++++++++-----------
src/kudu/consensus/log-test.cc | 16 +++++-----
src/kudu/consensus/log_anchor_registry.cc | 2 +-
src/kudu/consensus/log_reader.cc | 2 +-
src/kudu/fs/error_manager.h | 8 ++---
src/kudu/fs/file_block_manager.cc | 2 +-
src/kudu/fs/log_block_manager.cc | 8 ++---
src/kudu/hms/hms_client-test.cc | 2 +-
src/kudu/integration-tests/alter_table-test.cc | 4 +--
.../client-negotiation-failover-itest.cc | 2 +-
.../tombstoned_voting-imc-itest.cc | 23 ++++++++-------
src/kudu/master/catalog_manager.cc | 2 +-
src/kudu/master/master-test.cc | 2 +-
src/kudu/mini-cluster/internal_mini_cluster.cc | 2 +-
src/kudu/tablet/mvcc.cc | 2 +-
src/kudu/tablet/tablet.cc | 2 +-
src/kudu/tablet/tablet_bootstrap.cc | 2 +-
src/kudu/thrift/client.h | 2 +-
src/kudu/tools/ksck-test.cc | 12 ++++----
src/kudu/tools/ksck.cc | 4 +--
src/kudu/tools/kudu-admin-test.cc | 2 +-
src/kudu/tools/rebalancer_tool-test.cc | 6 ++--
src/kudu/tools/tool_action_cluster.cc | 8 -----
src/kudu/tserver/tablet_server-test.cc | 2 +-
src/kudu/util/env_posix.cc | 2 +-
src/kudu/util/file_cache-stress-test.cc | 2 +-
src/kudu/util/scoped_cleanup.h | 2 +-
src/kudu/util/status.h | 18 ++++++------
src/kudu/util/subprocess-test.cc | 2 +-
src/kudu/util/test_macros.h | 14 ++++-----
src/kudu/util/trace.h | 6 ++--
33 files changed, 98 insertions(+), 105 deletions(-)
diff --git a/src/kudu/client/client-test.cc b/src/kudu/client/client-test.cc
index ac7b6c1..f60bb08 100644
--- a/src/kudu/client/client-test.cc
+++ b/src/kudu/client/client-test.cc
@@ -384,7 +384,7 @@ class ClientTest : public KuduTest {
session->SetTimeoutMillis(10000);
for (int i = lo; i < hi; i++) {
unique_ptr<KuduDelete> del(DeleteTestRow(table, i));
- ASSERT_OK(session->Apply(del.release()))
+ ASSERT_OK(session->Apply(del.release()));
}
FlushSessionOrDie(session);
NO_FATALS(CheckNoRpcOverflow());
@@ -1358,7 +1358,7 @@ static void DoScanWithCallback(KuduTable* table,
}
ASSERT_OK(scanner.SetFaultTolerant());
// Set a long timeout as we'll be restarting nodes while performing snapshot
scans.
- ASSERT_OK(scanner.SetTimeoutMillis(60 * 1000 /* 60 seconds */))
+ ASSERT_OK(scanner.SetTimeoutMillis(60 * 1000 /* 60 seconds */));
// Set a small batch size so it reads in multiple batches.
ASSERT_OK(scanner.SetBatchSizeBytes(1));
diff --git a/src/kudu/codegen/codegen-test.cc b/src/kudu/codegen/codegen-test.cc
index 0db310b..78f0dd9 100644
--- a/src/kudu/codegen/codegen-test.cc
+++ b/src/kudu/codegen/codegen-test.cc
@@ -259,7 +259,7 @@ TEST_F(CodegenTest, ObservablesTest) {
// Test when identity
Schema iproj = *&base_;
gscoped_ptr<CodegenRP> iwith;
- CHECK_OK(Generate(&iproj, &iwith))
+ CHECK_OK(Generate(&iproj, &iwith));
NoCodegenRP iwithout(&base_, &iproj);
ASSERT_OK(iwithout.Init());
ASSERT_EQ(iwith->base_schema(), iwithout.base_schema());
diff --git a/src/kudu/common/partial_row.cc b/src/kudu/common/partial_row.cc
index abb00dd..6e924de 100644
--- a/src/kudu/common/partial_row.cc
+++ b/src/kudu/common/partial_row.cc
@@ -153,63 +153,63 @@ Status KuduPartialRow::Set(int32_t column_idx, const
uint8_t* val) {
case BOOL: {
RETURN_NOT_OK(SetBool(column_idx, *reinterpret_cast<const bool*>(val)));
break;
- };
+ }
case INT8: {
RETURN_NOT_OK(SetInt8(column_idx, *reinterpret_cast<const
int8_t*>(val)));
break;
- };
+ }
case INT16: {
RETURN_NOT_OK(SetInt16(column_idx, *reinterpret_cast<const
int16_t*>(val)));
break;
- };
+ }
case INT32: {
RETURN_NOT_OK(SetInt32(column_idx, *reinterpret_cast<const
int32_t*>(val)));
break;
- };
+ }
case INT64: {
RETURN_NOT_OK(SetInt64(column_idx, *reinterpret_cast<const
int64_t*>(val)));
break;
- };
+ }
case FLOAT: {
RETURN_NOT_OK(SetFloat(column_idx, *reinterpret_cast<const
float*>(val)));
break;
- };
+ }
case DOUBLE: {
RETURN_NOT_OK(SetDouble(column_idx, *reinterpret_cast<const
double*>(val)));
break;
- };
+ }
case STRING: {
// TODO(todd) Is reinterpret_cast unsafe here?
RETURN_NOT_OK(SetStringCopy(column_idx, *reinterpret_cast<const
Slice*>(val)));
break;
- };
+ }
case BINARY: {
// TODO(todd) Is reinterpret_cast unsafe here?
RETURN_NOT_OK(SetBinaryCopy(column_idx, *reinterpret_cast<const
Slice*>(val)));
break;
- };
+ }
case UNIXTIME_MICROS: {
RETURN_NOT_OK(SetUnixTimeMicros(column_idx, *reinterpret_cast<const
int64_t*>(val)));
break;
- };
+ }
case DECIMAL32: {
RETURN_NOT_OK(Set<TypeTraits<DECIMAL32> >(column_idx,
*reinterpret_cast<const
int32_t*>(val)));
break;
- };
+ }
case DECIMAL64: {
RETURN_NOT_OK(Set<TypeTraits<DECIMAL64> >(column_idx,
*reinterpret_cast<const
int64_t*>(val)));
break;
- };
+ }
case DECIMAL128: {
RETURN_NOT_OK(Set<TypeTraits<DECIMAL128>>(column_idx,
UnalignedLoad<int128_t>(val)));
break;
- };
+ }
default: {
return Status::InvalidArgument("Unknown column type in schema",
column_schema.ToString());
- };
+ }
}
return Status::OK();
}
@@ -309,13 +309,13 @@ Status KuduPartialRow::SetUnscaledDecimal(int col_idx,
int128_t val) {
const DataType col_type = col.type_info()->type();
switch (col_type) {
case DECIMAL32:
- RETURN_NOT_OK(CheckDecimalValueInRange(col, val))
+ RETURN_NOT_OK(CheckDecimalValueInRange(col, val));
return Set<TypeTraits<DECIMAL32> >(col_idx, static_cast<int32_t>(val));
case DECIMAL64:
- RETURN_NOT_OK(CheckDecimalValueInRange(col, val))
+ RETURN_NOT_OK(CheckDecimalValueInRange(col, val));
return Set<TypeTraits<DECIMAL64> >(col_idx, static_cast<int64_t>(val));
case DECIMAL128:
- RETURN_NOT_OK(CheckDecimalValueInRange(col, val))
+ RETURN_NOT_OK(CheckDecimalValueInRange(col, val));
return Set<TypeTraits<DECIMAL128> >(col_idx, static_cast<int128_t>(val));
default:
return Status::InvalidArgument(
diff --git a/src/kudu/consensus/log-test.cc b/src/kudu/consensus/log-test.cc
index 7583f3b..e33a189 100644
--- a/src/kudu/consensus/log-test.cc
+++ b/src/kudu/consensus/log-test.cc
@@ -527,13 +527,13 @@ TEST_P(LogTestOptionalCompression, TestGCWithLogRunning) {
ASSERT_EQ(anchors.size(), 4);
// Anchors should prevent GC.
- ASSERT_OK(log_->reader()->GetSegmentsSnapshot(&segments))
+ ASSERT_OK(log_->reader()->GetSegmentsSnapshot(&segments));
ASSERT_EQ(4, segments.size()) << DumpSegmentsToString(segments);
RetentionIndexes retention;
ASSERT_OK(log_anchor_registry_->GetEarliestRegisteredLogIndex(&retention.for_durability));
ASSERT_OK(log_->GC(retention, &num_gced_segments));
ASSERT_EQ(0, num_gced_segments);
- ASSERT_OK(log_->reader()->GetSegmentsSnapshot(&segments))
+ ASSERT_OK(log_->reader()->GetSegmentsSnapshot(&segments));
ASSERT_EQ(4, segments.size()) << DumpSegmentsToString(segments);
// Logs should be retained for durability even if this puts it above the
@@ -565,7 +565,7 @@ TEST_P(LogTestOptionalCompression, TestGCWithLogRunning) {
// Try again without the modified flag.
ASSERT_OK(log_->GC(retention, &num_gced_segments));
ASSERT_EQ(2, num_gced_segments) << DumpSegmentsToString(segments);
- ASSERT_OK(log_->reader()->GetSegmentsSnapshot(&segments))
+ ASSERT_OK(log_->reader()->GetSegmentsSnapshot(&segments));
ASSERT_EQ(2, segments.size()) << DumpSegmentsToString(segments);
// Release the remaining "rolled segment" anchor. GC will not delete the
@@ -574,7 +574,7 @@ TEST_P(LogTestOptionalCompression, TestGCWithLogRunning) {
ASSERT_OK(log_anchor_registry_->GetEarliestRegisteredLogIndex(&retention.for_durability));
ASSERT_OK(log_->GC(retention, &num_gced_segments));
ASSERT_EQ(0, num_gced_segments) << DumpSegmentsToString(segments);
- ASSERT_OK(log_->reader()->GetSegmentsSnapshot(&segments))
+ ASSERT_OK(log_->reader()->GetSegmentsSnapshot(&segments));
ASSERT_EQ(2, segments.size()) << DumpSegmentsToString(segments);
// Check that we get a NotFound if we try to read before the GCed point.
@@ -678,12 +678,12 @@ TEST_P(LogTestOptionalCompression, TestLogReopenAndGC) {
ASSERT_OK(AppendMultiSegmentSequence(kNumTotalSegments, kNumOpsPerSegment,
&op_id, &anchors));
// Anchors should prevent GC.
- ASSERT_OK(log_->reader()->GetSegmentsSnapshot(&segments))
+ ASSERT_OK(log_->reader()->GetSegmentsSnapshot(&segments));
ASSERT_EQ(3, segments.size());
RetentionIndexes retention;
ASSERT_OK(log_anchor_registry_->GetEarliestRegisteredLogIndex(&retention.for_durability));
ASSERT_OK(log_->GC(retention, &num_gced_segments));
- ASSERT_OK(log_->reader()->GetSegmentsSnapshot(&segments))
+ ASSERT_OK(log_->reader()->GetSegmentsSnapshot(&segments));
ASSERT_EQ(3, segments.size());
ASSERT_OK(log_->Close());
@@ -693,7 +693,7 @@ TEST_P(LogTestOptionalCompression, TestLogReopenAndGC) {
ASSERT_OK(BuildLog());
// The "old" data consists of 3 segments. We still hold anchors.
- ASSERT_OK(log_->reader()->GetSegmentsSnapshot(&segments))
+ ASSERT_OK(log_->reader()->GetSegmentsSnapshot(&segments));
ASSERT_EQ(4, segments.size());
// Write to a new log segment, as if we had taken new requests and the
@@ -1173,7 +1173,7 @@ TEST_P(LogTestOptionalCompression, TestTotalSize) {
int num_gced_segments;
ASSERT_OK(log_->GC(retention, &num_gced_segments));
ASSERT_EQ(1, num_gced_segments) << DumpSegmentsToString(segments);
- ASSERT_OK(log_->reader()->GetSegmentsSnapshot(&segments))
+ ASSERT_OK(log_->reader()->GetSegmentsSnapshot(&segments));
ASSERT_EQ(2, segments.size()) << DumpSegmentsToString(segments);
// Now we've added two segments and GC'd one, so the total size should be
diff --git a/src/kudu/consensus/log_anchor_registry.cc
b/src/kudu/consensus/log_anchor_registry.cc
index 04c0928..648e2ab 100644
--- a/src/kudu/consensus/log_anchor_registry.cc
+++ b/src/kudu/consensus/log_anchor_registry.cc
@@ -55,7 +55,7 @@ Status LogAnchorRegistry::UpdateRegistration(int64_t
log_index,
LogAnchor* anchor) {
std::lock_guard<simple_spinlock> l(lock_);
RETURN_NOT_OK_PREPEND(UnregisterUnlocked(anchor),
- "Unable to swap registration, anchor not registered")
+ "Unable to swap registration, anchor not registered");
RegisterUnlocked(log_index, owner, anchor);
return Status::OK();
}
diff --git a/src/kudu/consensus/log_reader.cc b/src/kudu/consensus/log_reader.cc
index 9fd09b5..145dbf1 100644
--- a/src/kudu/consensus/log_reader.cc
+++ b/src/kudu/consensus/log_reader.cc
@@ -85,7 +85,7 @@ Status LogReader::Open(Env* env,
auto log_reader = LogReader::make_shared(env, index, tablet_id,
metric_entity);
RETURN_NOT_OK_PREPEND(log_reader->Init(tablet_wal_dir),
- "Unable to initialize log reader")
+ "Unable to initialize log reader");
*reader = log_reader;
return Status::OK();
}
diff --git a/src/kudu/fs/error_manager.h b/src/kudu/fs/error_manager.h
index 46ac8cf..0ffd636 100644
--- a/src/kudu/fs/error_manager.h
+++ b/src/kudu/fs/error_manager.h
@@ -48,7 +48,7 @@ typedef Callback<void(const std::string&)>
ErrorNotificationCb;
} \
HandleError(_s); \
return _s; \
-} while (0);
+} while (0)
// Evaluates the expression and runs 'err_handler' if it results in a disk
// failure. Returns if the expression results in an error.
@@ -61,7 +61,7 @@ typedef Callback<void(const std::string&)>
ErrorNotificationCb;
(err_handler); \
} \
return _s; \
-} while (0);
+} while (0)
// Evaluates the expression and runs 'err_handler' if it results in a
// corruption. Returns if the expression results in an error.
@@ -74,7 +74,7 @@ typedef Callback<void(const std::string&)>
ErrorNotificationCb;
(err_handler); \
} \
return _s; \
-} while (0);
+} while (0)
// Evaluates the expression and runs 'err_handler' if it results in a disk
// failure.
@@ -83,7 +83,7 @@ typedef Callback<void(const std::string&)>
ErrorNotificationCb;
if (PREDICT_FALSE(_s.IsDiskFailure())) { \
(err_handler); \
} \
-} while (0);
+} while (0)
enum ErrorHandlerType {
// For disk failures.
diff --git a/src/kudu/fs/file_block_manager.cc
b/src/kudu/fs/file_block_manager.cc
index 6349579..1b92d57 100644
--- a/src/kudu/fs/file_block_manager.cc
+++ b/src/kudu/fs/file_block_manager.cc
@@ -816,7 +816,7 @@ Status FileBlockManager::CreateBlock(const
CreateBlockOptions& opts,
error_manager_->RunErrorNotificationCb(ErrorHandlerType::DISK_ERROR, \
dd_manager_->FindDataDirByUuidIndex( \
internal::FileBlockLocation::GetDataDirIdx(block_id)))); \
-} while (0);
+} while (0)
Status FileBlockManager::OpenBlock(const BlockId& block_id,
unique_ptr<ReadableBlock>* block) {
diff --git a/src/kudu/fs/log_block_manager.cc b/src/kudu/fs/log_block_manager.cc
index e71aa86..38e7b90 100644
--- a/src/kudu/fs/log_block_manager.cc
+++ b/src/kudu/fs/log_block_manager.cc
@@ -685,7 +685,7 @@ class LogBlockContainer: public
RefCountedThreadSafe<LogBlockContainer> {
HANDLE_DISK_FAILURE(s_,
block_manager_->error_manager_->RunErrorNotificationCb( \
ErrorHandlerType::DISK_ERROR, data_dir_)); \
WARN_NOT_OK(s_, msg); \
-} while (0);
+} while (0)
LogBlockContainer::LogBlockContainer(
LogBlockManager* block_manager,
@@ -730,7 +730,7 @@ void LogBlockContainer::HandleError(const Status& s) const {
#define RETURN_NOT_OK_CONTAINER_DISK_FAILURE(status_expr) do { \
RETURN_NOT_OK_HANDLE_DISK_FAILURE((status_expr), \
block_manager->error_manager()->RunErrorNotificationCb(ErrorHandlerType::DISK_ERROR,
dir)); \
-} while (0);
+} while (0)
Status LogBlockContainer::Create(LogBlockManager* block_manager,
DataDir* dir,
@@ -2630,14 +2630,14 @@ void LogBlockManager::OpenDataDir(DataDir* dir,
s_ = s_.CloneAndPrepend(msg); \
RETURN_NOT_OK_HANDLE_DISK_FAILURE(s_, \
error_manager_->RunErrorNotificationCb(ErrorHandlerType::DISK_ERROR,
dir)); \
-} while (0);
+} while (0)
#define WARN_NOT_OK_LBM_DISK_FAILURE(status_expr, msg) do { \
Status s_ = (status_expr); \
HANDLE_DISK_FAILURE(s_, error_manager_->RunErrorNotificationCb( \
ErrorHandlerType::DISK_ERROR, dir)); \
WARN_NOT_OK(s_, msg); \
-} while (0);
+} while (0)
Status LogBlockManager::Repair(
DataDir* dir,
diff --git a/src/kudu/hms/hms_client-test.cc b/src/kudu/hms/hms_client-test.cc
index 5375b69..dfcddb2 100644
--- a/src/kudu/hms/hms_client-test.cc
+++ b/src/kudu/hms/hms_client-test.cc
@@ -228,7 +228,7 @@ TEST_P(HmsClientTest, TestHmsOperations) {
string filter = Substitute(
"$0$1 LIKE \"$2\"", HmsClient::kHiveFilterFieldParams,
HmsClient::kStorageHandlerKey, HmsClient::kKuduStorageHandler);
- ASSERT_OK(client.GetTableNames(database_name, filter, &table_names))
+ ASSERT_OK(client.GetTableNames(database_name, filter, &table_names));
std::sort(table_names.begin(), table_names.end());
EXPECT_EQ(vector<string>({ new_table_name, "my_uppercase_table" }),
table_names)
<< "table names: " << table_names;
diff --git a/src/kudu/integration-tests/alter_table-test.cc
b/src/kudu/integration-tests/alter_table-test.cc
index 6333dfe..a80b5a9 100644
--- a/src/kudu/integration-tests/alter_table-test.cc
+++ b/src/kudu/integration-tests/alter_table-test.cc
@@ -555,7 +555,7 @@ TEST_F(AlterTableTest, TestAlterOnTSRestart) {
bool alter_in_progress = false;
ASSERT_OK(client_->GetTableSchema(kTableName, &schema));
ASSERT_TRUE(schema_.Equals(schema));
- ASSERT_OK(client_->IsAlterTableInProgress(kTableName, &alter_in_progress))
+ ASSERT_OK(client_->IsAlterTableInProgress(kTableName, &alter_in_progress));
ASSERT_TRUE(alter_in_progress);
// Restart the TS and wait for the new schema
@@ -2081,7 +2081,7 @@ TEST_F(ReplicatedAlterTableTest, TestReplicatedAlter) {
ASSERT_OK(AddNewI32Column(kTableName, "c1", 0xdeadbeef));
bool alter_in_progress;
- ASSERT_OK(client_->IsAlterTableInProgress(kTableName, &alter_in_progress))
+ ASSERT_OK(client_->IsAlterTableInProgress(kTableName, &alter_in_progress));
ASSERT_FALSE(alter_in_progress);
LOG(INFO) << "Verifying that the new default shows up";
diff --git a/src/kudu/integration-tests/client-negotiation-failover-itest.cc
b/src/kudu/integration-tests/client-negotiation-failover-itest.cc
index d815502..b991a84 100644
--- a/src/kudu/integration-tests/client-negotiation-failover-itest.cc
+++ b/src/kudu/integration-tests/client-negotiation-failover-itest.cc
@@ -261,7 +261,7 @@ TEST_F(ClientFailoverOnNegotiationTimeoutITest,
Kudu2021NegotiateWithMaster) {
Substitute("$0", FLAGS_rpc_negotiation_timeout_ms *
2)));
thread pause_thread([&]() {
SleepFor(MonoDelta::FromMilliseconds(FLAGS_rpc_negotiation_timeout_ms /
2));
- CHECK_OK(m->Pause())
+ CHECK_OK(m->Pause());
});
// An automatic clean-up to handle both success and failure cases.
SCOPED_CLEANUP({
diff --git a/src/kudu/integration-tests/tombstoned_voting-imc-itest.cc
b/src/kudu/integration-tests/tombstoned_voting-imc-itest.cc
index 02c2208..20c9df8 100644
--- a/src/kudu/integration-tests/tombstoned_voting-imc-itest.cc
+++ b/src/kudu/integration-tests/tombstoned_voting-imc-itest.cc
@@ -60,6 +60,7 @@ using kudu::consensus::RECEIVED_OPID;
using kudu::consensus::RaftConsensus;
using kudu::consensus::RaftPeerPB;
using kudu::itest::DeleteTablet;
+using kudu::itest::RequestVote;
using kudu::itest::TServerDetails;
using kudu::itest::WaitForServersToAgree;
using kudu::tablet::TABLET_DATA_TOMBSTONED;
@@ -213,19 +214,19 @@ TEST_F(TombstonedVotingIMCITest, TestVotingLogic) {
// Note: peers are required to vote regardless of whether they recognize
the
// candidate's UUID or not, so the ID used here ("A") is not important.
TServerDetails* ts1_ets = ts_map_[cluster_->mini_tablet_server(1)->uuid()];
- ASSERT_OK(itest::RequestVote(ts1_ets, tablet_id, "A", current_term,
last_logged_opid,
- /*ignore_live_leader=*/ true,
/*is_pre_election=*/ false, kTimeout))
+ ASSERT_OK(RequestVote(ts1_ets, tablet_id, "A", current_term,
last_logged_opid,
+ /*ignore_live_leader=*/ true, /*is_pre_election=*/
false, kTimeout));
// Ask TS1 for a vote that should be denied (different candidate, same
term).
- Status s = itest::RequestVote(ts1_ets, tablet_id, "B", current_term,
last_logged_opid,
- /*ignore_live_leader=*/ true,
/*is_pre_election=*/ false,
- kTimeout);
+ Status s = RequestVote(ts1_ets, tablet_id, "B", current_term,
last_logged_opid,
+ /*ignore_live_leader=*/ true, /*is_pre_election=*/
false,
+ kTimeout);
ASSERT_TRUE(s.IsInvalidArgument());
ASSERT_STR_CONTAINS(s.ToString(), "Already voted for candidate A in this
term");
// Ask TS1 for a vote that should be denied (old term).
- s = itest::RequestVote(ts1_ets, tablet_id, "B", current_term - 1,
last_logged_opid,
- /*ignore_live_leader=*/ true, /*is_pre_election=*/
false, kTimeout);
+ s = RequestVote(ts1_ets, tablet_id, "B", current_term - 1,
last_logged_opid,
+ /*ignore_live_leader=*/ true, /*is_pre_election=*/ false,
kTimeout);
ASSERT_TRUE(s.IsInvalidArgument());
ASSERT_STR_MATCHES(s.ToString(), "Denying vote to candidate B for earlier
term");
@@ -234,15 +235,15 @@ TEST_F(TombstonedVotingIMCITest, TestVotingLogic) {
OpId old_opid = MakeOpId(last_logged_opid.term(), last_logged_opid.index()
- 1);
// Ask TS1 for a vote that should be denied (old last-logged opid).
- s = itest::RequestVote(ts1_ets, tablet_id, "B", current_term, old_opid,
- /*ignore_live_leader=*/ true, /*is_pre_election=*/
false, kTimeout);
+ s = RequestVote(ts1_ets, tablet_id, "B", current_term, old_opid,
+ /*ignore_live_leader=*/ true, /*is_pre_election=*/ false,
kTimeout);
ASSERT_TRUE(s.IsInvalidArgument());
ASSERT_STR_MATCHES(s.ToString(),
"Denying vote to candidate B.*greater than that of the
candidate");
// Ask for a successful vote for candidate B.
- ASSERT_OK(itest::RequestVote(ts1_ets, tablet_id, "B", current_term,
last_logged_opid,
- /*ignore_live_leader=*/ true,
/*is_pre_election=*/ false, kTimeout))
+ ASSERT_OK(RequestVote(ts1_ets, tablet_id, "B", current_term,
last_logged_opid,
+ /*ignore_live_leader=*/ true, /*is_pre_election=*/
false, kTimeout));
}
}
diff --git a/src/kudu/master/catalog_manager.cc
b/src/kudu/master/catalog_manager.cc
index fd67c82..22792c2 100644
--- a/src/kudu/master/catalog_manager.cc
+++ b/src/kudu/master/catalog_manager.cc
@@ -2016,7 +2016,7 @@ Status CatalogManager::DeleteTable(const
DeleteTableRequestPB& req,
resp, MasterErrorPB::TABLE_NOT_FOUND);
}
- TRACE("Modifying in-memory table state")
+ TRACE("Modifying in-memory table state");
string deletion_msg = "Table deleted at " + LocalTimeAsString();
l.mutable_data()->set_state(SysTablesEntryPB::REMOVED, deletion_msg);
diff --git a/src/kudu/master/master-test.cc b/src/kudu/master/master-test.cc
index 25190cd..7cbbcb5 100644
--- a/src/kudu/master/master-test.cc
+++ b/src/kudu/master/master-test.cc
@@ -366,7 +366,7 @@ TEST_F(MasterTest, TestRegisterAndHeartbeat) {
EasyCurl c;
faststring buf;
string addr = mini_master_->bound_http_addr().ToString();
- ASSERT_OK(c.FetchURL(Substitute("http://$0/dump-entities";, addr), &buf))
+ ASSERT_OK(c.FetchURL(Substitute("http://$0/dump-entities";, addr), &buf));
rapidjson::Document doc;
doc.Parse<0>(buf.ToString().c_str());
const rapidjson::Value& tablet_servers = doc["tablet_servers"];
diff --git a/src/kudu/mini-cluster/internal_mini_cluster.cc
b/src/kudu/mini-cluster/internal_mini_cluster.cc
index 7299a13..80dd51c 100644
--- a/src/kudu/mini-cluster/internal_mini_cluster.cc
+++ b/src/kudu/mini-cluster/internal_mini_cluster.cc
@@ -205,7 +205,7 @@ Status InternalMiniCluster::AddTabletServer() {
// set the master addresses
tablet_server->options()->master_addresses = master_rpc_addrs();
- RETURN_NOT_OK(tablet_server->Start())
+ RETURN_NOT_OK(tablet_server->Start());
mini_tablet_servers_.push_back(shared_ptr<MiniTabletServer>(tablet_server.release()));
return Status::OK();
}
diff --git a/src/kudu/tablet/mvcc.cc b/src/kudu/tablet/mvcc.cc
index 449651a..f80d387 100644
--- a/src/kudu/tablet/mvcc.cc
+++ b/src/kudu/tablet/mvcc.cc
@@ -283,7 +283,7 @@ void MvccManager::AdjustCleanTime() {
Status MvccManager::WaitUntil(WaitFor wait_for, Timestamp ts, const MonoTime&
deadline) const {
TRACE_EVENT2("tablet", "MvccManager::WaitUntil",
"wait_for", wait_for == ALL_COMMITTED ? "all_committed" :
"none_applying",
- "ts", ts.ToUint64())
+ "ts", ts.ToUint64());
// If MVCC is closed, there's no point in waiting.
RETURN_NOT_OK(CheckOpen());
diff --git a/src/kudu/tablet/tablet.cc b/src/kudu/tablet/tablet.cc
index 39f1a25..2e43ddc 100644
--- a/src/kudu/tablet/tablet.cc
+++ b/src/kudu/tablet/tablet.cc
@@ -251,7 +251,7 @@ Tablet::~Tablet() {
std::lock_guard<simple_spinlock> l(state_lock_); \
RETURN_NOT_OK(CheckHasNotBeenStoppedUnlocked()); \
CHECK_EQ(expected_state, state_); \
-} while (0);
+} while (0)
Status Tablet::Open() {
TRACE_EVENT0("tablet", "Tablet::Open");
diff --git a/src/kudu/tablet/tablet_bootstrap.cc
b/src/kudu/tablet/tablet_bootstrap.cc
index 5abc342..5746a53 100644
--- a/src/kudu/tablet/tablet_bootstrap.cc
+++ b/src/kudu/tablet/tablet_bootstrap.cc
@@ -609,7 +609,7 @@ Status TabletBootstrap::RunBootstrap(shared_ptr<Tablet>*
rebuilt_tablet,
RETURN_NOT_OK_PREPEND(PlaySegments(&io_context, consensus_info), "Failed log
replay. Reason");
RETURN_NOT_OK(Log::RemoveRecoveryDirIfExists(tablet_->metadata()->fs_manager(),
-
tablet_->metadata()->tablet_id()))
+
tablet_->metadata()->tablet_id()));
RETURN_NOT_OK(FinishBootstrap("Bootstrap complete.", rebuilt_log,
rebuilt_tablet));
return Status::OK();
diff --git a/src/kudu/thrift/client.h b/src/kudu/thrift/client.h
index 61c7974..ff948cb 100644
--- a/src/kudu/thrift/client.h
+++ b/src/kudu/thrift/client.h
@@ -349,7 +349,7 @@ Status HaClient<Service>::Reconnect() {
}
WARN_NOT_OK(s, strings::Substitute("Failed to connect to $0 ($1)",
- Service::kServiceName, address.ToString()))
+ Service::kServiceName, address.ToString()));
}
WARN_NOT_OK(service_client_.Stop(),
diff --git a/src/kudu/tools/ksck-test.cc b/src/kudu/tools/ksck-test.cc
index d0f3eb9..09cec23 100644
--- a/src/kudu/tools/ksck-test.cc
+++ b/src/kudu/tools/ksck-test.cc
@@ -300,7 +300,7 @@ class KsckTest : public KuduTest {
// written to expect a reversed order and doing that here is more
// convenient than rewriting many ASSERTs.
std::reverse(assignment_plan_.begin(), assignment_plan_.end());
- })
+ });
while (tablets_count > 0) {
for (const auto& entry : cluster_->tablet_servers_) {
if (tablets_count-- == 0) return;
@@ -463,24 +463,24 @@ class KsckTest : public KuduTest {
string actual; \
ASSERT_OK((reader).ExtractString((value), (field), &actual)); \
EXPECT_EQ((expected), actual); \
-} while (0);
+} while (0)
#define EXPECT_JSON_INT_FIELD(reader, value, field, expected) do { \
int64_t actual; \
ASSERT_OK((reader).ExtractInt64((value), (field), &actual)); \
EXPECT_EQ((expected), actual); \
-} while (0);
+} while (0)
#define EXPECT_JSON_BOOL_FIELD(reader, value, field, expected) do { \
bool actual; \
ASSERT_OK((reader).ExtractBool((value), (field), &actual)); \
EXPECT_EQ((expected), actual); \
-} while (0);
+} while (0)
#define EXPECT_JSON_FIELD_NOT_PRESENT(reader, value, field) do { \
int64_t unused; \
ASSERT_TRUE((reader).ExtractInt64((value), (field), &unused).IsNotFound()); \
-} while (0);
+} while (0)
// 'array' is a vector<const rapidjson::Value*> into which the array elements
// will be extracted.
@@ -488,7 +488,7 @@ class KsckTest : public KuduTest {
#define EXTRACT_ARRAY_CHECK_SIZE(reader, value, field, array, exp_size) do { \
ASSERT_OK((reader).ExtractObjectArray((value), (field), &(array))); \
ASSERT_EQ(exp_size, (array).size()); \
-} while (0);
+} while (0)
void CheckJsonVsServerHealthSummaries(
const JsonReader& r,
diff --git a/src/kudu/tools/ksck.cc b/src/kudu/tools/ksck.cc
index 3debfe0..526e9ab 100644
--- a/src/kudu/tools/ksck.cc
+++ b/src/kudu/tools/ksck.cc
@@ -49,9 +49,9 @@
#define PUSH_PREPEND_NOT_OK(s, statuses, msg) do { \
::kudu::Status _s = (s); \
if (PREDICT_FALSE(!_s.ok())) { \
- statuses.push_back(_s.CloneAndPrepend(msg)); \
+ (statuses).push_back(_s.CloneAndPrepend(msg)); \
} \
-} while (0);
+} while (0)
DEFINE_bool(checksum_scan, false,
"Perform a checksum scan on data in the cluster.");
diff --git a/src/kudu/tools/kudu-admin-test.cc
b/src/kudu/tools/kudu-admin-test.cc
index 6550202..fbcee10 100644
--- a/src/kudu/tools/kudu-admin-test.cc
+++ b/src/kudu/tools/kudu-admin-test.cc
@@ -162,7 +162,7 @@ static string ToolRunInfo(const Status& s, const string&
out, const string& err)
} else { \
FAIL() << ToolRunInfo(_s, _out, _err); \
} \
-} while (0);
+} while (0)
class AdminCliTest : public tserver::TabletServerIntegrationTestBase {
};
diff --git a/src/kudu/tools/rebalancer_tool-test.cc
b/src/kudu/tools/rebalancer_tool-test.cc
index 4d2ce31..8a14ca0 100644
--- a/src/kudu/tools/rebalancer_tool-test.cc
+++ b/src/kudu/tools/rebalancer_tool-test.cc
@@ -128,7 +128,7 @@ static string ToolRunInfo(const Status& s, const string&
out, const string& err)
} else { \
FAIL() << ToolRunInfo(_s, _out, _err); \
} \
-} while (0);
+} while (0)
class AdminCliTest : public tserver::TabletServerIntegrationTestBase {
};
@@ -870,7 +870,7 @@ TEST_P(TserverGoesDownDuringRebalancingTest, TserverDown) {
"cluster",
"ksck",
cluster_->master()->bound_rpc_addr().ToString()
- )
+ );
});
Random r(SeedRandom());
@@ -1130,7 +1130,7 @@ TEST_P(RebalancingDuringElectionStormTest, RoundRobin) {
"cluster",
"ksck",
cluster_->master()->bound_rpc_addr().ToString()
- )
+ );
});
// The rebalancer should successfully rebalance the cluster after ksck
diff --git a/src/kudu/tools/tool_action_cluster.cc
b/src/kudu/tools/tool_action_cluster.cc
index 8a3c36a..d30cda6 100644
--- a/src/kudu/tools/tool_action_cluster.cc
+++ b/src/kudu/tools/tool_action_cluster.cc
@@ -31,7 +31,6 @@
#include <glog/logging.h>
#include "kudu/gutil/basictypes.h"
-#include "kudu/gutil/port.h"
#include "kudu/gutil/strings/split.h"
#include "kudu/gutil/strings/substitute.h"
#include "kudu/tools/ksck.h"
@@ -54,13 +53,6 @@ using std::vector;
using strings::Split;
using strings::Substitute;
-#define PUSH_PREPEND_NOT_OK(s, statuses, msg) do { \
- ::kudu::Status _s = (s); \
- if (PREDICT_FALSE(!_s.ok())) { \
- (statuses).push_back(string((msg)) + ": " + _s.message().ToString()); \
- } \
-} while (0);
-
DECLARE_string(tables);
DECLARE_string(tablets);
diff --git a/src/kudu/tserver/tablet_server-test.cc
b/src/kudu/tserver/tablet_server-test.cc
index a7d5b4e..b72c5d7 100644
--- a/src/kudu/tserver/tablet_server-test.cc
+++ b/src/kudu/tserver/tablet_server-test.cc
@@ -1411,7 +1411,7 @@ TEST_F(TabletServerTest,
TestKUDU_176_RecoveryAfterMajorDeltaCompaction) {
tablet_replica_->tablet()->GetRowSetsForTests(&rsets);
vector<ColumnId> col_ids = {
tablet_replica_->tablet()->schema()->column_id(1),
tablet_replica_->tablet()->schema()->column_id(2) };
- ASSERT_OK(tablet_replica_->tablet()->DoMajorDeltaCompaction(col_ids,
rsets[0]))
+ ASSERT_OK(tablet_replica_->tablet()->DoMajorDeltaCompaction(col_ids,
rsets[0]));
}
// Verify that data is still the same.
diff --git a/src/kudu/util/env_posix.cc b/src/kudu/util/env_posix.cc
index 5d1e55c..050dcc5 100644
--- a/src/kudu/util/env_posix.cc
+++ b/src/kudu/util/env_posix.cc
@@ -125,7 +125,7 @@ typedef struct xfs_flock64 {
const string& f_ = (filename_expr); \
MAYBE_RETURN_FAILURE(FLAGS_env_inject_eio, \
ShouldInject(f_, FLAGS_env_inject_eio_globs) ? (error_expr) :
Status::OK()) \
-} while (0);
+} while (0)
bool ShouldInject(const string& candidate, const string& glob_patterns) {
// Never inject on /proc/ file accesses regardless of the configured flag,
diff --git a/src/kudu/util/file_cache-stress-test.cc
b/src/kudu/util/file_cache-stress-test.cc
index 9c51a52..babc1d7 100644
--- a/src/kudu/util/file_cache-stress-test.cc
+++ b/src/kudu/util/file_cache-stress-test.cc
@@ -91,7 +91,7 @@ class FileCacheStressTest : public KuduTest {
} \
} \
CHECK(_s.ok()) << "Bad status: " << _s.ToString(); \
- } while (0);
+ } while (0)
public:
typedef unordered_map<string, unordered_map<string, int>> MetricMap;
diff --git a/src/kudu/util/scoped_cleanup.h b/src/kudu/util/scoped_cleanup.h
index 8ecfbcb..ea94ace 100644
--- a/src/kudu/util/scoped_cleanup.h
+++ b/src/kudu/util/scoped_cleanup.h
@@ -31,7 +31,7 @@
// NOTE: in the case that you want to cancel the cleanup, use the more verbose
// (non-macro) form below.
#define SCOPED_CLEANUP(func_body) \
- auto VARNAME_LINENUM(scoped_cleanup) = MakeScopedCleanup([&] { func_body });
+ auto VARNAME_LINENUM(scoped_cleanup) = MakeScopedCleanup([&] { func_body })
namespace kudu {
diff --git a/src/kudu/util/status.h b/src/kudu/util/status.h
index 3c8a1d9..152d423 100644
--- a/src/kudu/util/status.h
+++ b/src/kudu/util/status.h
@@ -35,14 +35,14 @@
#define KUDU_RETURN_NOT_OK(s) do { \
const ::kudu::Status& _s = (s); \
if (PREDICT_FALSE(!_s.ok())) return _s; \
- } while (0);
+ } while (0)
/// @brief Return the given status if it is not OK, but first clone it and
/// prepend the given message.
#define KUDU_RETURN_NOT_OK_PREPEND(s, msg) do { \
const ::kudu::Status& _s = (s); \
if (PREDICT_FALSE(!_s.ok())) return _s.CloneAndPrepend(msg); \
- } while (0);
+ } while (0)
/// @brief Return @c to_return if @c to_call returns a bad status.
/// The substitution for 'to_return' may reference the variable
@@ -50,7 +50,7 @@
#define KUDU_RETURN_NOT_OK_RET(to_call, to_return) do { \
const ::kudu::Status& s = (to_call); \
if (PREDICT_FALSE(!s.ok())) return (to_return); \
- } while (0);
+ } while (0)
/// @brief Return the given status if it is not OK, evaluating `on_error` if
so.
#define KUDU_RETURN_NOT_OK_EVAL(s, on_error) do { \
@@ -59,7 +59,7 @@
(on_error); \
return _s; \
} \
- } while (0);
+ } while (0)
/// @brief Emit a warning if @c to_call returns a bad status.
#define KUDU_WARN_NOT_OK(to_call, warning_prefix) do { \
@@ -67,14 +67,14 @@
if (PREDICT_FALSE(!_s.ok())) { \
KUDU_LOG(WARNING) << (warning_prefix) << ": " << _s.ToString(); \
} \
- } while (0);
+ } while (0)
/// @brief Log the given status and return immediately.
#define KUDU_LOG_AND_RETURN(level, status) do { \
const ::kudu::Status& _s = (status); \
KUDU_LOG(level) << _s.ToString(); \
return _s; \
- } while (0);
+ } while (0)
/// @brief If the given status is not OK, log it and 'msg' at 'level' and
return the status.
#define KUDU_RETURN_NOT_OK_LOG(s, level, msg) do { \
@@ -83,14 +83,14 @@
KUDU_LOG(level) << "Status: " << _s.ToString() << " " << (msg); \
return _s; \
} \
- } while (0);
+ } while (0)
/// @brief If @c to_call returns a bad status, CHECK immediately with
/// a logged message of @c msg followed by the status.
#define KUDU_CHECK_OK_PREPEND(to_call, msg) do { \
const ::kudu::Status& _s = (to_call); \
KUDU_CHECK(_s.ok()) << (msg) << ": " << _s.ToString(); \
- } while (0);
+ } while (0)
/// @brief If the status is bad, CHECK immediately, appending the status to the
/// logged message.
@@ -101,7 +101,7 @@
#define KUDU_DCHECK_OK_PREPEND(to_call, msg) do { \
const ::kudu::Status& _s = (to_call); \
KUDU_DCHECK(_s.ok()) << (msg) << ": " << _s.ToString(); \
- } while (0);
+ } while (0)
/// @brief If the status is bad, DCHECK immediately, appending the status to
the
/// logged 'Bad status' message.
diff --git a/src/kudu/util/subprocess-test.cc b/src/kudu/util/subprocess-test.cc
index 99c2994..3d32a6f 100644
--- a/src/kudu/util/subprocess-test.cc
+++ b/src/kudu/util/subprocess-test.cc
@@ -147,7 +147,7 @@ TEST_F(SubprocessTest, TestReadFromStdoutAndStderr) {
}, "", &stdout, &stderr));
// Reset the alarm when the test is done
- SCOPED_CLEANUP({ alarm(0); })
+ SCOPED_CLEANUP({ alarm(0); });
}
// Test that environment variables can be passed to the subprocess.
diff --git a/src/kudu/util/test_macros.h b/src/kudu/util/test_macros.h
index c11bb23..393867d 100644
--- a/src/kudu/util/test_macros.h
+++ b/src/kudu/util/test_macros.h
@@ -36,7 +36,7 @@
} else { \
FAIL() << "Bad status: " << _s.ToString(); \
} \
-} while (0);
+} while (0)
#define EXPECT_OK(status) do { \
const Status& _s = status; \
@@ -45,7 +45,7 @@
} else { \
ADD_FAILURE() << "Bad status: " << _s.ToString(); \
} \
-} while (0);
+} while (0)
// Like the above, but doesn't record successful
// tests.
@@ -54,7 +54,7 @@
if (!_s.ok()) { \
FAIL() << "Bad status: " << _s.ToString(); \
} \
-} while (0);
+} while (0)
// Substring matches.
#define ASSERT_STR_CONTAINS(str, substr) \
@@ -111,15 +111,15 @@
#define ASSERT_FILE_EXISTS(env, path) do { \
const std::string& _s = path; \
- ASSERT_TRUE(env->FileExists(_s)) \
+ ASSERT_TRUE((env)->FileExists(_s)) \
<< "Expected file to exist: " << _s; \
-} while (0);
+} while (0)
#define ASSERT_FILE_NOT_EXISTS(env, path) do { \
const std::string& _s = path; \
- ASSERT_FALSE(env->FileExists(_s)) \
+ ASSERT_FALSE((env)->FileExists(_s)) \
<< "Expected file not to exist: " << _s; \
-} while (0);
+} while (0)
#define CURRENT_TEST_NAME() \
::testing::UnitTest::GetInstance()->current_test_info()->name()
diff --git a/src/kudu/util/trace.h b/src/kudu/util/trace.h
index c7ecbe4..fb79150 100644
--- a/src/kudu/util/trace.h
+++ b/src/kudu/util/trace.h
@@ -53,7 +53,7 @@ class Trace;
_trace->SubstituteAndTrace(__FILE__, __LINE__, (format), \
##substitutions); \
} \
- } while (0);
+ } while (0)
// Like the above, but takes the trace pointer as an explicit argument.
#define TRACE_TO(trace, format, substitutions...) \
@@ -82,7 +82,7 @@ class Trace;
if (_trace) { \
_trace->metrics()->Increment(counter_name, val); \
} \
- } while (0);
+ } while (0)
// Increment a counter for the amount of wall time spent in the current
// scope. For example:
@@ -110,7 +110,7 @@ class Trace;
} else { \
return prefix "_lt_1ms"; \
} \
- }();
+ }()
namespace kudu {
