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 2017/11/06 22:10:02 UTC
[7/7] mesos git commit: MesosTidy: removed redundant `get()` on smart
pointers in mesos.
MesosTidy: removed redundant `get()` on smart pointers in mesos.
```
3rdparty/libprocess/src/../include/process/owned.hpp:117:7:
warning: redundant get() call on smart pointer
[google-readability-redundant-smartptr-get]
```
Review: https://reviews.apache.org/r/63568
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/a94e3cd0
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/a94e3cd0
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/a94e3cd0
Branch: refs/heads/master
Commit: a94e3cd0fc612a3b68b615368305b256b9064656
Parents: f964e90
Author: Michael Park <mp...@apache.org>
Authored: Mon Nov 6 10:46:05 2017 -0800
Committer: Michael Park <mp...@apache.org>
Committed: Mon Nov 6 13:57:05 2017 -0800
----------------------------------------------------------------------
src/master/http.cpp | 30 +-
src/master/master.cpp | 2 +-
src/slave/http.cpp | 12 +-
src/slave/slave.cpp | 2 +-
src/tests/authorization_tests.cpp | 566 +++++++++----------
src/tests/containerizer/cni_isolator_tests.cpp | 2 +-
.../containerizer/io_switchboard_tests.cpp | 4 +-
.../containerizer/mesos_containerizer_tests.cpp | 4 +-
.../nested_mesos_containerizer_tests.cpp | 2 +-
src/tests/hook_tests.cpp | 8 +-
src/tests/master_tests.cpp | 14 +-
src/tests/partition_tests.cpp | 8 +-
src/tests/reconciliation_tests.cpp | 2 +-
src/tests/slave_recovery_tests.cpp | 12 +-
src/tests/slave_tests.cpp | 16 +-
src/uri/fetchers/hadoop.cpp | 2 +-
16 files changed, 343 insertions(+), 343 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/a94e3cd0/src/master/http.cpp
----------------------------------------------------------------------
diff --git a/src/master/http.cpp b/src/master/http.cpp
index fa0f60c..1008412 100644
--- a/src/master/http.cpp
+++ b/src/master/http.cpp
@@ -320,22 +320,22 @@ struct FullFrameworkWriter {
writer->field("unreachable_tasks", [this](JSON::ArrayWriter* writer) {
foreachvalue (const Owned<Task>& task, framework_->unreachableTasks) {
// Skip unauthorized tasks.
- if (!authorizeTask_->accept(*task.get(), framework_->info)) {
+ if (!authorizeTask_->accept(*task, framework_->info)) {
continue;
}
- writer->element(*task.get());
+ writer->element(*task);
}
});
writer->field("completed_tasks", [this](JSON::ArrayWriter* writer) {
foreach (const Owned<Task>& task, framework_->completedTasks) {
// Skip unauthorized tasks.
- if (!authorizeTask_->accept(*task.get(), framework_->info)) {
+ if (!authorizeTask_->accept(*task, framework_->info)) {
continue;
}
- writer->element(*task.get());
+ writer->element(*task);
}
});
@@ -1744,7 +1744,7 @@ mesos::master::Response::GetFrameworks Master::Http::_getFrameworks(
continue;
}
- getFrameworks.add_completed_frameworks()->CopyFrom(model(*framework.get()));
+ getFrameworks.add_completed_frameworks()->CopyFrom(model(*framework));
}
return getFrameworks;
@@ -3222,13 +3222,13 @@ public:
}
foreachvalue (const Owned<Task>& task, framework->unreachableTasks) {
- frameworkTaskSummaries[frameworkId].count(*task.get());
- slaveTaskSummaries[task->slave_id()].count(*task.get());
+ frameworkTaskSummaries[frameworkId].count(*task);
+ slaveTaskSummaries[task->slave_id()].count(*task);
}
foreach (const Owned<Task>& task, framework->completedTasks) {
- frameworkTaskSummaries[frameworkId].count(*task.get());
- slaveTaskSummaries[task->slave_id()].count(*task.get());
+ frameworkTaskSummaries[frameworkId].count(*task);
+ slaveTaskSummaries[task->slave_id()].count(*task);
}
}
}
@@ -4059,8 +4059,8 @@ Future<Response> Master::Http::tasks(
const Owned<Task>& task,
framework->unreachableTasks) {
// Skip unauthorized tasks or tasks without matching task ID.
- if (!selectTaskId.accept(task.get()->task_id()) ||
- !authorizeTask->accept(*task.get(), framework->info)) {
+ if (!selectTaskId.accept(task->task_id()) ||
+ !authorizeTask->accept(*task, framework->info)) {
continue;
}
@@ -4069,8 +4069,8 @@ Future<Response> Master::Http::tasks(
foreach (const Owned<Task>& task, framework->completedTasks) {
// Skip unauthorized tasks or tasks without matching task ID.
- if (!selectTaskId.accept(task.get()->task_id()) ||
- !authorizeTask->accept(*task.get(), framework->info)) {
+ if (!selectTaskId.accept(task->task_id()) ||
+ !authorizeTask->accept(*task, framework->info)) {
continue;
}
@@ -4207,7 +4207,7 @@ mesos::master::Response::GetTasks Master::Http::_getTasks(
// Unreachable tasks.
foreachvalue (const Owned<Task>& task, framework->unreachableTasks) {
// Skip unauthorized tasks.
- if (!approveViewTask(tasksApprover, *task.get(), framework->info)) {
+ if (!approveViewTask(tasksApprover, *task, framework->info)) {
continue;
}
@@ -4217,7 +4217,7 @@ mesos::master::Response::GetTasks Master::Http::_getTasks(
// Completed tasks.
foreach (const Owned<Task>& task, framework->completedTasks) {
// Skip unauthorized tasks.
- if (!approveViewTask(tasksApprover, *task.get(), framework->info)) {
+ if (!approveViewTask(tasksApprover, *task, framework->info)) {
continue;
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/a94e3cd0/src/master/master.cpp
----------------------------------------------------------------------
diff --git a/src/master/master.cpp b/src/master/master.cpp
index f349fec..9ac1861 100644
--- a/src/master/master.cpp
+++ b/src/master/master.cpp
@@ -8748,7 +8748,7 @@ void Master::removeFramework(Framework* framework)
CHECK(!slaves.registered.contains(task->slave_id()));
// Move task from unreachable map to completed map.
- framework->addCompletedTask(*task.get());
+ framework->addCompletedTask(*task);
framework->unreachableTasks.erase(taskId);
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/a94e3cd0/src/slave/http.cpp
----------------------------------------------------------------------
diff --git a/src/slave/http.cpp b/src/slave/http.cpp
index f2e06af..cfae997 100644
--- a/src/slave/http.cpp
+++ b/src/slave/http.cpp
@@ -2361,7 +2361,7 @@ Future<Response> Http::_launchNestedContainer(
Framework* framework = slave->getFramework(executor->frameworkId);
CHECK_NOTNULL(framework);
- Try<bool> approved = approver.get()->approved(
+ Try<bool> approved = approver->approved(
ObjectApprover::Object(
executor->info,
framework->info,
@@ -2479,7 +2479,7 @@ Future<Response> Http::waitNestedContainer(
Framework* framework = slave->getFramework(executor->frameworkId);
CHECK_NOTNULL(framework);
- Try<bool> approved = waitApprover.get()->approved(
+ Try<bool> approved = waitApprover->approved(
ObjectApprover::Object(
executor->info,
framework->info,
@@ -2576,7 +2576,7 @@ Future<Response> Http::killNestedContainer(
Framework* framework = slave->getFramework(executor->frameworkId);
CHECK_NOTNULL(framework);
- Try<bool> approved = killApprover.get()->approved(
+ Try<bool> approved = killApprover->approved(
ObjectApprover::Object(
executor->info,
framework->info,
@@ -2635,7 +2635,7 @@ Future<Response> Http::removeNestedContainer(
Framework* framework = slave->getFramework(executor->frameworkId);
CHECK_NOTNULL(framework);
- Try<bool> approved = removeApprover.get()->approved(
+ Try<bool> approved = removeApprover->approved(
ObjectApprover::Object(
executor->info,
framework->info,
@@ -2775,7 +2775,7 @@ Future<Response> Http::attachContainerInput(
Framework* framework = slave->getFramework(executor->frameworkId);
CHECK_NOTNULL(framework);
- Try<bool> approved = attachInputApprover.get()->approved(
+ Try<bool> approved = attachInputApprover->approved(
ObjectApprover::Object(executor->info, framework->info));
if (approved.isError()) {
@@ -3087,7 +3087,7 @@ Future<Response> Http::attachContainerOutput(
Framework* framework = slave->getFramework(executor->frameworkId);
CHECK_NOTNULL(framework);
- Try<bool> approved = attachOutputApprover.get()->approved(
+ Try<bool> approved = attachOutputApprover->approved(
ObjectApprover::Object(
executor->info,
framework->info,
http://git-wip-us.apache.org/repos/asf/mesos/blob/a94e3cd0/src/slave/slave.cpp
----------------------------------------------------------------------
diff --git a/src/slave/slave.cpp b/src/slave/slave.cpp
index 79ee163..6cbe209 100644
--- a/src/slave/slave.cpp
+++ b/src/slave/slave.cpp
@@ -6890,7 +6890,7 @@ Future<bool> Slave::authorizeSandboxAccess(
}
}
- Try<bool> approved = sandboxApprover.get()->approved(object);
+ Try<bool> approved = sandboxApprover->approved(object);
if (approved.isError()) {
return Failure(approved.error());