fixes

Author: aalkin

Framework/Core/include/Framework/ASoA.h

@@ -1293,10 +1293,14 @@ concept with_ccdb_urls = requires {
 };
 
 template <typename T>
-concept with_base_table = not_void<typename aod::MetadataTrait<o2::aod::Hash<T::ref.desc_hash>>::metadata::base_table_t>;
+concept with_base_table = requires {
+  typename aod::MetadataTrait<o2::aod::Hash<T::ref.desc_hash>>::metadata::base_table_t;
+};
 
 template <typename T>
-concept with_expression_pack = not_void<typename aod::MetadataTrait<o2::aod::Hash<T::ref.desc_hash>>::metadata::expression_pack_t>;
+concept with_expression_pack = requires {
+  typename T::expression_pack_t{};
+};
 
 template <size_t N1, std::array<TableRef, N1> os1, size_t N2, std::array<TableRef, N2> os2>
 consteval bool is_compatible()

Framework/Core/include/Framework/AnalysisHelpers.h

@@ -26,6 +26,10 @@
 #include "Framework/Traits.h"
 
 #include <string>
+namespace o2::framework {
+std::string serializeProjectors(std::vector<framework::expressions::Projector>& projectors);
+}
+
 namespace o2::soa
 {
 template <TableRef R>
@@ -38,8 +42,6 @@ constexpr auto tableRef2ConfigParamSpec()
     {"\"\""}};
 }
 
-std::string serializeProjectors(std::vector<framework::expressions::Projector>& projectors);
-
 namespace
 {
 template <soa::with_sources T>
@@ -101,20 +103,23 @@ constexpr auto getCCDBMetadata() -> std::vector<framework::ConfigParamSpec>
 }
 
 template <soa::with_expression_pack T>
-constexpr auto getExpressionMetadata() -> std::optional<framework::ConfigParamSpec>
+constexpr auto getExpressionMetadata() -> std::vector<framework::ConfigParamSpec>
 {
   using expression_pack_t = T::expression_pack_t;
 
   auto projectors = []<typename... C>(framework::pack<C...>) -> std::vector<framework::expressions::Projector> {
-    return {C::Projector()...};
+    std::vector<framework::expressions::Projector> result;
+    (result.emplace_back(std::move(C::Projector())), ...);
+    return result;
   }(expression_pack_t{});
 
-  auto json = serializeProjectors(projectors);
-  return framework::ConfigParamSpec{"projectors", framework::VariantType::String, json, {"\"\""}};
+  auto json = framework::serializeProjectors(projectors);
+  return {framework::ConfigParamSpec{"projectors", framework::VariantType::String, json, {"\"\""}}};
 }
 
 template <typename T>
-constexpr auto getExpressionMetadata() -> std::optional<framework::ConfigParamSpec>
+  requires(!soa::with_expression_pack<T>)
+constexpr auto getExpressionMetadata() -> std::vector<framework::ConfigParamSpec>
 {
   return {};
 }
@@ -130,9 +135,7 @@ constexpr auto tableRef2InputSpec()
   auto ccdbMetadata = getCCDBMetadata<typename o2::aod::MetadataTrait<o2::aod::Hash<R.desc_hash>>::metadata>();
   metadata.insert(metadata.end(), ccdbMetadata.begin(), ccdbMetadata.end());
   auto p = getExpressionMetadata<typename o2::aod::MetadataTrait<o2::aod::Hash<R.desc_hash>>::metadata>();
-  if (p) {
-    metadata.insert(metadata.end(), p.value());
-  }
+  metadata.insert(metadata.end(), p.begin(), p.end());
 
   return framework::InputSpec{
     o2::aod::label<R>(),

Framework/Core/src/AODReaderHelpers.cxx

@@ -19,6 +19,7 @@
 #include "Framework/CallbackService.h"
 #include "Framework/EndOfStreamContext.h"
 #include "Framework/DataSpecUtils.h"
+#include "Framework/ExpressionJSONHelpers.h"
 
 #include <Monitoring/Monitoring.h>
 
@@ -134,12 +135,32 @@ auto make_spawn(InputSpec const& input, ProcessingContext& pc)
   (typename metadata_t::expression_pack_t{});
   return o2::framework::spawner<D>(extractOriginals<sources.size(), sources>(pc), input.binding.c_str(), projectors.data(), projector, schema);
 }
+
+struct Spawnable {
+  std::vector<expressions::Projector> projectors;
+  std::vector<std::string> labels;
+  std::shared_ptr<arrow::Schema> schema;
+
+  Spawnable(InputSpec const& spec)
+  {
+    auto loc = std::find_if(spec.metadata.begin(), spec.metadata.end(), [](ConfigParamSpec const& spc){ return spc.name.compare("projectors") == 0; });
+    std::stringstream iws(loc->defaultValue.get<std::string>());
+    projectors = ExpressionJSONHelpers::read(iws);
+    for (auto& i : spec.metadata) {
+      if (i.name.starts_with("input:")) {
+        labels.emplace_back(i.name.substr(6));
+      }
+    }
+  }
+};
 } // namespace
 
 AlgorithmSpec AODReaderHelpers::aodSpawnerCallback(std::vector<InputSpec>& requested)
 {
   return AlgorithmSpec::InitCallback{[requested](InitContext& /*ic*/) {
-    return [requested](ProcessingContext& pc) {
+    std::vector<Spawnable> spawnables;
+
+    return [requested, spawnables](ProcessingContext& pc) {
       auto outputs = pc.outputs();
       // spawn tables
       for (auto& input : requested) {

Framework/Core/test/test_Expressions.cxx

@@ -422,4 +422,7 @@ TEST_CASE("TestExpressionSerialization")
   auto t12 = createExpressionTree(s12, schemap);
   auto t22 = createExpressionTree(s22, schemap);
   REQUIRE(t12->ToString() == t22->ToString());
+
+  std::cout << schemaf->ToString() << std::endl;
+  std::cout << schemap->ToString() << std::endl;
 }