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 3dbde7b3d [misc] replace vector::resize() with constructor's parameter
3dbde7b3d is described below
commit 3dbde7b3de0ad559ceea814b8bd4e4571995a4a9
Author: Alexey Serbin <[email protected]>
AuthorDate: Thu Sep 14 11:37:02 2023 -0700
[misc] replace vector::resize() with constructor's parameter
I noticed the following pattern that seems to be replicated
in various places:
std::vector<T> v;
v.resize(some_constant);
This patch replaces such code with calls to one of std::vector's
constructors that accepts the size of the vectors as a parameter.
I also took the liberty of updating the related code to be more
style-compliant and making other minor improvements.
This patch doesn't contain any functional modifications.
Change-Id: Id72689597c39b66a6f2f24f734a12a90afef152a
Reviewed-on: http://gerrit.cloudera.org:8080/20484
Tested-by: Kudu Jenkins
Reviewed-by: Alexey Serbin <[email protected]>
---
src/kudu/benchmarks/wal_hiccup.cc | 4 +---
src/kudu/cfile/encoding-test.cc | 10 ++++------
src/kudu/client/master_rpc.cc | 2 +-
src/kudu/client/schema.cc | 5 ++---
src/kudu/common/partition.cc | 3 +--
src/kudu/common/rowblock.cc | 3 +--
src/kudu/experiments/merge-test.cc | 3 +--
src/kudu/fs/log_block_manager.cc | 4 ++--
src/kudu/master/txn_manager-test.cc | 3 +--
src/kudu/rpc/rpc_stub-test.cc | 15 ++++++++++-----
src/kudu/rpc/server_negotiation.cc | 2 +-
src/kudu/security/tls_handshake-test.cc | 6 ++----
src/kudu/tablet/compaction.cc | 2 +-
src/kudu/tablet/delta_compaction.cc | 5 ++---
src/kudu/tablet/deltafile-test.cc | 6 +++---
src/kudu/tablet/deltamemstore-test.cc | 9 +++++----
src/kudu/tablet/lock_manager.cc | 5 ++---
src/kudu/tablet/rowset_tree.cc | 23 ++++++++++++-----------
src/kudu/tablet/tablet-test-base.h | 3 +--
src/kudu/tablet/tablet_random_access-test.cc | 7 ++-----
src/kudu/tserver/tablet_copy_source_session.cc | 2 +-
src/kudu/util/maintenance_manager.cc | 7 +++----
src/kudu/util/rle-test.cc | 3 +--
src/kudu/util/threadpool-test.cc | 3 +--
src/kudu/util/url-coding-test.cc | 6 ++----
25 files changed, 63 insertions(+), 78 deletions(-)
diff --git a/src/kudu/benchmarks/wal_hiccup.cc
b/src/kudu/benchmarks/wal_hiccup.cc
index 347d4fee5..928347bef 100644
--- a/src/kudu/benchmarks/wal_hiccup.cc
+++ b/src/kudu/benchmarks/wal_hiccup.cc
@@ -164,9 +164,7 @@ void WalHiccupBenchmarker::Run() {
int num_setups = 1 << 7;
wal_histos_.resize(num_setups);
- vector<double> total_time;
- total_time.resize(num_setups);
-
+ vector<double> total_time(num_setups);
vector<uint32_t> setups;
setups.reserve(num_setups);
for (uint32_t setup = 0; setup < num_setups; setup++) {
diff --git a/src/kudu/cfile/encoding-test.cc b/src/kudu/cfile/encoding-test.cc
index ea03329b9..6e8bd95fa 100644
--- a/src/kudu/cfile/encoding-test.cc
+++ b/src/kudu/cfile/encoding-test.cc
@@ -50,6 +50,7 @@
#include "kudu/gutil/ref_counted.h"
#include "kudu/gutil/stringprintf.h"
#include "kudu/gutil/strings/substitute.h"
+#include "kudu/util/bitmap.h"
#include "kudu/util/faststring.h"
#include "kudu/util/group_varint-inl.h"
#include "kudu/util/hexdump.h"
@@ -460,8 +461,7 @@ class TestEncoding : public KuduTest {
ASSERT_EQ(kOrdinalPosBase, bd->GetFirstRowId());
ASSERT_EQ(0, bd->GetCurrentIndex());
- vector<CppType> decoded;
- decoded.resize(size);
+ vector<CppType> decoded(size);
ColumnBlock dst_block(GetTypeInfo(Type), nullptr, &decoded[0], size,
&memory_);
ColumnDataView view(&dst_block);
@@ -578,8 +578,7 @@ class TestEncoding : public KuduTest {
ASSERT_EQ(kOrdinalPosBase, ibd->GetFirstRowId());
- vector<CppType> decoded;
- decoded.resize(to_insert.size());
+ vector<CppType> decoded(to_insert.size());
ColumnBlock dst_block(GetTypeInfo(IntType), nullptr,
&decoded[0],
@@ -662,8 +661,7 @@ class TestEncoding : public KuduTest {
ASSERT_EQ(kOrdinalPosBase, bd->GetFirstRowId());
- vector<uint8_t> decoded;
- decoded.resize(to_insert.size());
+ vector<uint8_t> decoded(to_insert.size());
ColumnBlock dst_block(GetTypeInfo(BOOL), nullptr,
&decoded[0],
diff --git a/src/kudu/client/master_rpc.cc b/src/kudu/client/master_rpc.cc
index 1bc99ac25..75d8118ed 100644
--- a/src/kudu/client/master_rpc.cc
+++ b/src/kudu/client/master_rpc.cc
@@ -242,12 +242,12 @@ ConnectToClusterRpc::ConnectToClusterRpc(LeaderCallback
user_cb,
addrs_with_names_(std::move(addrs_with_names)),
user_credentials_(std::move(user_credentials)),
rpc_timeout_(rpc_timeout),
+ responses_(addrs_with_names_.size()),
pending_responses_(0),
completed_(false) {
DCHECK(deadline.Initialized());
// Using resize instead of reserve to explicitly initialized the values.
- responses_.resize(addrs_with_names_.size());
mutable_retrier()->mutable_controller()->set_credentials_policy(creds_policy);
}
diff --git a/src/kudu/client/schema.cc b/src/kudu/client/schema.cc
index d73b09148..c7e655655 100644
--- a/src/kudu/client/schema.cc
+++ b/src/kudu/client/schema.cc
@@ -638,9 +638,8 @@ KuduSchemaBuilder*
KuduSchemaBuilder::SetNonUniquePrimaryKey(const vector<string
}
Status KuduSchemaBuilder::Build(KuduSchema* schema) {
- vector<KuduColumnSchema> cols;
- cols.resize(data_->specs.size(), KuduColumnSchema());
- for (int i = 0; i < cols.size(); i++) {
+ vector<KuduColumnSchema> cols(data_->specs.size(), KuduColumnSchema());
+ for (auto i = 0; i < cols.size(); ++i) {
RETURN_NOT_OK(data_->specs[i]->ToColumnSchema(&cols[i]));
}
diff --git a/src/kudu/common/partition.cc b/src/kudu/common/partition.cc
index d51f836b2..8089e653d 100644
--- a/src/kudu/common/partition.cc
+++ b/src/kudu/common/partition.cc
@@ -219,8 +219,7 @@ Status PartitionSchema::FromPB(
schema, pb.hash_schema(), &partition_schema->hash_schema_));
const auto custom_ranges_num = pb.custom_hash_schema_ranges_size();
- vector<HashSchema> range_hash_schemas;
- range_hash_schemas.resize(custom_ranges_num);
+ vector<HashSchema> range_hash_schemas(custom_ranges_num);
vector<pair<KuduPartialRow, KuduPartialRow>> range_bounds;
for (auto i = 0; i < custom_ranges_num; ++i) {
const auto& range = pb.custom_hash_schema_ranges(i);
diff --git a/src/kudu/common/rowblock.cc b/src/kudu/common/rowblock.cc
index 059fbf169..6271df0e6 100644
--- a/src/kudu/common/rowblock.cc
+++ b/src/kudu/common/rowblock.cc
@@ -106,9 +106,8 @@ SelectedRows SelectionVector::GetSelectedRows() const {
return SelectedRows(this);
}
- vector<uint16_t> selected;
+ vector<uint16_t> selected(n_selected > 0 ? n_selected : 0);
if (n_selected > 0) {
- selected.resize(n_selected);
if (kHasBmi) {
GetSelectedRowsInternal<true>(&bitmap_[0], n_bytes_, selected.data());
} else {
diff --git a/src/kudu/experiments/merge-test.cc
b/src/kudu/experiments/merge-test.cc
index fc3cfc87d..285d0d300 100644
--- a/src/kudu/experiments/merge-test.cc
+++ b/src/kudu/experiments/merge-test.cc
@@ -107,8 +107,7 @@ void SimpleMerge(const vector<vector<MergeType> > &in_lists,
int main(int argc, char **argv) {
google::ParseCommandLineFlags(&argc, &argv, true);
- vector<vector<MergeType> > in_lists;
- in_lists.resize(FLAGS_num_lists);
+ vector<vector<MergeType>> in_lists(FLAGS_num_lists);
for (int i = 0; i < FLAGS_num_lists; i++) {
vector<MergeType> &list = in_lists[i];
diff --git a/src/kudu/fs/log_block_manager.cc b/src/kudu/fs/log_block_manager.cc
index 87acadc30..610758317 100644
--- a/src/kudu/fs/log_block_manager.cc
+++ b/src/kudu/fs/log_block_manager.cc
@@ -2356,13 +2356,13 @@ LogBlockManager::LogBlockManager(Env* env,
mem_tracker_(MemTracker::CreateTracker(-1,
"log_block_manager",
opts_.parent_mem_tracker)),
+ managed_block_shards_(kBlockMapChunk),
file_cache_(file_cache),
buggy_el6_kernel_(IsBuggyEl6Kernel(env->GetKernelRelease())),
next_block_id_(1),
tenant_id_(std::move(tenant_id)) {
- managed_block_shards_.resize(kBlockMapChunk);
for (auto& mb : managed_block_shards_) {
- mb.lock = unique_ptr<simple_spinlock>(new simple_spinlock());
+ mb.lock = unique_ptr<simple_spinlock>(new simple_spinlock);
mb.blocks_by_block_id
= unique_ptr<BlockMap>(new BlockMap(10,
BlockMap::hasher(),
diff --git a/src/kudu/master/txn_manager-test.cc
b/src/kudu/master/txn_manager-test.cc
index 70818e7b0..0cd8277db 100644
--- a/src/kudu/master/txn_manager-test.cc
+++ b/src/kudu/master/txn_manager-test.cc
@@ -489,8 +489,7 @@ TEST_F(TxnManagerTest, BeginManyTransactions) {
const size_t kNumThreads = 2 * kNumCPUs;
vector<thread> threads;
threads.reserve(kNumThreads);
- vector<vector<int64_t>> txn_ids_per_thread;
- txn_ids_per_thread.resize(kNumThreads);
+ vector<vector<int64_t>> txn_ids_per_thread(kNumThreads);
for (auto& slice : txn_ids_per_thread) {
slice.reserve(kNumTransactionsPerThread);
}
diff --git a/src/kudu/rpc/rpc_stub-test.cc b/src/kudu/rpc/rpc_stub-test.cc
index abf21ee24..2454d0d2f 100644
--- a/src/kudu/rpc/rpc_stub-test.cc
+++ b/src/kudu/rpc/rpc_stub-test.cc
@@ -27,6 +27,7 @@
#include <ostream>
#include <string>
#include <thread>
+#include <type_traits>
#include <vector>
#include <gflags/gflags.h>
@@ -36,7 +37,6 @@
#include "kudu/gutil/atomicops.h"
#include "kudu/gutil/ref_counted.h"
-#include "kudu/rpc/messenger.h"
#include "kudu/rpc/proxy.h"
#include "kudu/rpc/rpc-test-base.h"
#include "kudu/rpc/rpc_controller.h"
@@ -61,6 +61,12 @@
#include "kudu/util/thread_restrictions.h"
#include "kudu/util/user.h"
+namespace kudu {
+namespace rpc {
+class Messenger;
+} // namespace rpc
+} // namespace kudu
+
DEFINE_bool(is_panic_test_child, false, "Used by TestRpcPanic");
DECLARE_bool(socket_inject_short_recvs);
@@ -123,10 +129,9 @@ TEST_F(RpcStubTest, TestShortRecvs) {
// IO threads can deal with read/write calls that don't succeed
// in sending the entire data in one go.
TEST_F(RpcStubTest, TestBigCallData) {
- const int kNumSentAtOnce = 20;
- const size_t kMessageSize = 5 * 1024 * 1024;
- string data;
- data.resize(kMessageSize);
+ constexpr int kNumSentAtOnce = 20;
+ constexpr size_t kMessageSize = 5 * 1024 * 1024;
+ string data(kMessageSize, string::value_type());
CalculatorServiceProxy p(client_messenger_, server_addr_,
server_addr_.host());
diff --git a/src/kudu/rpc/server_negotiation.cc
b/src/kudu/rpc/server_negotiation.cc
index 1e2caa606..2f4481ee4 100644
--- a/src/kudu/rpc/server_negotiation.cc
+++ b/src/kudu/rpc/server_negotiation.cc
@@ -397,7 +397,7 @@ Status
ServerNegotiation::SendError(ErrorStatusPB::RpcErrorCodePB code, const St
Status ServerNegotiation::ValidateConnectionHeader(faststring* recv_buf) {
TRACE("Waiting for connection header");
size_t num_read;
- const size_t conn_header_len = kMagicNumberLength + kHeaderFlagsLength;
+ static constexpr size_t conn_header_len = kMagicNumberLength +
kHeaderFlagsLength;
recv_buf->resize(conn_header_len);
RETURN_NOT_OK(socket_->BlockingRecv(recv_buf->data(), conn_header_len,
&num_read, deadline_));
DCHECK_EQ(conn_header_len, num_read);
diff --git a/src/kudu/security/tls_handshake-test.cc
b/src/kudu/security/tls_handshake-test.cc
index 9e8f2a2da..1c88d2306 100644
--- a/src/kudu/security/tls_handshake-test.cc
+++ b/src/kudu/security/tls_handshake-test.cc
@@ -135,8 +135,7 @@ class TestTlsHandshakeBase : public KuduTest {
static void ReadAndCompare(SSL* ssl, const string& expected_data) {
ASSERT_GT(expected_data.size(), 0);
string result;
- string buf;
- buf.resize(expected_data.size());
+ string buf(expected_data.size(), string::value_type());
int yet_to_read = expected_data.size();
while (yet_to_read > 0) {
auto bytes_read = SSL_read(ssl, buf.data(), yet_to_read);
@@ -181,8 +180,7 @@ class TestTlsHandshakeBase : public KuduTest {
BIO* wbio = SSL_get_wbio(src);
int pending_wr = BIO_ctrl_pending(wbio);
- string data;
- data.resize(pending_wr);
+ string data(pending_wr, string::value_type());
auto bytes_read = BIO_read(wbio, &data[0], data.size());
ASSERT_EQ(data.size(), bytes_read);
ASSERT_EQ(0, BIO_ctrl_pending(wbio));
diff --git a/src/kudu/tablet/compaction.cc b/src/kudu/tablet/compaction.cc
index 07598976b..37a7c5734 100644
--- a/src/kudu/tablet/compaction.cc
+++ b/src/kudu/tablet/compaction.cc
@@ -138,7 +138,7 @@ class MemRowSetCompactionInput : public CompactionInput {
}
Status PrepareBlock(vector<CompactionInputRow>* block) override {
- int num_in_block = iter_->remaining_in_leaf();
+ const auto num_in_block = iter_->remaining_in_leaf();
block->resize(num_in_block);
// Realloc the internal block storage if we don't have enough space to
diff --git a/src/kudu/tablet/delta_compaction.cc
b/src/kudu/tablet/delta_compaction.cc
index 8f6d27f56..b0e579269 100644
--- a/src/kudu/tablet/delta_compaction.cc
+++ b/src/kudu/tablet/delta_compaction.cc
@@ -157,9 +157,8 @@ Status MajorDeltaCompaction::FlushRowSetAndDeltas(const
IOContext* io_context) {
// 3) Write new UNDO mutations for the current block. The REDO mutations
// are written out in step 6.
- vector<CompactionInputRow> input_rows;
- input_rows.resize(block.nrows());
- for (int i = 0; i < block.nrows(); i++) {
+ vector<CompactionInputRow> input_rows(block.nrows());
+ for (auto i = 0; i < block.nrows(); ++i) {
CompactionInputRow* input_row = &input_rows[i];
input_row->row.Reset(&block, i);
input_row->redo_head = redo_mutation_block[i];
diff --git a/src/kudu/tablet/deltafile-test.cc
b/src/kudu/tablet/deltafile-test.cc
index 1fc2620b4..0762c207d 100644
--- a/src/kudu/tablet/deltafile-test.cc
+++ b/src/kudu/tablet/deltafile-test.cc
@@ -23,6 +23,7 @@
#include <memory>
#include <ostream>
#include <string>
+#include <type_traits>
#include <utility>
#include <vector>
@@ -53,6 +54,7 @@
#include "kudu/tablet/mvcc.h"
#include "kudu/tablet/rowset.h"
#include "kudu/tablet/tablet-test-util.h"
+#include "kudu/util/bitmap.h"
#include "kudu/util/faststring.h"
#include "kudu/util/memory/arena.h"
#include "kudu/util/random.h"
@@ -309,9 +311,7 @@ TEST_F(TestDeltaFile, TestCollectMutations) {
ASSERT_OK(it->Init(nullptr));
ASSERT_OK(it->SeekToOrdinal(0));
- vector<Mutation *> mutations;
- mutations.resize(100);
-
+ vector<Mutation*> mutations(100);
Arena arena(1024);
int start_row = 0;
diff --git a/src/kudu/tablet/deltamemstore-test.cc
b/src/kudu/tablet/deltamemstore-test.cc
index 9cbeda980..44a479a22 100644
--- a/src/kudu/tablet/deltamemstore-test.cc
+++ b/src/kudu/tablet/deltamemstore-test.cc
@@ -26,6 +26,7 @@
#include <memory>
#include <ostream>
#include <string>
+#include <type_traits>
#include <unordered_set>
#include <utility>
#include <vector>
@@ -35,8 +36,8 @@
#include <gtest/gtest.h>
#include "kudu/clock/logical_clock.h"
-#include "kudu/common/columnblock.h"
#include "kudu/common/columnblock-test-util.h"
+#include "kudu/common/columnblock.h"
#include "kudu/common/common.pb.h"
#include "kudu/common/row_changelist.h"
#include "kudu/common/rowblock.h"
@@ -58,6 +59,7 @@
#include "kudu/tablet/mvcc.h"
#include "kudu/tablet/rowset.h"
#include "kudu/tablet/tablet-test-util.h"
+#include "kudu/util/bitmap.h"
#include "kudu/util/faststring.h"
#include "kudu/util/mem_tracker.h"
#include "kudu/util/memory/arena.h"
@@ -589,9 +591,8 @@ TEST_F(TestDeltaMemStore, TestCollectMutations) {
ASSERT_EQ(2, dms_->Count());
- const int kBatchSize = 10;
- vector<Mutation *> mutations;
- mutations.resize(kBatchSize);
+ constexpr size_t kBatchSize = 10;
+ vector<Mutation*> mutations(kBatchSize);
RowIteratorOptions opts;
opts.projection = &schema_;
diff --git a/src/kudu/tablet/lock_manager.cc b/src/kudu/tablet/lock_manager.cc
index 2981b5dbb..90bfe9ef7 100644
--- a/src/kudu/tablet/lock_manager.cc
+++ b/src/kudu/tablet/lock_manager.cc
@@ -188,9 +188,8 @@ class LockTable {
};
vector<LockEntry*> LockTable::GetLockEntries(ArrayView<Slice> keys) {
- vector<LockEntry*> entries;
- entries.resize(keys.size());
- for (int i = 0; i < keys.size(); i++) {
+ vector<LockEntry*> entries(keys.size());
+ for (auto i = 0; i < keys.size(); ++i) {
entries[i] = new LockEntry(keys[i]);
}
diff --git a/src/kudu/tablet/rowset_tree.cc b/src/kudu/tablet/rowset_tree.cc
index 8d861dcb9..171ad6c6e 100644
--- a/src/kudu/tablet/rowset_tree.cc
+++ b/src/kudu/tablet/rowset_tree.cc
@@ -21,19 +21,21 @@
#include <cstddef>
#include <functional>
#include <memory>
+#include <ostream>
#include <string>
+#include <type_traits>
#include <vector>
-#include <ostream>
#include <glog/logging.h>
#include "kudu/gutil/stl_util.h"
#include "kudu/tablet/rowset.h"
-#include "kudu/tablet/rowset_metadata.h"
-#include "kudu/util/interval_tree.h"
+#include "kudu/tablet/rowset_metadata.h" // IWYU pragma: keep
#include "kudu/util/interval_tree-inl.h"
+#include "kudu/util/interval_tree.h"
#include "kudu/util/slice.h"
+using std::function;
using std::optional;
using std::shared_ptr;
using std::string;
@@ -128,12 +130,12 @@ RowSetTree::RowSetTree()
}
Status RowSetTree::Reset(const RowSetVector &rowsets) {
- CHECK(!initted_);
- std::vector<RowSetWithBounds *> entries;
+ DCHECK(!initted_);
+ vector<RowSetWithBounds *> entries;
RowSetVector unbounded;
ElementDeleter deleter(&entries);
entries.reserve(rowsets.size());
- std::vector<RSEndpoint> endpoints;
+ vector<RSEndpoint> endpoints;
endpoints.reserve(rowsets.size()*2);
// Iterate over each of the provided RowSets, fetching their
@@ -234,8 +236,8 @@ void RowSetTree::FindRowSetsWithKeyInRange(const Slice
&encoded_key,
}
void RowSetTree::ForEachRowSetContainingKeys(
- const std::vector<Slice>& encoded_keys,
- const std::function<void(RowSet*, int)>& cb) const {
+ const vector<Slice>& encoded_keys,
+ const function<void(RowSet*, int)>& cb) const {
DCHECK(std::is_sorted(encoded_keys.cbegin(), encoded_keys.cend(),
Slice::Comparator()));
@@ -250,9 +252,8 @@ void RowSetTree::ForEachRowSetContainingKeys(
// the matching Slices, but that won't allow us to easily tell the caller
// which specific operation _index_ matched the RowSet. So, we make a vector
// of QueryStructs to pair the Slice with its original index.
- vector<QueryStruct> queries;
- queries.resize(encoded_keys.size());
- for (int i = 0; i < encoded_keys.size(); i++) {
+ vector<QueryStruct> queries(encoded_keys.size());
+ for (auto i = 0; i < encoded_keys.size(); ++i) {
queries[i] = {encoded_keys[i], i};
}
diff --git a/src/kudu/tablet/tablet-test-base.h
b/src/kudu/tablet/tablet-test-base.h
index a275fdecf..2461eda19 100644
--- a/src/kudu/tablet/tablet-test-base.h
+++ b/src/kudu/tablet/tablet-test-base.h
@@ -533,8 +533,7 @@ class TabletTestBase : public KuduTabletTest {
// Keep a bitmap of which rows have been seen from the requested
// range.
- std::vector<bool> seen_rows;
- seen_rows.resize(expected_row_count);
+ std::vector<bool> seen_rows(expected_row_count);
uint64_t actual_row_count = 0;
while (iter->HasNext()) {
diff --git a/src/kudu/tablet/tablet_random_access-test.cc
b/src/kudu/tablet/tablet_random_access-test.cc
index 9884395d8..330cab00c 100644
--- a/src/kudu/tablet/tablet_random_access-test.cc
+++ b/src/kudu/tablet/tablet_random_access-test.cc
@@ -38,7 +38,6 @@
#include "kudu/common/rowblock_memory.h"
#include "kudu/common/scan_spec.h"
#include "kudu/common/schema.h"
-#include "kudu/gutil/port.h"
#include "kudu/tablet/key_value_test_schema.h"
#include "kudu/tablet/local_tablet_writer.h"
#include "kudu/tablet/rowset.h"
@@ -80,6 +79,7 @@ class TestRandomAccess : public KuduTabletTest {
public:
TestRandomAccess()
: KuduTabletTest(CreateKeyValueTestSchema()),
+ expected_tablet_state_(FLAGS_keyspace_size),
done_(1) {
OverrideFlagForSlowTests("keyspace_size", "30000");
OverrideFlagForSlowTests("runtime_seconds", "10");
@@ -88,10 +88,9 @@ class TestRandomAccess : public KuduTabletTest {
// Set a small block size to increase chances that a single update will
span
// multiple delta blocks.
FLAGS_deltafile_default_block_size = 1024;
- expected_tablet_state_.resize(FLAGS_keyspace_size);
}
- virtual void SetUp() OVERRIDE {
+ void SetUp() override {
KuduTabletTest::SetUp();
writer_.reset(new LocalTabletWriter(tablet().get(), &client_schema_));
SeedRandom();
@@ -389,7 +388,5 @@ TEST_F(TestRandomAccess, Test) {
NO_FATALS(DoRandomBatches());
}
-
-
} // namespace tablet
} // namespace kudu
diff --git a/src/kudu/tserver/tablet_copy_source_session.cc
b/src/kudu/tserver/tablet_copy_source_session.cc
index 3058c56aa..0c841bd32 100644
--- a/src/kudu/tserver/tablet_copy_source_session.cc
+++ b/src/kudu/tserver/tablet_copy_source_session.cc
@@ -269,7 +269,7 @@ static Status ReadFileChunkToBuf(const Info* info,
// however any modern compiler should be compatible with it.
// Violates the API contract, but avoids excessive copies.
data->resize(response_data_size);
- uint8_t* buf = reinterpret_cast<uint8_t*>(const_cast<char*>(data->data()));
+ uint8_t* buf = reinterpret_cast<uint8_t*>(data->data());
Slice slice(buf, response_data_size);
Status s = info->Read(offset, slice);
if (PREDICT_FALSE(!s.ok())) {
diff --git a/src/kudu/util/maintenance_manager.cc
b/src/kudu/util/maintenance_manager.cc
index ec245adb8..56064e3e1 100644
--- a/src/kudu/util/maintenance_manager.cc
+++ b/src/kudu/util/maintenance_manager.cc
@@ -188,6 +188,9 @@ MaintenanceManager::MaintenanceManager(
cond_(&lock_),
shutdown_(false),
running_ops_(0),
+ completed_ops_(options.history_size
+ ? options.history_size
+ : FLAGS_maintenance_manager_history_size),
completed_ops_count_(0),
rand_(GetRandomSeed32()),
memory_pressure_func_(&process_memory::UnderMemoryPressure),
@@ -196,10 +199,6 @@ MaintenanceManager::MaintenanceManager(
.set_min_threads(num_threads_)
.set_max_threads(num_threads_)
.Build(&thread_pool_));
- uint32_t history_size = options.history_size == 0 ?
- FLAGS_maintenance_manager_history_size :
- options.history_size;
- completed_ops_.resize(history_size);
}
MaintenanceManager::~MaintenanceManager() {
diff --git a/src/kudu/util/rle-test.cc b/src/kudu/util/rle-test.cc
index c8467c3dc..c85553c08 100644
--- a/src/kudu/util/rle-test.cc
+++ b/src/kudu/util/rle-test.cc
@@ -227,10 +227,9 @@ void ValidateRle(const vector<T>& values, int bit_width,
TEST(Rle, SpecificSequences) {
const int kTestLen = 1024;
uint8_t expected_buffer[kTestLen];
- vector<uint64_t> values;
+ vector<uint64_t> values(100);
// Test 50 0' followed by 50 1's
- values.resize(100);
for (int i = 0; i < 50; ++i) {
values[i] = 0;
}
diff --git a/src/kudu/util/threadpool-test.cc b/src/kudu/util/threadpool-test.cc
index 41d18ad08..c12acf1cd 100644
--- a/src/kudu/util/threadpool-test.cc
+++ b/src/kudu/util/threadpool-test.cc
@@ -1139,8 +1139,7 @@ TEST_P(ThreadPoolTestTokenTypes, TestTokenWaitForAll) {
const int kNumTokens = 3;
const int kNumSubmissions = 20;
Random r(SeedRandom());
- vector<unique_ptr<ThreadPoolToken>> tokens;
- tokens.resize(kNumTokens);
+ vector<unique_ptr<ThreadPoolToken>> tokens(kNumTokens);
for (int i = 0; i < kNumTokens; i++) {
tokens[i] = pool_->NewToken(GetParam());
}
diff --git a/src/kudu/util/url-coding-test.cc b/src/kudu/util/url-coding-test.cc
index aca738f28..9504f695c 100644
--- a/src/kudu/util/url-coding-test.cc
+++ b/src/kudu/util/url-coding-test.cc
@@ -44,8 +44,7 @@ void TestUrl(const string& input, const string&
expected_encoded, bool hive_comp
EXPECT_EQ(input, output);
// Convert string to vector and try that also
- vector<uint8_t> input_vector;
- input_vector.resize(input.size());
+ vector<uint8_t> input_vector(input.size());
if (!input.empty()) {
memcpy(&input_vector[0], input.c_str(), input.size());
}
@@ -65,8 +64,7 @@ void TestBase64(const string& input, const string&
expected_encoded) {
EXPECT_EQ(input, output);
// Convert string to vector and try that also
- vector<uint8_t> input_vector;
- input_vector.resize(input.size());
+ vector<uint8_t> input_vector(input.size());
memcpy(&input_vector[0], input.c_str(), input.size());
string intermediate2;
Base64Encode(input_vector, &intermediate2);
