refactor

Author: huerni

protos/PublicDefs.proto

@@ -262,7 +262,7 @@ message TaskInfo {
   string username = 15;
   string qos = 16;
   ResourceView res_view = 17;
-  string licenses = 18;
+  map<string, uint32> licenses_count = 18;
   repeated string req_nodes = 19;
   repeated string exclude_nodes = 20;
 

src/CraneCtld/CtldPublicDefs.h

@@ -600,14 +600,10 @@ struct TaskInCtld {
     task_info->set_partition(partition_id);
     task_info->set_qos(qos);
 
-    // lic_map -> "lic1:1,lic2:3"
-    auto license_strings =
-        licenses_count | ranges::views::transform([](const auto& pair) {
-          return pair.first + ":" + std::to_string(pair.second);
-        });
-    std::string licenses_view =
-        license_strings | ranges::views::join(',') | ranges::to<std::string>();
-    task_info->set_licenses(licenses_view);
+    for (const auto& [license_name, license_count] : licenses_count) {
+      task_info->mutable_licenses_count()->insert(
+          {license_name, license_count});
+    }
 
     task_info->mutable_time_limit()->set_seconds(ToInt64Seconds(time_limit));
     task_info->mutable_submit_time()->CopyFrom(runtime_attr.submit_time());

src/CraneCtld/LicensesManager.cpp

@@ -73,13 +73,13 @@ bool LicensesManager::CheckLicenseCountSufficient(
   return true;
 }
 
-result::result<void, std::string> LicensesManager::CheckLicensesLegal(
+std::expected<void, std::string> LicensesManager::CheckLicensesLegal(
     const ::google::protobuf::Map<std::string, uint32_t>& lic_id_to_count_map) {
   util::read_lock_guard readLock(rw_mutex_);
   for (auto& [lic_id, count] : lic_id_to_count_map) {
     auto it = lic_id_to_lic_map_.find(lic_id);
     if (it == lic_id_to_lic_map_.end() || count > it->second.total) {
-      return result::fail("Invalid license specification");
+      return std::unexpected("Invalid license specification");
     }
   }
 

src/CraneCtld/LicensesManager.h

@@ -41,7 +41,7 @@ class LicensesManager {
   bool CheckLicenseCountSufficient(
       const std::unordered_map<LicenseId, uint32_t> &lic_id_to_count_map);
 
-  result::result<void, std::string> CheckLicensesLegal(
+  std::expected<void, std::string> CheckLicensesLegal(
       const ::google::protobuf::Map<std::string, uint32_t>
           &lic_id_to_count_map);
 

src/CraneCtld/TaskScheduler.cpp

@@ -2561,7 +2561,7 @@ CraneErr TaskScheduler::AcquireTaskAttributes(TaskInCtld* task) {
 
   auto check_licenses_result = g_licenses_manager->CheckLicensesLegal(
       task->TaskToCtld().licenses_count());
-  if (check_licenses_result.has_error()) {
+  if (!check_licenses_result) {
     CRANE_ERROR("Failed to call CheckLicensesLegal: {}",
                 check_licenses_result.error());