DPL: protect against multiple additions of 0xccdb queries (#12020)

Author: ktf

Detectors/Raw/TFReaderDD/src/TFReaderSpec.cxx

@@ -465,9 +465,9 @@ o2f::DataProcessorSpec o2::rawdd::getTFReaderSpec(o2::rawdd::TFReaderInp& rinp)
         }
       }
     }
-    spec.outputs.emplace_back(o2f::OutputSpec{{"stfDist"}, o2h::gDataOriginFLP, o2h::gDataDescriptionDISTSTF, 0});
+    o2f::DataSpecUtils::updateOutputList(spec.outputs, o2f::OutputSpec{{"stfDist"}, o2h::gDataOriginFLP, o2h::gDataDescriptionDISTSTF, 0});
     if (!rinp.sup0xccdb) {
-      spec.outputs.emplace_back(o2f::OutputSpec{{"stfDistCCDB"}, o2h::gDataOriginFLP, o2h::gDataDescriptionDISTSTF, 0xccdb});
+      o2f::DataSpecUtils::updateOutputList(spec.outputs, o2f::OutputSpec{{"stfDistCCDB"}, o2h::gDataOriginFLP, o2h::gDataDescriptionDISTSTF, 0xccdb});
     }
     if (!rinp.metricChannel.empty()) {
       spec.options.emplace_back(o2f::ConfigParamSpec{"channel-config", o2f::VariantType::String, rinp.metricChannel, {"Out-of-band channel config for TF throttling"}});

Framework/Core/include/Framework/DataSpecUtils.h

@@ -230,6 +230,9 @@ struct DataSpecUtils {
 
   /// Updates list of InputSpecs by merging metadata
   static void updateInputList(std::vector<InputSpec>& list, InputSpec&& input);
+
+  /// Updates list of OutputSpecs by merging metadata (or adding output).
+  static void updateOutputList(std::vector<OutputSpec>& list, OutputSpec&& input);
 };
 
 } // namespace framework

Framework/Core/src/DataSpecUtils.cxx

@@ -795,4 +795,20 @@ void DataSpecUtils::updateInputList(std::vector<InputSpec>& list, InputSpec&& in
   }
 }
 
+void DataSpecUtils::updateOutputList(std::vector<OutputSpec>& list, OutputSpec&& spec)
+{
+  auto locate = std::find(list.begin(), list.end(), spec);
+  if (locate != list.end()) {
+    // amend entry
+    auto& entryMetadata = locate->metadata;
+    entryMetadata.insert(entryMetadata.end(), spec.metadata.begin(), spec.metadata.end());
+    std::sort(entryMetadata.begin(), entryMetadata.end(), [](ConfigParamSpec const& a, ConfigParamSpec const& b) { return a.name < b.name; });
+    auto new_end = std::unique(entryMetadata.begin(), entryMetadata.end(), [](ConfigParamSpec const& a, ConfigParamSpec const& b) { return a.name == b.name; });
+    entryMetadata.erase(new_end, entryMetadata.end());
+  } else {
+    // add entry
+    list.emplace_back(std::move(spec));
+  }
+}
+
 } // namespace o2::framework

Framework/Core/src/WorkflowHelpers.cxx

@@ -588,7 +588,7 @@ void WorkflowHelpers::injectServiceDevices(WorkflowSpec& workflow, ConfigContext
       }
       if (enumCandidate != -1) {
         auto& dp = workflow[enumCandidate];
-        dp.outputs.push_back(OutputSpec{{"ccdb-diststf"}, dstf, Lifetime::Timeframe});
+        DataSpecUtils::updateOutputList(dp.outputs, OutputSpec{{"ccdb-diststf"}, dstf, Lifetime::Timeframe});
         ccdbBackend.inputs.push_back(InputSpec{"tfn", dstf, Lifetime::Timeframe});
       } else if (timerCandidate != -1) {
         auto& dp = workflow[timerCandidate];
@@ -635,7 +635,7 @@ void WorkflowHelpers::injectServiceDevices(WorkflowSpec& workflow, ConfigContext
       }
       if (enumCandidate != -1) {
         auto& dp = workflow[enumCandidate];
-        dp.outputs.push_back(OutputSpec{{"ccdb-diststf"}, dstf, Lifetime::Timeframe});
+        DataSpecUtils::updateOutputList(dp.outputs, OutputSpec{{"ccdb-diststf"}, dstf, Lifetime::Timeframe});
         ccdbBackend.inputs.push_back(InputSpec{"tfn", dstf, Lifetime::Timeframe});
       } else if (timerCandidate != -1) {
         auto& dp = workflow[timerCandidate];

Framework/Core/test/unittest_DataSpecUtils.cxx

@@ -460,3 +460,33 @@ TEST_CASE("optionalConcreteDataMatcherFrom")
   REQUIRE(DataSpecUtils::asOptionalConcreteDataMatcher(ConcreteDataMatcher{"ITS", "RAWDATA", 0}) == ConcreteDataMatcher{"ITS", "RAWDATA", 0});
   REQUIRE(DataSpecUtils::asOptionalConcreteDataMatcher(ConcreteDataTypeMatcher{"ITS", "RAWDATA"}) == std::nullopt);
 }
+
+// Testcase for DataSpecUtils::updateOutputList
+TEST_CASE("UpdateOutputList")
+{
+  // Empty vector of output specs should simply add the new spec
+  std::vector<OutputSpec> outputSpecs;
+  DataSpecUtils::updateOutputList(outputSpecs, {"TST", "DATA1", 0});
+  CHECK(outputSpecs.size() == 1);
+
+  // Adding the same spec again should not change the size
+  DataSpecUtils::updateOutputList(outputSpecs, {"TST", "DATA1", 0});
+  CHECK(outputSpecs.size() == 1);
+
+  // Adding a different spec should increase the size
+  DataSpecUtils::updateOutputList(outputSpecs, {"TST", "DATA2", 0});
+  CHECK(outputSpecs.size() == 2);
+
+  // Adding again the same spec again should not change the size
+  DataSpecUtils::updateOutputList(outputSpecs, {"TST", "DATA1", 0});
+  CHECK(outputSpecs.size() == 2);
+  // Check with something real..
+  ConcreteDataMatcher dstf{"FLP", "DISTSUBTIMEFRAME", 0xccdb};
+  DataSpecUtils::updateOutputList(outputSpecs, OutputSpec{{"ccdb-diststf"}, dstf, Lifetime::Timeframe});
+  CHECK(outputSpecs.size() == 3);
+  DataSpecUtils::updateOutputList(outputSpecs, OutputSpec{{"ccdb-diststf"}, dstf, Lifetime::Timeframe});
+  CHECK(outputSpecs.size() == 3);
+  // Label does not matter
+  DataSpecUtils::updateOutputList(outputSpecs, OutputSpec{{"ccdb2-diststf"}, dstf, Lifetime::Timeframe});
+  CHECK(outputSpecs.size() == 3);
+}