Rename Option<T>::get(const T& _t) to getOrElse() in Mesos. Review: https://reviews.apache.org/r/35285
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/49da76c9 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/49da76c9 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/49da76c9 Branch: refs/heads/master Commit: 49da76c9a605a576f10da549f74e52b09e68cb21 Parents: b207d0c Author: Mark Wang <[email protected]> Authored: Mon Jul 6 12:57:54 2015 -0700 Committer: Benjamin Hindman <[email protected]> Committed: Mon Jul 6 12:57:56 2015 -0700 ---------------------------------------------------------------------- src/log/catchup.cpp | 2 +- src/master/main.cpp | 4 ++-- src/master/master.hpp | 4 ++-- src/slave/containerizer/containerizer.cpp | 10 +++++----- src/tests/cluster.hpp | 10 +++++----- 5 files changed, 15 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/49da76c9/src/log/catchup.cpp ---------------------------------------------------------------------- diff --git a/src/log/catchup.cpp b/src/log/catchup.cpp index f7afc38..acc6096 100644 --- a/src/log/catchup.cpp +++ b/src/log/catchup.cpp @@ -300,7 +300,7 @@ static Future<Nothing> catchup( quorum, replica, network, - proposal.get(0), + proposal.getOrElse(0), positions, timeout); http://git-wip-us.apache.org/repos/asf/mesos/blob/49da76c9/src/master/main.cpp ---------------------------------------------------------------------- diff --git a/src/master/main.cpp b/src/master/main.cpp index 2624b7e..fd4de4d 100644 --- a/src/master/main.cpp +++ b/src/master/main.cpp @@ -278,7 +278,7 @@ int main(int argc, char** argv) // TODO(vinod): 'MasterContender::create()' should take // Option<string>. - Try<MasterContender*> contender_ = MasterContender::create(zk.get("")); + Try<MasterContender*> contender_ = MasterContender::create(zk.getOrElse("")); if (contender_.isError()) { EXIT(EXIT_FAILURE) << "Failed to create a master contender: " << contender_.error(); @@ -287,7 +287,7 @@ int main(int argc, char** argv) // TODO(vinod): 'MasterDetector::create()' should take // Option<string>. - Try<MasterDetector*> detector_ = MasterDetector::create(zk.get("")); + Try<MasterDetector*> detector_ = MasterDetector::create(zk.getOrElse("")); if (detector_.isError()) { EXIT(EXIT_FAILURE) << "Failed to create a master detector: " << detector_.error(); http://git-wip-us.apache.org/repos/asf/mesos/blob/49da76c9/src/master/master.hpp ---------------------------------------------------------------------- diff --git a/src/master/master.hpp b/src/master/master.hpp index fb4d6fa..baaf849 100644 --- a/src/master/master.hpp +++ b/src/master/master.hpp @@ -1199,12 +1199,12 @@ private: Slave* get(const SlaveID& slaveId) const { - return ids.get(slaveId).get(NULL); + return ids.get(slaveId).getOrElse(NULL); } Slave* get(const process::UPID& pid) const { - return pids.get(pid).get(NULL); + return pids.get(pid).getOrElse(NULL); } void put(Slave* slave) http://git-wip-us.apache.org/repos/asf/mesos/blob/49da76c9/src/slave/containerizer/containerizer.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/containerizer.cpp b/src/slave/containerizer/containerizer.cpp index b9ac94c..69dfac0 100644 --- a/src/slave/containerizer/containerizer.cpp +++ b/src/slave/containerizer/containerizer.cpp @@ -61,7 +61,7 @@ namespace slave { Try<Resources> Containerizer::resources(const Flags& flags) { Try<Resources> parsed = Resources::parse( - flags.resources.get(""), flags.default_role); + flags.resources.getOrElse(""), flags.default_role); if (parsed.isError()) { return Error(parsed.error()); @@ -75,7 +75,7 @@ Try<Resources> Containerizer::resources(const Flags& flags) // (2) no cpus specified. // We only auto-detect cpus in case (2). // The same logic applies for the other resources! - if (!strings::contains(flags.resources.get(""), "cpus")) { + if (!strings::contains(flags.resources.getOrElse(""), "cpus")) { // No CPU specified so probe OS or resort to DEFAULT_CPUS. double cpus; Try<long> cpus_ = os::cpus(); @@ -95,7 +95,7 @@ Try<Resources> Containerizer::resources(const Flags& flags) } // Memory resource. - if (!strings::contains(flags.resources.get(""), "mem")) { + if (!strings::contains(flags.resources.getOrElse(""), "mem")) { // No memory specified so probe OS or resort to DEFAULT_MEM. Bytes mem; Try<os::Memory> mem_ = os::memory(); @@ -120,7 +120,7 @@ Try<Resources> Containerizer::resources(const Flags& flags) } // Disk resource. - if (!strings::contains(flags.resources.get(""), "disk")) { + if (!strings::contains(flags.resources.getOrElse(""), "disk")) { // No disk specified so probe OS or resort to DEFAULT_DISK. Bytes disk; @@ -148,7 +148,7 @@ Try<Resources> Containerizer::resources(const Flags& flags) } // Network resource. - if (!strings::contains(flags.resources.get(""), "ports")) { + if (!strings::contains(flags.resources.getOrElse(""), "ports")) { // No ports specified so resort to DEFAULT_PORTS. resources += Resources::parse( "ports", http://git-wip-us.apache.org/repos/asf/mesos/blob/49da76c9/src/tests/cluster.hpp ---------------------------------------------------------------------- diff --git a/src/tests/cluster.hpp b/src/tests/cluster.hpp index cfe7ef0..ba17c0c 100644 --- a/src/tests/cluster.hpp +++ b/src/tests/cluster.hpp @@ -595,13 +595,13 @@ inline Try<process::PID<slave::Slave>> Cluster::Slaves::start( slave.slave = new slave::Slave( flags, - detector.get(slave.detector.get()), + detector.getOrElse(slave.detector.get()), slave.containerizer, &cluster->files, - gc.get(slave.gc.get()), - statusUpdateManager.get(slave.statusUpdateManager.get()), - resourceEstimator.get(slave.resourceEstimator.get()), - qosController.get(slave.qosController.get())); + gc.getOrElse(slave.gc.get()), + statusUpdateManager.getOrElse(slave.statusUpdateManager.get()), + resourceEstimator.getOrElse(slave.resourceEstimator.get()), + qosController.getOrElse(slave.qosController.get())); process::PID<slave::Slave> pid = process::spawn(slave.slave);
