You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2015/07/06 22:42:54 UTC
[1/3] mesos git commit: Rename Option::get(const T& _t) to
getOrElse() in stout.
Repository: mesos
Updated Branches:
refs/heads/master 07abeaa8c -> 49da76c9a
Rename Option<T>::get(const T& _t) to getOrElse() in stout.
Review: https://reviews.apache.org/r/35287
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/959d9069
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/959d9069
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/959d9069
Branch: refs/heads/master
Commit: 959d90692c04a5a4357024d43ce9219cf97b1d1f
Parents: 07abeaa
Author: Mark Wang <ma...@gmail.com>
Authored: Mon Jul 6 12:52:27 2015 -0700
Committer: Benjamin Hindman <be...@gmail.com>
Committed: Mon Jul 6 12:52:28 2015 -0700
----------------------------------------------------------------------
3rdparty/libprocess/3rdparty/stout/include/stout/option.hpp | 2 +-
3rdparty/libprocess/3rdparty/stout/include/stout/os/osx.hpp | 4 ++--
3rdparty/libprocess/3rdparty/stout/tests/option_tests.cpp | 9 +++++++++
3 files changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/959d9069/3rdparty/libprocess/3rdparty/stout/include/stout/option.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/option.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/option.hpp
index 3d9b7a7..549fc46 100644
--- a/3rdparty/libprocess/3rdparty/stout/include/stout/option.hpp
+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/option.hpp
@@ -131,7 +131,7 @@ public:
T& get() { assert(isSome()); return t; }
// This must return a copy to avoid returning a reference to a temporary.
- T get(const T& _t) const { return isNone() ? _t : t; }
+ T getOrElse(const T& _t) const { return isNone() ? _t : t; }
private:
enum State {
http://git-wip-us.apache.org/repos/asf/mesos/blob/959d9069/3rdparty/libprocess/3rdparty/stout/include/stout/os/osx.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os/osx.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os/osx.hpp
index 784104f..b11c7ac 100644
--- a/3rdparty/libprocess/3rdparty/stout/include/stout/os/osx.hpp
+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/os/osx.hpp
@@ -150,7 +150,7 @@ inline Result<Process> process(pid_t pid)
None(),
None(),
None(),
- command.get(std::string(process.kp_proc.p_comm)),
+ command.getOrElse(std::string(process.kp_proc.p_comm)),
process.kp_proc.p_stat & SZOMB);
} else {
return Process(process.kp_proc.p_pid,
@@ -160,7 +160,7 @@ inline Result<Process> process(pid_t pid)
Bytes(task.pti_resident_size),
Nanoseconds(task.pti_total_user),
Nanoseconds(task.pti_total_system),
- command.get(std::string(process.kp_proc.p_comm)),
+ command.getOrElse(std::string(process.kp_proc.p_comm)),
process.kp_proc.p_stat & SZOMB);
}
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/959d9069/3rdparty/libprocess/3rdparty/stout/tests/option_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/tests/option_tests.cpp b/3rdparty/libprocess/3rdparty/stout/tests/option_tests.cpp
index d87cf22..4a0f60b 100644
--- a/3rdparty/libprocess/3rdparty/stout/tests/option_tests.cpp
+++ b/3rdparty/libprocess/3rdparty/stout/tests/option_tests.cpp
@@ -142,3 +142,12 @@ TEST(OptionTest, NonCopyable)
o4 = Some(NonCopyable());
ASSERT_SOME(o4);
}
+
+
+TEST(OptionTest, GetOrElse)
+{
+ Option<string> something = string("Something");
+ Option<string> none = None();
+ EXPECT_EQ("Something", something.getOrElse("Else"));
+ EXPECT_EQ("Else", none.getOrElse("Else"));
+}
[2/3] mesos git commit: Rename Option::get(const T& _t) to
getOrElse() in libprocess.
Posted by be...@apache.org.
Rename Option<T>::get(const T& _t) to getOrElse() in libprocess.
Review: https://reviews.apache.org/r/35286
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/b207d0cc
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/b207d0cc
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/b207d0cc
Branch: refs/heads/master
Commit: b207d0cc1672e7bc21766c08e9dc56da29d35438
Parents: 959d906
Author: Mark Wang <ma...@gmail.com>
Authored: Mon Jul 6 12:57:30 2015 -0700
Committer: Benjamin Hindman <be...@gmail.com>
Committed: Mon Jul 6 12:57:31 2015 -0700
----------------------------------------------------------------------
3rdparty/libprocess/src/process.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/b207d0cc/3rdparty/libprocess/src/process.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/process.cpp b/3rdparty/libprocess/src/process.cpp
index 2f8072b..c3e1763 100644
--- a/3rdparty/libprocess/src/process.cpp
+++ b/3rdparty/libprocess/src/process.cpp
@@ -2149,7 +2149,7 @@ bool ProcessManager::handle(
// fail thus causing the socket to get closed (but now
// libprocess will ignore responses, see ignore_data).
Option<string> agent = request->headers.get("User-Agent");
- if (agent.get("").find("libprocess/") == string::npos) {
+ if (agent.getOrElse("").find("libprocess/") == string::npos) {
if (accepted) {
VLOG(2) << "Accepted libprocess message to " << request->path;
dispatch(proxy, &HttpProxy::enqueue, Accepted(), *request);
[3/3] mesos git commit: Rename Option::get(const T& _t) to
getOrElse() in Mesos.
Posted by be...@apache.org.
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 <ma...@gmail.com>
Authored: Mon Jul 6 12:57:54 2015 -0700
Committer: Benjamin Hindman <be...@gmail.com>
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);