fixup! QC-1086 added cycles to MOs and QOs

Author: Michal Tichák

Framework/include/QualityControl/ObjectMetadataKeys.h

@@ -28,7 +28,6 @@ constexpr auto created = "Created";
 constexpr auto md5sum = "Content-MD5";
 constexpr auto objectType = "ObjectType";
 constexpr auto lastModified = "lastModified";
-constexpr auto cycle = "Cycle";
 
 // General QC framework
 constexpr auto qcVersion = "qc_version";
@@ -38,6 +37,7 @@ constexpr auto qcTaskClass = "qc_task_class";
 constexpr auto qcQuality = "qc_quality";
 constexpr auto qcCheckName = "qc_check_name";
 constexpr auto qcAdjustableEOV = "adjustableEOV"; // this is a keyword for the CCDB
+constexpr auto cycle = "CycleNumber";
 
 // QC Activity
 constexpr auto runType = "RunType";

Framework/src/CcdbDatabase.cxx

@@ -283,8 +283,9 @@ TObject* CcdbDatabase::retrieveTObject(std::string path, std::map<std::string, s
   auto* object = ccdbApi->retrieveFromTFileAny<TObject>(path, metadata, timestamp, headers);
   if (object == nullptr) {
     ILOG(Warning, Support) << "We could NOT retrieve the object " << path << " with timestamp " << timestamp << "." << ENDM;
+    ILOG(Debug, Support) << "and with metadata:" << ENDM;
     for (auto [metaKey, metaVal] : metadata) {
-      ILOG(Debug, Support) << "and with metadata: [" << metaKey << ", " << metaVal << "]" << ENDM;
+      ILOG(Debug, Support) << metaKey << ", " << metaVal << ENDM;
     }
     return nullptr;
   }

Framework/src/Check.cxx

@@ -13,6 +13,7 @@
 
 #include <memory>
 #include <algorithm>
+#include <stdexcept>
 #include <string>
 #include <utility>
 #include <ranges>
@@ -165,12 +166,18 @@ QualityObjectsType Check::check(std::map<std::string, std::shared_ptr<MonitorObj
       }));
     ILOG(Debug, Devel) << "Check '" << mCheckConfig.name << "', quality '" << quality << "'" << ENDM;
     std::vector<std::string> monitorObjectsNames;
-    // std::ranges::copy(moMapToCheck | std::views::keys, std::back_inserter(monitorObjectsNames));
     unsigned long maxCycle{};
     for (const auto& [moName, mo] : moMapToCheck) {
       monitorObjectsNames.emplace_back(moName);
       if (const auto cycle = mo->getMetadata(repository::metadata_keys::cycle)) {
-        maxCycle = std::max(std::stoul(cycle.value()), maxCycle);
+        const auto& cycleStr = cycle.value();
+        unsigned long cycleVal{};
+        if (const auto fromCharsRed = std::from_chars(cycleStr.c_str(), cycleStr.c_str() + cycleStr.size(), cycleVal); fromCharsRed.ec == std::errc()) {
+          maxCycle = std::max(cycleVal, maxCycle);
+        } else {
+          ILOG(Warning, Support) << "metadata " << repository::metadata_keys::cycle << " with value " << cycleStr << " couldn't be parsed for a reason: "
+                                 << std::make_error_code(fromCharsRed.ec).message() << ENDM;
+        }
       }
     }
     // todo: take metadata from somewhere

Framework/src/MonitorObjectCollection.cxx

@@ -21,20 +21,48 @@
 
 #include <Mergers/MergerAlgorithm.h>
 #include <TNamed.h>
+#include <optional>
 #include <string>
+#include <charconv>
 
 using namespace o2::mergers;
 
 namespace o2::quality_control::core
 {
 
-void mergeCycles(MonitorObject*& otherMO, MonitorObject*& targetMO)
+std::optional<unsigned long> parseCycle(const std::string& cycleStr)
+{
+  unsigned long cycleVal{};
+  if (auto parse_res = std::from_chars(cycleStr.c_str(), cycleStr.c_str() + cycleStr.size(), cycleVal); parse_res.ec != std::errc{}) {
+    ILOG(Warning, Support) << "failed to decypher " << repository::metadata_keys::cycle << " metadata with value " << cycleStr
+                           << ", with std::errc " << std::make_error_code(parse_res.ec).message() << ENDM;
+    return std::nullopt;
+  }
+  return cycleVal;
+}
+
+void mergeCycles(MonitorObject* targetMO, MonitorObject* otherMO)
 {
   const auto otherCycle = otherMO->getMetadata(repository::metadata_keys::cycle);
   const auto targetCycle = targetMO->getMetadata(repository::metadata_keys::cycle);
   if (otherCycle.has_value() && targetCycle.has_value()) {
-    // TODO: would it be worth it for metadata to store other types than std::string?
-    targetMO->addOrUpdateMetadata(repository::metadata_keys::cycle, std::to_string(std::max(std::stoul(otherCycle.value()), std::stoul(targetCycle.value()))));
+    const auto targetCycleParsed = parseCycle(targetCycle.value());
+    const auto otherCycleParsed = parseCycle(otherCycle.value());
+
+    if (targetCycleParsed && otherCycleParsed) {
+      targetMO->addOrUpdateMetadata(repository::metadata_keys::cycle, std::to_string(std::max(targetCycleParsed.value(), otherCycleParsed.value())));
+      return;
+    }
+
+    if (targetCycleParsed.value()) {
+      targetMO->addOrUpdateMetadata(repository::metadata_keys::cycle, std::to_string(targetCycleParsed.value()));
+      return;
+    }
+
+    if (otherCycleParsed.value()) {
+      otherMO->addOrUpdateMetadata(repository::metadata_keys::cycle, std::to_string(otherCycleParsed.value()));
+      return;
+    }
   }
 }
 
@@ -72,7 +100,7 @@ void MonitorObjectCollection::merge(mergers::MergeInterface* const other)
         continue;
       }
 
-      mergeCycles(otherMO, targetMO);
+      mergeCycles(targetMO, otherMO);
 
       if (!reportedMismatchingRunNumbers && otherMO->getActivity().mId < targetMO->getActivity().mId) {
         ILOG(Error, Ops) << "The run number of the input object '" << otherMO->GetName() << "' ("

Framework/src/SliceTrendingTask.cxx

@@ -63,7 +63,7 @@ void SliceTrendingTask::initialize(Trigger t, framework::ServiceRegistryRef serv
     ILOG(Info, Support) << "Trying to retrieve an existing TTree for this task to continue the trend." << ENDM;
     auto& qcdb = services.get<repository::DatabaseInterface>();
     auto path = RepoPathUtils::getMoPath(mConfig.detectorName, PostProcessingInterface::getName(), "", "", false);
-    auto mo = qcdb.retrieveMO(path, PostProcessingInterface::getName(), repository::DatabaseInterface::Timestamp::Latest, {}, t.metadata);
+    auto mo = qcdb.retrieveMO(path, PostProcessingInterface::getName(), repository::DatabaseInterface::Timestamp::Latest);
     if (mo && mo->getObject()) {
       auto tree = dynamic_cast<TTree*>(mo->getObject());
       if (tree) {