kudu-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mpe...@apache.org
Subject [4/5] kudu git commit: Rename MiniClusterOptions to InternalMiniClusterOptions
Date Wed, 28 Jun 2017 18:44:09 GMT
Rename MiniClusterOptions to InternalMiniClusterOptions

Change-Id: I5bb1a87d916fdc0a248b5b6174306cc544333685
Reviewed-on: http://gerrit.cloudera.org:8080/7287
Tested-by: Mike Percy <mpercy@apache.org>
Reviewed-by: Todd Lipcon <todd@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/cd8e7afb
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/cd8e7afb
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/cd8e7afb

Branch: refs/heads/master
Commit: cd8e7afb47042fd00e073b9d2c54aee6f549fb5a
Parents: 4f9b0e3
Author: Mike Percy <mpercy@apache.org>
Authored: Fri Jun 23 19:46:31 2017 -0400
Committer: Todd Lipcon <todd@apache.org>
Committed: Wed Jun 28 18:42:44 2017 +0000

----------------------------------------------------------------------
 src/kudu/benchmarks/tpch/rpc_line_item_dao-test.cc           | 2 +-
 src/kudu/benchmarks/tpch/tpch1.cc                            | 2 +-
 src/kudu/client/client-test.cc                               | 2 +-
 src/kudu/client/predicate-test.cc                            | 2 +-
 src/kudu/client/scan_token-test.cc                           | 2 +-
 src/kudu/integration-tests/alter_table-test.cc               | 2 +-
 src/kudu/integration-tests/create-table-stress-test.cc       | 2 +-
 src/kudu/integration-tests/full_stack-insert-scan-test.cc    | 2 +-
 src/kudu/integration-tests/fuzz-itest.cc                     | 2 +-
 .../integration-tests/internal_mini_cluster-itest-base.h     | 2 +-
 src/kudu/integration-tests/internal_mini_cluster.cc          | 4 ++--
 src/kudu/integration-tests/internal_mini_cluster.h           | 8 ++++----
 src/kudu/integration-tests/master_cert_authority-itest.cc    | 2 +-
 src/kudu/integration-tests/master_replication-itest.cc       | 2 +-
 src/kudu/integration-tests/security-unknown-tsk-itest.cc     | 2 +-
 src/kudu/integration-tests/table_locations-itest.cc          | 2 +-
 src/kudu/integration-tests/token_signer-itest.cc             | 2 +-
 src/kudu/integration-tests/ts_tablet_manager-itest.cc        | 2 +-
 src/kudu/integration-tests/update_scan_delta_compact-test.cc | 2 +-
 src/kudu/tools/ksck_remote-test.cc                           | 2 +-
 src/kudu/tools/kudu-tool-test.cc                             | 2 +-
 21 files changed, 25 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kudu/blob/cd8e7afb/src/kudu/benchmarks/tpch/rpc_line_item_dao-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/benchmarks/tpch/rpc_line_item_dao-test.cc b/src/kudu/benchmarks/tpch/rpc_line_item_dao-test.cc
