[kudu] branch master updated: full_stack-insert-scan-test: allow customization of number of tservers

[adar]

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


The following commit(s) were added to refs/heads/master by this push:
     new d64ac1c  full_stack-insert-scan-test: allow customization of number of 
tservers
d64ac1c is described below

commit d64ac1c4edb61f15e9b7268044017ca138e0dd05
Author: Adar Dembo <a...@cloudera.com>
AuthorDate: Wed Jan 22 17:35:46 2020 -0800

    full_stack-insert-scan-test: allow customization of number of tservers
    
    Also snuck in some gscoped_ptr -> unique_ptr changes.
    
    Change-Id: Ibf903b058e8ff4fd87c5897ab261c9bc6f87fc06
    Reviewed-on: http://gerrit.cloudera.org:8080/15094
    Tested-by: Kudu Jenkins
    Reviewed-by: Alexey Serbin <aser...@cloudera.com>
---
 src/kudu/integration-tests/full_stack-insert-scan-test.cc | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/kudu/integration-tests/full_stack-insert-scan-test.cc 
b/src/kudu/integration-tests/full_stack-insert-scan-test.cc
index ac35ab2..98a15a0 100644
--- a/src/kudu/integration-tests/full_stack-insert-scan-test.cc
+++ b/src/kudu/integration-tests/full_stack-insert-scan-test.cc
@@ -22,10 +22,10 @@
 #include <memory>
 #include <ostream>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include <gflags/gflags.h>
-#include <gflags/gflags_declare.h>
 #include <glog/logging.h>
 #include <gtest/gtest.h>
 
@@ -39,7 +39,6 @@
 #include "kudu/client/write_op.h"
 #include "kudu/codegen/compilation_manager.h"
 #include "kudu/common/partial_row.h"
-#include "kudu/gutil/gscoped_ptr.h"
 #include "kudu/gutil/port.h"
 #include "kudu/gutil/ref_counted.h"
 #include "kudu/gutil/strings/split.h"
@@ -66,6 +65,7 @@
 #include "kudu/util/thread.h"
 
 DEFINE_bool(skip_scans, false, "Whether to skip the scan part of the test.");
+DEFINE_int32(num_tservers, 1, "Number of tablet servers in the test cluster");
 
 // Test size parameters
 DEFINE_int32(concurrent_inserts, -1, "Number of inserting clients to launch");
@@ -146,7 +146,7 @@ class FullStackInsertScanTest : public KuduTest {
     ASSERT_GE(kNumInsertClients, 0);
     ASSERT_GE(kNumInsertsPerClient, 0);
     NO_FATALS(InitCluster());
-    gscoped_ptr<KuduTableCreator> table_creator(client_->NewTableCreator());
+    unique_ptr<KuduTableCreator> table_creator(client_->NewTableCreator());
     ASSERT_OK(table_creator->table_name(kTableName)
              .schema(&schema_)
              .set_range_partition_columns({ "key" })
@@ -172,7 +172,9 @@ class FullStackInsertScanTest : public KuduTest {
 
   void InitCluster() {
     // Start mini-cluster with 1 tserver, config client options
-    cluster_.reset(new InternalMiniCluster(env_, 
InternalMiniClusterOptions()));
+    InternalMiniClusterOptions opts;
+    opts.num_tablet_servers = FLAGS_num_tservers;
+    cluster_.reset(new InternalMiniCluster(env_, std::move(opts)));
     ASSERT_OK(cluster_->Start());
     KuduClientBuilder builder;
     builder.add_master_server_addr(
@@ -368,7 +370,7 @@ void FullStackInsertScanTest::InsertRows(CountDownLatch* 
start_latch, int id,
   char randstr[kRandomStrMaxLength + 1];
   // Insert in the id's key range
   for (int64_t key = start; key < end; ++key) {
-    gscoped_ptr<KuduInsert> insert(table->NewInsert());
+    unique_ptr<KuduInsert> insert(table->NewInsert());
     RandomRow(&rng, insert->mutable_row(), randstr, key, id);
     CHECK_OK(session->Apply(insert.release()));