[mesos] 07/16: Replaced a constructor in `ResourceQuantities`.

[mz...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mzhu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git

commit 4ca29aca090d68c96d41ba4be8b3dc02a2b4cedc
Author: Meng Zhu <mz...@mesosphere.io>
AuthorDate: Wed Mar 6 15:17:47 2019 -0800

    Replaced a constructor in `ResourceQuantities`.
    
    The constructor constructs `ResourceQuantities`
    from `google::protobuf::Map<std::string, Value::Scalar>`.
    It replaces one of the current constructors that takes
    in `OfferFilters::ResourceQuantities`.
    
    Review: https://reviews.apache.org/r/70150
---
 src/common/resource_quantities.cpp          | 4 ++--
 src/common/resource_quantities.hpp          | 2 +-
 src/master/allocator/mesos/hierarchical.cpp | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/common/resource_quantities.cpp b/src/common/resource_quantities.cpp
index 6401323..9e0b291 100644
--- a/src/common/resource_quantities.cpp
+++ b/src/common/resource_quantities.cpp
@@ -96,11 +96,11 @@ ResourceQuantities::ResourceQuantities()
 
 
 ResourceQuantities::ResourceQuantities(
-    const OfferFilters::ResourceQuantities& quantities)
+    const google::protobuf::Map<std::string, Value::Scalar>& map)
 {
   // Use `auto` in place of `protobuf::MapPair<string, Value::Scalar>`
   // below since `foreach` is a macro and cannot contain angle brackets.
-  foreach (auto&& quantity, quantities.quantities()) {
+  foreach (auto&& quantity, map) {
     add(quantity.first, quantity.second);
   }
 }
diff --git a/src/common/resource_quantities.hpp b/src/common/resource_quantities.hpp
index fdd81ed..9605205 100644
--- a/src/common/resource_quantities.hpp
+++ b/src/common/resource_quantities.hpp
@@ -85,7 +85,7 @@ public:
   ResourceQuantities();
 
   explicit ResourceQuantities(
-      const OfferFilters::ResourceQuantities& quantities);
+    const google::protobuf::Map<std::string, Value::Scalar>& map);
 
   ResourceQuantities(const ResourceQuantities& that) = default;
   ResourceQuantities(ResourceQuantities&& that) = default;
diff --git a/src/master/allocator/mesos/hierarchical.cpp b/src/master/allocator/mesos/hierarchical.cpp
index 7085c23..c9cf704 100644
--- a/src/master/allocator/mesos/hierarchical.cpp
+++ b/src/master/allocator/mesos/hierarchical.cpp
@@ -155,7 +155,8 @@ static hashmap<string, vector<ResourceQuantities>> unpackFrameworkOfferFilters(
       foreach (
           const OfferFilters::ResourceQuantities& quantities,
           allocatableResources.min_allocatable_resources().quantities()) {
-        allocatableResourcesRole.push_back(ResourceQuantities(quantities));
+        allocatableResourcesRole.push_back(
+          ResourceQuantities(quantities.quantities()));
       }
     }
   }