You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by mp...@apache.org on 2016/03/17 17:59:57 UTC
mesos git commit: Removed unused overload of `model` for `TaskInfo`.
Repository: mesos
Updated Branches:
refs/heads/master 8be869aba -> 61f866113
Removed unused overload of `model` for `TaskInfo`.
Review: https://reviews.apache.org/r/44932/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/61f86611
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/61f86611
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/61f86611
Branch: refs/heads/master
Commit: 61f866113a2deac26f52f1c4c822b2efecb8026a
Parents: 8be869a
Author: Neil Conway <ne...@gmail.com>
Authored: Thu Mar 17 12:39:55 2016 -0400
Committer: Michael Park <mp...@apache.org>
Committed: Thu Mar 17 12:39:55 2016 -0400
----------------------------------------------------------------------
src/common/http.cpp | 48 ------------------------------------
src/common/http.hpp | 9 -------
src/tests/common/http_tests.cpp | 26 ++++++++-----------
3 files changed, 10 insertions(+), 73 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/61f86611/src/common/http.cpp
----------------------------------------------------------------------
diff --git a/src/common/http.cpp b/src/common/http.cpp
index ff3b7fc..538dd36 100644
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -357,54 +357,6 @@ JSON::Object model(const ExecutorInfo& executorInfo)
}
-// TODO(bmahler): Expose the executor name / source.
-JSON::Object model(
- const TaskInfo& task,
- const FrameworkID& frameworkId,
- const TaskState& state,
- const vector<TaskStatus>& statuses)
-{
- JSON::Object object;
- object.values["id"] = task.task_id().value();
- object.values["name"] = task.name();
- object.values["framework_id"] = frameworkId.value();
-
- if (task.has_executor()) {
- object.values["executor_id"] = task.executor().executor_id().value();
- } else {
- object.values["executor_id"] = "";
- }
-
- object.values["slave_id"] = task.slave_id().value();
- object.values["state"] = TaskState_Name(state);
- object.values["resources"] = model(task.resources());
-
- {
- JSON::Array array;
- array.values.reserve(statuses.size()); // MESOS-2353.
-
- foreach (const TaskStatus& status, statuses) {
- array.values.push_back(model(status));
- }
- object.values["statuses"] = std::move(array);
- }
-
- if (task.has_labels()) {
- object.values["labels"] = std::move(model(task.labels()));
- }
-
- if (task.has_discovery()) {
- object.values["discovery"] = JSON::protobuf(task.discovery());
- }
-
- if (task.has_container()) {
- object.values["container"] = JSON::protobuf(task.container());
- }
-
- return object;
-}
-
-
void json(JSON::ObjectWriter* writer, const Task& task)
{
writer->field("id", task.task_id().value());
http://git-wip-us.apache.org/repos/asf/mesos/blob/61f86611/src/common/http.hpp
----------------------------------------------------------------------
diff --git a/src/common/http.hpp b/src/common/http.hpp
index 61c63a0..d5433e9 100644
--- a/src/common/http.hpp
+++ b/src/common/http.hpp
@@ -79,16 +79,7 @@ JSON::Object model(const Attributes& attributes);
JSON::Object model(const CommandInfo& command);
JSON::Object model(const ExecutorInfo& executorInfo);
JSON::Array model(const Labels& labels);
-
-// These are the two identical ways to model a task, depending on
-// whether you have a 'Task' or a 'TaskInfo' available.
JSON::Object model(const Task& task);
-JSON::Object model(
- const TaskInfo& task,
- const FrameworkID& frameworkId,
- const TaskState& state,
- const std::vector<TaskStatus>& statuses);
-
void json(JSON::ObjectWriter* writer, const Task& task);
http://git-wip-us.apache.org/repos/asf/mesos/blob/61f86611/src/tests/common/http_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/common/http_tests.cpp b/src/tests/common/http_tests.cpp
index d1bafeb..ac6322d 100644
--- a/src/tests/common/http_tests.cpp
+++ b/src/tests/common/http_tests.cpp
@@ -40,8 +40,7 @@ using mesos::internal::protobuf::createTask;
// TODO(bmahler): Add tests for other JSON models.
// This test ensures we don't break the API when it comes to JSON
-// representation of tasks. Also, we want to ensure that tasks are
-// modeled the same way when using 'Task' vs. 'TaskInfo'.
+// representation of tasks.
TEST(HTTPTest, ModelTask)
{
TaskID taskId;
@@ -82,18 +81,17 @@ TEST(HTTPTest, ModelTask)
discovery.set_name("discover");
discovery.mutable_ports()->CopyFrom(ports);
- TaskInfo task;
- task.set_name("task");
- task.mutable_task_id()->CopyFrom(taskId);
- task.mutable_slave_id()->CopyFrom(slaveId);
- task.mutable_command()->set_value("echo hello");
- task.mutable_discovery()->CopyFrom(discovery);
+ TaskInfo taskInfo;
+ taskInfo.set_name("task");
+ taskInfo.mutable_task_id()->CopyFrom(taskId);
+ taskInfo.mutable_slave_id()->CopyFrom(slaveId);
+ taskInfo.mutable_command()->set_value("echo hello");
+ taskInfo.mutable_discovery()->CopyFrom(discovery);
- Task task_ = createTask(task, state, frameworkId);
- task_.add_statuses()->CopyFrom(statuses[0]);
+ Task task = createTask(taskInfo, state, frameworkId);
+ task.add_statuses()->CopyFrom(statuses[0]);
- JSON::Value object = model(task, frameworkId, state, statuses);
- JSON::Value object_ = model(task_);
+ JSON::Value object = model(task);
Try<JSON::Value> expected = JSON::parse(
"{"
@@ -145,10 +143,6 @@ TEST(HTTPTest, ModelTask)
ASSERT_SOME(expected);
EXPECT_EQ(expected.get(), object);
- EXPECT_EQ(expected.get(), object_);
-
- // Ensure both are modeled the same.
- EXPECT_EQ(object, object_);
}