mini_cluster: Remove tablet_server_index_by_uuid() from interface The tablet_server_index_by_uuid() method, which common to the InternalMiniCluster and ExternalMiniCluster, isn't really useful from the parent interface (MiniCluster) and isn't compatible with a MixedMiniCluster that I'm working on. Let's just remove it from the pure virtual parent interface.
Change-Id: I67d25278ee8c2b9379ed83008f162d8ac36271ab Reviewed-on: http://gerrit.cloudera.org:8080/8963 Reviewed-by: Alexey Serbin <[email protected]> Tested-by: Kudu Jenkins Project: http://git-wip-us.apache.org/repos/asf/kudu/repo Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/f932547b Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/f932547b Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/f932547b Branch: refs/heads/master Commit: f932547b294605153bbb680a64fb461403033fde Parents: ff63b43 Author: Mike Percy <[email protected]> Authored: Mon Jan 8 11:47:01 2018 -0800 Committer: Mike Percy <[email protected]> Committed: Tue Jan 9 03:18:32 2018 +0000 ---------------------------------------------------------------------- src/kudu/mini-cluster/external_mini_cluster.h | 4 +++- src/kudu/mini-cluster/internal_mini_cluster.h | 4 +++- src/kudu/mini-cluster/mini_cluster.h | 4 ---- 3 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kudu/blob/f932547b/src/kudu/mini-cluster/external_mini_cluster.h ---------------------------------------------------------------------- diff --git a/src/kudu/mini-cluster/external_mini_cluster.h b/src/kudu/mini-cluster/external_mini_cluster.h index d969527..0d19bff 100644 --- a/src/kudu/mini-cluster/external_mini_cluster.h +++ b/src/kudu/mini-cluster/external_mini_cluster.h @@ -232,7 +232,9 @@ class ExternalMiniCluster : public MiniCluster { // Return ExternalTabletServer given its UUID. If not found, returns NULL. ExternalTabletServer* tablet_server_by_uuid(const std::string& uuid) const; - int tablet_server_index_by_uuid(const std::string& uuid) const override; + // Return the index of the tablet server that has the given 'uuid', or + // -1 if no such UUID can be found. + int tablet_server_index_by_uuid(const std::string& uuid) const; // Return all tablet servers and masters. std::vector<ExternalDaemon*> daemons() const; http://git-wip-us.apache.org/repos/asf/kudu/blob/f932547b/src/kudu/mini-cluster/internal_mini_cluster.h ---------------------------------------------------------------------- diff --git a/src/kudu/mini-cluster/internal_mini_cluster.h b/src/kudu/mini-cluster/internal_mini_cluster.h index 41eacdb..d1e55de 100644 --- a/src/kudu/mini-cluster/internal_mini_cluster.h +++ b/src/kudu/mini-cluster/internal_mini_cluster.h @@ -144,7 +144,9 @@ class InternalMiniCluster : public MiniCluster { // Returns the TabletServer with uuid 'uuid', or nullptr if not found. tserver::MiniTabletServer* mini_tablet_server_by_uuid(const std::string& uuid) const; - int tablet_server_index_by_uuid(const std::string& uuid) const override; + // Return the index of the tablet server that has the given 'uuid', or + // -1 if no such UUID can be found. + int tablet_server_index_by_uuid(const std::string& uuid) const; int num_tablet_servers() const override { return mini_tablet_servers_.size(); http://git-wip-us.apache.org/repos/asf/kudu/blob/f932547b/src/kudu/mini-cluster/mini_cluster.h ---------------------------------------------------------------------- diff --git a/src/kudu/mini-cluster/mini_cluster.h b/src/kudu/mini-cluster/mini_cluster.h index f802c08..8a1440c 100644 --- a/src/kudu/mini-cluster/mini_cluster.h +++ b/src/kudu/mini-cluster/mini_cluster.h @@ -129,10 +129,6 @@ class MiniCluster { virtual std::vector<HostPort> master_rpc_addrs() const = 0; - // Return the index of the tablet server that has the given 'uuid', or - // -1 if no such UUID can be found. - virtual int tablet_server_index_by_uuid(const std::string& uuid) const = 0; - // Create a client configured to talk to this cluster. 'builder' may contain // override options for the client. The master address will be overridden to // talk to the running master(s). If 'builder' is a nullptr, default options