index b887df7..c6c161f 100644
--- a/src/kudu/benchmarks/tpch/rpc_line_item_dao-test.cc
+++ b/src/kudu/benchmarks/tpch/rpc_line_item_dao-test.cc
@@ -47,7 +47,7 @@ class RpcLineItemDAOTest : public KuduTest {
     KuduTest::SetUp();
 
     // Start minicluster
-    cluster_.reset(new InternalMiniCluster(env_, MiniClusterOptions()));
+    cluster_.reset(new InternalMiniCluster(env_, InternalMiniClusterOptions()));
     ASSERT_OK(cluster_->Start());
 
     const char *kTableName = "tpch1";

http://git-wip-us.apache.org/repos/asf/kudu/blob/cd8e7afb/src/kudu/benchmarks/tpch/tpch1.cc
----------------------------------------------------------------------
diff --git a/src/kudu/benchmarks/tpch/tpch1.cc b/src/kudu/benchmarks/tpch/tpch1.cc
index 0b0a300..369a08e 100644
--- a/src/kudu/benchmarks/tpch/tpch1.cc
+++ b/src/kudu/benchmarks/tpch/tpch1.cc
@@ -252,7 +252,7 @@ int main(int argc, char **argv) {
     env = kudu::Env::Default();
     kudu::Status s = env->CreateDir(FLAGS_mini_cluster_base_dir);
     CHECK(s.IsAlreadyPresent() || s.ok()) << s.ToString();
-    kudu::MiniClusterOptions options;
+    kudu::InternalMiniClusterOptions options;
     options.data_root = FLAGS_mini_cluster_base_dir;
     cluster.reset(new kudu::InternalMiniCluster(env, options));
     CHECK_OK(cluster->StartSync());

http://git-wip-us.apache.org/repos/asf/kudu/blob/cd8e7afb/src/kudu/client/client-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/client/client-test.cc b/src/kudu/client/client-test.cc
index 26baf56..5a70a3a 100644
--- a/src/kudu/client/client-test.cc
+++ b/src/kudu/client/client-test.cc
@@ -140,7 +140,7 @@ class ClientTest : public KuduTest {
     FLAGS_scanner_gc_check_interval_us = 50 * 1000; // 50 milliseconds.
 
     // Start minicluster and wait for tablet servers to connect to master.
-    cluster_.reset(new InternalMiniCluster(env_, MiniClusterOptions()));
+    cluster_.reset(new InternalMiniCluster(env_, InternalMiniClusterOptions()));
     ASSERT_OK(cluster_->Start());
 
     // Connect to the cluster.

http://git-wip-us.apache.org/repos/asf/kudu/blob/cd8e7afb/src/kudu/client/predicate-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/client/predicate-test.cc b/src/kudu/client/predicate-test.cc
index a04beb4..da99faa 100644
--- a/src/kudu/client/predicate-test.cc
+++ b/src/kudu/client/predicate-test.cc
@@ -49,7 +49,7 @@ class PredicateTest : public KuduTest {
 
   void SetUp() override {
     // Set up the mini cluster
-    cluster_.reset(new InternalMiniCluster(env_, MiniClusterOptions()));
+    cluster_.reset(new InternalMiniCluster(env_, InternalMiniClusterOptions()));
     ASSERT_OK(cluster_->Start());
     ASSERT_OK(cluster_->CreateClient(nullptr, &client_));
   }

http://git-wip-us.apache.org/repos/asf/kudu/blob/cd8e7afb/src/kudu/client/scan_token-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/client/scan_token-test.cc b/src/kudu/client/scan_token-test.cc
index 39bd17e..6599daf 100644
--- a/src/kudu/client/scan_token-test.cc
+++ b/src/kudu/client/scan_token-test.cc
@@ -48,7 +48,7 @@ class ScanTokenTest : public KuduTest {
 
   void SetUp() override {
     // Set up the mini cluster
-    cluster_.reset(new InternalMiniCluster(env_, MiniClusterOptions()));
+    cluster_.reset(new InternalMiniCluster(env_, InternalMiniClusterOptions()));
     ASSERT_OK(cluster_->Start());
     ASSERT_OK(cluster_->CreateClient(nullptr, &client_));
   }

http://git-wip-us.apache.org/repos/asf/kudu/blob/cd8e7afb/src/kudu/integration-tests/alter_table-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/integration-tests/alter_table-test.cc b/src/kudu/integration-tests/alter_table-test.cc
index cece524..224b02a 100644
--- a/src/kudu/integration-tests/alter_table-test.cc
+++ b/src/kudu/integration-tests/alter_table-test.cc
@@ -106,7 +106,7 @@ class AlterTableTest : public KuduTest {
 
     KuduTest::SetUp();
 
-    MiniClusterOptions opts;
+    InternalMiniClusterOptions opts;
     opts.num_tablet_servers = num_replicas();
     cluster_.reset(new InternalMiniCluster(env_, opts));
     ASSERT_OK(cluster_->Start());

http://git-wip-us.apache.org/repos/asf/kudu/blob/cd8e7afb/src/kudu/integration-tests/create-table-stress-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/integration-tests/create-table-stress-test.cc b/src/kudu/integration-tests/create-table-stress-test.cc
index b1a65c9..e9483d3 100644
--- a/src/kudu/integration-tests/create-table-stress-test.cc
+++ b/src/kudu/integration-tests/create-table-stress-test.cc
@@ -86,7 +86,7 @@ class CreateTableStressTest : public KuduTest {
     FLAGS_log_preallocate_segments = false;
 
     KuduTest::SetUp();
-    MiniClusterOptions opts;
+    InternalMiniClusterOptions opts;
     opts.num_tablet_servers = 3;
     cluster_.reset(new InternalMiniCluster(env_, opts));
     ASSERT_OK(cluster_->Start());

http://git-wip-us.apache.org/repos/asf/kudu/blob/cd8e7afb/src/kudu/integration-tests/full_stack-insert-scan-test.cc
----------------------------------------------------------------------
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 23fade6..fdb935f 100644
--- a/src/kudu/integration-tests/full_stack-insert-scan-test.cc
+++ b/src/kudu/integration-tests/full_stack-insert-scan-test.cc
@@ -163,7 +163,7 @@ class FullStackInsertScanTest : public KuduTest {
 
   void InitCluster() {
     // Start mini-cluster with 1 tserver, config client options
-    cluster_.reset(new InternalMiniCluster(env_, MiniClusterOptions()));
+    cluster_.reset(new InternalMiniCluster(env_, InternalMiniClusterOptions()));
     ASSERT_OK(cluster_->Start());
     KuduClientBuilder builder;
     builder.add_master_server_addr(

http://git-wip-us.apache.org/repos/asf/kudu/blob/cd8e7afb/src/kudu/integration-tests/fuzz-itest.cc
----------------------------------------------------------------------
diff --git a/src/kudu/integration-tests/fuzz-itest.cc b/src/kudu/integration-tests/fuzz-itest.cc
index 161b291..2631966 100644
--- a/src/kudu/integration-tests/fuzz-itest.cc
+++ b/src/kudu/integration-tests/fuzz-itest.cc
@@ -177,7 +177,7 @@ class FuzzTest : public KuduTest {
     schema_ =  client::KuduSchemaFromSchema(schema);
     KuduTest::SetUp();
 
-    MiniClusterOptions opts;
+    InternalMiniClusterOptions opts;
     cluster_.reset(new InternalMiniCluster(env_, opts));
     ASSERT_OK(cluster_->Start());
     CHECK_OK(KuduClientBuilder()

http://git-wip-us.apache.org/repos/asf/kudu/blob/cd8e7afb/src/kudu/integration-tests/internal_mini_cluster-itest-base.h
----------------------------------------------------------------------
diff --git a/src/kudu/integration-tests/internal_mini_cluster-itest-base.h b/src/kudu/integration-tests/internal_mini_cluster-itest-base.h
index 1cf330c..5931cfd 100644
--- a/src/kudu/integration-tests/internal_mini_cluster-itest-base.h
+++ b/src/kudu/integration-tests/internal_mini_cluster-itest-base.h
@@ -42,7 +42,7 @@ class MiniClusterITestBase : public KuduTest {
 
  protected:
   void StartCluster(int num_tablet_servers = 3) {
-    MiniClusterOptions opts;
+    InternalMiniClusterOptions opts;
     opts.num_tablet_servers = num_tablet_servers;
     cluster_.reset(new InternalMiniCluster(env_, opts));
     ASSERT_OK(cluster_->Start());

http://git-wip-us.apache.org/repos/asf/kudu/blob/cd8e7afb/src/kudu/integration-tests/internal_mini_cluster.cc
----------------------------------------------------------------------
diff --git a/src/kudu/integration-tests/internal_mini_cluster.cc b/src/kudu/integration-tests/internal_mini_cluster.cc
index bc53f3f..64c5d06 100644
--- a/src/kudu/integration-tests/internal_mini_cluster.cc
+++ b/src/kudu/integration-tests/internal_mini_cluster.cc
@@ -48,13 +48,13 @@ using std::shared_ptr;
 using tserver::MiniTabletServer;
 using tserver::TabletServer;
 
-MiniClusterOptions::MiniClusterOptions()
+InternalMiniClusterOptions::InternalMiniClusterOptions()
   : num_masters(1),
     num_tablet_servers(1),
     bind_mode(MiniCluster::kDefaultBindMode) {
 }
 
-InternalMiniCluster::InternalMiniCluster(Env* env, const MiniClusterOptions& options)
+InternalMiniCluster::InternalMiniCluster(Env* env, const InternalMiniClusterOptions&
options)
   : env_(env),
     fs_root_(!options.data_root.empty() ? options.data_root :
                 JoinPathSegments(GetTestDataDirectory(), "minicluster-data")),

http://git-wip-us.apache.org/repos/asf/kudu/blob/cd8e7afb/src/kudu/integration-tests/internal_mini_cluster.h
----------------------------------------------------------------------
diff --git a/src/kudu/integration-tests/internal_mini_cluster.h b/src/kudu/integration-tests/internal_mini_cluster.h
index e5fc6a1..ec11fbc 100644
--- a/src/kudu/integration-tests/internal_mini_cluster.h
+++ b/src/kudu/integration-tests/internal_mini_cluster.h
@@ -43,8 +43,8 @@ namespace tserver {
 class MiniTabletServer;
 }
 
-struct MiniClusterOptions {
-  MiniClusterOptions();
+struct InternalMiniClusterOptions {
+  InternalMiniClusterOptions();
 
   // Number of master servers.
   // Default: 1
@@ -79,7 +79,7 @@ struct MiniClusterOptions {
 // number of MiniTabletServers for use in tests.
 class InternalMiniCluster : public MiniCluster {
  public:
-  InternalMiniCluster(Env* env, const MiniClusterOptions& options);
+  InternalMiniCluster(Env* env, const InternalMiniClusterOptions& options);
   virtual ~InternalMiniCluster();
 
   // Start a cluster with a Master and 'num_tablet_servers' TabletServers.
@@ -188,7 +188,7 @@ class InternalMiniCluster : public MiniCluster {
     kMasterStartupWaitTimeSeconds = 30,
   };
 
-  const MiniClusterOptions opts_;
+  const InternalMiniClusterOptions opts_;
 
   Env* const env_;
   const std::string fs_root_;

http://git-wip-us.apache.org/repos/asf/kudu/blob/cd8e7afb/src/kudu/integration-tests/master_cert_authority-itest.cc
----------------------------------------------------------------------
diff --git a/src/kudu/integration-tests/master_cert_authority-itest.cc b/src/kudu/integration-tests/master_cert_authority-itest.cc
index 0e650ac..2c313b7 100644
--- a/src/kudu/integration-tests/master_cert_authority-itest.cc
+++ b/src/kudu/integration-tests/master_cert_authority-itest.cc
@@ -178,7 +178,7 @@ class MasterCertAuthorityTest : public KuduTest {
   static const char kFakeTsUUID[];
 
   int num_masters_;
-  MiniClusterOptions opts_;
+  InternalMiniClusterOptions opts_;
   gscoped_ptr<InternalMiniCluster> cluster_;
 
   shared_ptr<rpc::Messenger> messenger_;

http://git-wip-us.apache.org/repos/asf/kudu/blob/cd8e7afb/src/kudu/integration-tests/master_replication-itest.cc
----------------------------------------------------------------------
diff --git a/src/kudu/integration-tests/master_replication-itest.cc b/src/kudu/integration-tests/master_replication-itest.cc
index e5461d1..86f0616 100644
--- a/src/kudu/integration-tests/master_replication-itest.cc
+++ b/src/kudu/integration-tests/master_replication-itest.cc
@@ -119,7 +119,7 @@ class MasterReplicationTest : public KuduTest {
 
  protected:
   int num_masters_;
-  MiniClusterOptions opts_;
+  InternalMiniClusterOptions opts_;
   gscoped_ptr<InternalMiniCluster> cluster_;
 };
 

http://git-wip-us.apache.org/repos/asf/kudu/blob/cd8e7afb/src/kudu/integration-tests/security-unknown-tsk-itest.cc
----------------------------------------------------------------------
diff --git a/src/kudu/integration-tests/security-unknown-tsk-itest.cc b/src/kudu/integration-tests/security-unknown-tsk-itest.cc
index 8cdb3ce..afa8fbb 100644
--- a/src/kudu/integration-tests/security-unknown-tsk-itest.cc
+++ b/src/kudu/integration-tests/security-unknown-tsk-itest.cc
@@ -103,7 +103,7 @@ class SecurityUnknownTskTest : public KuduTest {
   void SetUp() override {
     KuduTest::SetUp();
 
-    MiniClusterOptions opts;
+    InternalMiniClusterOptions opts;
     opts.num_tablet_servers = num_tablet_servers_;
     cluster_.reset(new InternalMiniCluster(env_, opts));
     ASSERT_OK(cluster_->Start());

http://git-wip-us.apache.org/repos/asf/kudu/blob/cd8e7afb/src/kudu/integration-tests/table_locations-itest.cc
----------------------------------------------------------------------
diff --git a/src/kudu/integration-tests/table_locations-itest.cc b/src/kudu/integration-tests/table_locations-itest.cc
index 104f6e6..219f96c 100644
--- a/src/kudu/integration-tests/table_locations-itest.cc
+++ b/src/kudu/integration-tests/table_locations-itest.cc
@@ -57,7 +57,7 @@ class TableLocationsTest : public KuduTest {
   void SetUp() override {
     KuduTest::SetUp();
 
-    MiniClusterOptions opts;
+    InternalMiniClusterOptions opts;
     opts.num_tablet_servers = kNumTabletServers;
 
     cluster_.reset(new InternalMiniCluster(env_, opts));

http://git-wip-us.apache.org/repos/asf/kudu/blob/cd8e7afb/src/kudu/integration-tests/token_signer-itest.cc
----------------------------------------------------------------------
diff --git a/src/kudu/integration-tests/token_signer-itest.cc b/src/kudu/integration-tests/token_signer-itest.cc
index 8df6145..ceda3e7 100644
--- a/src/kudu/integration-tests/token_signer-itest.cc
+++ b/src/kudu/integration-tests/token_signer-itest.cc
@@ -129,7 +129,7 @@ class TokenSignerITest : public KuduTest {
 
   int num_masters_;
   const int num_tablet_servers_ = 3;
-  MiniClusterOptions opts_;
+  InternalMiniClusterOptions opts_;
   unique_ptr<InternalMiniCluster> cluster_;
 };
 

http://git-wip-us.apache.org/repos/asf/kudu/blob/cd8e7afb/src/kudu/integration-tests/ts_tablet_manager-itest.cc
----------------------------------------------------------------------
diff --git a/src/kudu/integration-tests/ts_tablet_manager-itest.cc b/src/kudu/integration-tests/ts_tablet_manager-itest.cc
index fd089cd..ab16b03 100644
--- a/src/kudu/integration-tests/ts_tablet_manager-itest.cc
+++ b/src/kudu/integration-tests/ts_tablet_manager-itest.cc
@@ -95,7 +95,7 @@ void TsTabletManagerITest::SetUp() {
   MessengerBuilder bld("client");
   ASSERT_OK(bld.Build(&client_messenger_));
 
-  MiniClusterOptions opts;
+  InternalMiniClusterOptions opts;
   opts.num_tablet_servers = kNumReplicas;
   cluster_.reset(new InternalMiniCluster(env_, opts));
   ASSERT_OK(cluster_->Start());

http://git-wip-us.apache.org/repos/asf/kudu/blob/cd8e7afb/src/kudu/integration-tests/update_scan_delta_compact-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/integration-tests/update_scan_delta_compact-test.cc b/src/kudu/integration-tests/update_scan_delta_compact-test.cc
index e93e7d2..783ee56 100644
--- a/src/kudu/integration-tests/update_scan_delta_compact-test.cc
+++ b/src/kudu/integration-tests/update_scan_delta_compact-test.cc
@@ -114,7 +114,7 @@ class UpdateScanDeltaCompactionTest : public KuduTest {
 
   void InitCluster() {
     // Start mini-cluster with 1 tserver.
-    cluster_.reset(new InternalMiniCluster(env_, MiniClusterOptions()));
+    cluster_.reset(new InternalMiniCluster(env_, InternalMiniClusterOptions()));
     ASSERT_OK(cluster_->Start());
     KuduClientBuilder client_builder;
     client_builder.add_master_server_addr(

http://git-wip-us.apache.org/repos/asf/kudu/blob/cd8e7afb/src/kudu/tools/ksck_remote-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tools/ksck_remote-test.cc b/src/kudu/tools/ksck_remote-test.cc
index ad34a05..1b7e2ab 100644
--- a/src/kudu/tools/ksck_remote-test.cc
+++ b/src/kudu/tools/ksck_remote-test.cc
@@ -75,7 +75,7 @@ class RemoteKsckTest : public KuduTest {
     // Speed up testing, saves about 700ms per TEST_F.
     FLAGS_heartbeat_interval_ms = 10;
 
-    MiniClusterOptions opts;
+    InternalMiniClusterOptions opts;
 
     // Hard-coded ports for the masters. This is safe, as these tests run under
     // a resource lock (see CMakeLists.txt in this directory).

http://git-wip-us.apache.org/repos/asf/kudu/blob/cd8e7afb/src/kudu/tools/kudu-tool-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tools/kudu-tool-test.cc b/src/kudu/tools/kudu-tool-test.cc
index 71254cc..6edc4e1 100644
--- a/src/kudu/tools/kudu-tool-test.cc
+++ b/src/kudu/tools/kudu-tool-test.cc
@@ -302,7 +302,7 @@ void ToolTest::StartExternalMiniCluster(const vector<string>&
extra_master_flags
 
 void ToolTest::StartMiniCluster(int num_masters,
                                 int num_tablet_servers) {
-  MiniClusterOptions opts;
+  InternalMiniClusterOptions opts;
   opts.num_masters = num_masters;
   opts.num_tablet_servers = num_tablet_servers;
   mini_cluster_.reset(new InternalMiniCluster(env_, opts));


Mime
View raw message