You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by to...@apache.org on 2017/06/13 16:10:21 UTC
[3/5] kudu git commit: tidy: add and fix modernize-use-emplace and
shrink-to-fit
http://git-wip-us.apache.org/repos/asf/kudu/blob/3ff6c9ba/src/kudu/tserver/tablet_copy_service-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tserver/tablet_copy_service-test.cc b/src/kudu/tserver/tablet_copy_service-test.cc
index 420bd28..ffa35bb 100644
--- a/src/kudu/tserver/tablet_copy_service-test.cc
+++ b/src/kudu/tserver/tablet_copy_service-test.cc
@@ -245,7 +245,7 @@ TEST_F(TabletCopyServiceTest, TestBeginConcurrently) {
// Test bad session id error condition.
TEST_F(TabletCopyServiceTest, TestInvalidSessionId) {
vector<string> bad_session_ids;
- bad_session_ids.push_back("hodor");
+ bad_session_ids.emplace_back("hodor");
bad_session_ids.push_back(GetLocalUUID());
// Fetch a block for a non-existent session.
http://git-wip-us.apache.org/repos/asf/kudu/blob/3ff6c9ba/src/kudu/tserver/tablet_server-test-base.h
----------------------------------------------------------------------
diff --git a/src/kudu/tserver/tablet_server-test-base.h b/src/kudu/tserver/tablet_server-test-base.h
index 178bb11..800c5cd 100644
--- a/src/kudu/tserver/tablet_server-test-base.h
+++ b/src/kudu/tserver/tablet_server-test-base.h
@@ -102,7 +102,7 @@ class TabletServerTestBase : public KuduTest {
// heartbeats, even if there happens to be a master running on this machine.
mini_server_.reset(new MiniTabletServer(GetTestPath("TabletServerTest-fsroot"), 0));
mini_server_->options()->master_addresses.clear();
- mini_server_->options()->master_addresses.push_back(HostPort("255.255.255.255", 1));
+ mini_server_->options()->master_addresses.emplace_back("255.255.255.255", 1);
ASSERT_OK(mini_server_->Start());
// Set up a tablet inside the server.
@@ -345,7 +345,7 @@ class TabletServerTestBase : public KuduTest {
// Start server.
mini_server_.reset(new MiniTabletServer(GetTestPath("TabletServerTest-fsroot"), 0));
mini_server_->options()->master_addresses.clear();
- mini_server_->options()->master_addresses.push_back(HostPort("255.255.255.255", 1));
+ mini_server_->options()->master_addresses.emplace_back("255.255.255.255", 1);
// this should open the tablet created on StartTabletServer()
RETURN_NOT_OK(mini_server_->Start());
http://git-wip-us.apache.org/repos/asf/kudu/blob/3ff6c9ba/src/kudu/util/compression/compression-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/util/compression/compression-test.cc b/src/kudu/util/compression/compression-test.cc
index 1befbe5..36d003c 100644
--- a/src/kudu/util/compression/compression-test.cc
+++ b/src/kudu/util/compression/compression-test.cc
@@ -59,9 +59,9 @@ static void TestCompressionCodec(CompressionType compression) {
// Compress slices and uncompress
vector<Slice> v;
- v.push_back(Slice(ibuffer, 1));
+ v.emplace_back(ibuffer, 1);
for (int i = 1; i <= kInputSize; i += 7)
- v.push_back(Slice(ibuffer + i, 7));
+ v.emplace_back(ibuffer + i, 7);
ASSERT_OK(codec->Compress(Slice(ibuffer, kInputSize), cbuffer.get(), &compressed));
ASSERT_OK(codec->Uncompress(Slice(cbuffer.get(), compressed), ubuffer, kInputSize));
ASSERT_EQ(0, memcmp(ibuffer, ubuffer, kInputSize));
http://git-wip-us.apache.org/repos/asf/kudu/blob/3ff6c9ba/src/kudu/util/debug/trace_event_impl.cc
----------------------------------------------------------------------
diff --git a/src/kudu/util/debug/trace_event_impl.cc b/src/kudu/util/debug/trace_event_impl.cc
index f976c87..5755e30 100644
--- a/src/kudu/util/debug/trace_event_impl.cc
+++ b/src/kudu/util/debug/trace_event_impl.cc
@@ -982,7 +982,7 @@ void TraceSamplingThread::RegisterSampleBucket(
// that uses the sample_buckets_, because it is guaranteed that
// RegisterSampleBucket is called before the sampling thread is created.
DCHECK(!thread_running_);
- sample_buckets_.push_back(TraceBucketData(bucket, name, callback));
+ sample_buckets_.emplace_back(bucket, name, callback);
}
// static
http://git-wip-us.apache.org/repos/asf/kudu/blob/3ff6c9ba/src/kudu/util/interval_tree-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/util/interval_tree-test.cc b/src/kudu/util/interval_tree-test.cc
index 34a1d07..0386dab 100644
--- a/src/kudu/util/interval_tree-test.cc
+++ b/src/kudu/util/interval_tree-test.cc
@@ -187,16 +187,16 @@ static vector<IntInterval> CreateRandomIntervals(int n = 100) {
for (int i = 0; i < n; i++) {
int l = rand() % 100; // NOLINT(runtime/threadsafe_fn)
int r = l + rand() % 20; // NOLINT(runtime/threadsafe_fn)
- intervals.push_back(IntInterval(l, r, i));
+ intervals.emplace_back(l, r, i);
}
return intervals;
}
TEST_F(TestIntervalTree, TestBasic) {
vector<IntInterval> intervals;
- intervals.push_back(IntInterval(1, 2, 1));
- intervals.push_back(IntInterval(3, 4, 2));
- intervals.push_back(IntInterval(1, 4, 3));
+ intervals.emplace_back(1, 2, 1);
+ intervals.emplace_back(3, 4, 2);
+ intervals.emplace_back(1, 4, 3);
IntervalTree<IntTraits> t(intervals);
for (int i = 0; i <= 5; i++) {
http://git-wip-us.apache.org/repos/asf/kudu/blob/3ff6c9ba/src/kudu/util/knapsack_solver-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/util/knapsack_solver-test.cc b/src/kudu/util/knapsack_solver-test.cc
index 4d95ada..787fcd1 100644
--- a/src/kudu/util/knapsack_solver-test.cc
+++ b/src/kudu/util/knapsack_solver-test.cc
@@ -81,10 +81,10 @@ TEST_F(TestKnapsack, Basics) {
KnapsackSolver<TestItemTraits> solver;
vector<TestItem> in;
- in.push_back(TestItem(500, 3));
- in.push_back(TestItem(110, 1));
- in.push_back(TestItem(125, 1));
- in.push_back(TestItem(100, 1));
+ in.emplace_back(500, 3);
+ in.emplace_back(110, 1);
+ in.emplace_back(125, 1);
+ in.emplace_back(100, 1);
vector<int> out;
double max_val;
http://git-wip-us.apache.org/repos/asf/kudu/blob/3ff6c9ba/src/kudu/util/path_util.cc
----------------------------------------------------------------------
diff --git a/src/kudu/util/path_util.cc b/src/kudu/util/path_util.cc
index 6a095cc..091950a 100644
--- a/src/kudu/util/path_util.cc
+++ b/src/kudu/util/path_util.cc
@@ -56,7 +56,7 @@ std::string JoinPathSegments(const std::string &a,
vector<string> SplitPath(const string& path) {
if (path.empty()) return {};
vector<string> segments;
- if (path[0] == '/') segments.push_back("/");
+ if (path[0] == '/') segments.emplace_back("/");
vector<StringPiece> pieces = Split(path, "/", SkipEmpty());
for (const StringPiece& piece : pieces) {
segments.emplace_back(piece.data(), piece.size());
http://git-wip-us.apache.org/repos/asf/kudu/blob/3ff6c9ba/src/kudu/util/pstack_watcher.cc
----------------------------------------------------------------------
diff --git a/src/kudu/util/pstack_watcher.cc b/src/kudu/util/pstack_watcher.cc
index 4ba7ada..e4fbddf 100644
--- a/src/kudu/util/pstack_watcher.cc
+++ b/src/kudu/util/pstack_watcher.cc
@@ -126,29 +126,29 @@ Status PstackWatcher::DumpPidStacks(pid_t pid, int flags) {
Status PstackWatcher::RunGdbStackDump(pid_t pid, int flags) {
// Command: gdb -quiet -batch -nx -ex cmd1 -ex cmd2 /proc/$PID/exe $PID
vector<string> argv;
- argv.push_back("gdb");
+ argv.emplace_back("gdb");
// Don't print introductory version/copyright messages.
- argv.push_back("-quiet");
+ argv.emplace_back("-quiet");
// Exit after processing all of the commands below.
- argv.push_back("-batch");
+ argv.emplace_back("-batch");
// Don't run commands from .gdbinit
- argv.push_back("-nx");
+ argv.emplace_back("-nx");
// On RHEL6 and older Ubuntu, we occasionally would see gdb spin forever
// trying to collect backtraces. Setting a backtrace limit is a reasonable
// workaround, since we don't really expect >100-deep stacks anyway.
//
// See https://bugs.launchpad.net/ubuntu/+source/gdb/+bug/434168
- argv.push_back("-ex");
- argv.push_back("set backtrace limit 100");
- argv.push_back("-ex");
- argv.push_back("set print pretty on");
- argv.push_back("-ex");
- argv.push_back("info threads");
- argv.push_back("-ex");
- argv.push_back("thread apply all bt");
+ argv.emplace_back("-ex");
+ argv.emplace_back("set backtrace limit 100");
+ argv.emplace_back("-ex");
+ argv.emplace_back("set print pretty on");
+ argv.emplace_back("-ex");
+ argv.emplace_back("info threads");
+ argv.emplace_back("-ex");
+ argv.emplace_back("thread apply all bt");
if (flags & DUMP_FULL) {
- argv.push_back("-ex");
- argv.push_back("thread apply all bt full");
+ argv.emplace_back("-ex");
+ argv.emplace_back("thread apply all bt full");
}
string executable;
Env* env = Env::Default();
http://git-wip-us.apache.org/repos/asf/kudu/blob/3ff6c9ba/src/kudu/util/trace-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/util/trace-test.cc b/src/kudu/util/trace-test.cc
index 6c38b0c..77c3c91 100644
--- a/src/kudu/util/trace-test.cc
+++ b/src/kudu/util/trace-test.cc
@@ -439,9 +439,9 @@ class TraceEventCallbackTest : public KuduTest {
const uint64_t arg_values[],
unsigned char flags) {
s_instance->collected_events_phases_.push_back(phase);
- s_instance->collected_events_categories_.push_back(
+ s_instance->collected_events_categories_.emplace_back(
TraceLog::GetCategoryGroupName(category_group_enabled));
- s_instance->collected_events_names_.push_back(name);
+ s_instance->collected_events_names_.emplace_back(name);
s_instance->collected_events_timestamps_.push_back(timestamp);
}
};