add output matchers to tableTransform; add fixmes

Author: aalkin

Framework/Core/include/Framework/AnalysisHelpers.h

@@ -614,34 +614,6 @@ struct TableTransform {
     return std::vector{soa::tableRef2InputSpec<sources[Is]>()...};
   }(std::make_index_sequence<sources.size()>());
   OutputSpec outputSpec = soa::tableRef2OutputSpec<Ref>();
-
-  template <soa::TableRef R>
-  static auto base_spec()
-  {
-    return soa::tableRef2InputSpec<R>();
-  }
-
-  static auto base_specs()
-  {
-    return []<size_t... Is>(std::index_sequence<Is...>) {
-      return std::array{base_spec<sources[Is]>()...};
-    }(std::make_index_sequence<sources.size()>{});
-  }
-
-  static constexpr auto spec()
-  {
-    return soa::tableRef2OutputSpec<Ref>();
-  }
-
-  static constexpr auto output()
-  {
-    return soa::tableRef2Output<Ref>();
-  }
-
-  static constexpr auto ref()
-  {
-    return soa::tableRef2OutputRef<Ref>();
-  }
 };
 
 /// This helper struct allows you to declare extended tables which should be

Framework/Core/include/Framework/AnalysisManagers.h

@@ -159,13 +159,12 @@ const char* controlOption()
 }
 
 template <typename T>
-concept with_base_table = requires { T::base_specs(); };
+concept with_required_inputs = requires(T t) { t.requiredInputs.size(); };
 
-template <with_base_table T>
-bool requestInputs(std::vector<InputSpec>& inputs, T const& /*entity*/)
+template <with_required_inputs T>
+bool requestInputs(std::vector<InputSpec>& inputs, T const& entity)
 {
-  auto base_specs = T::base_specs();
-  for (auto base_spec : base_specs) {
+  for (auto base_spec : entity.requiredInputs) {
     base_spec.metadata.push_back(ConfigParamSpec{std::string{controlOption<T>()}, VariantType::Bool, true, {"\"\""}});
     DataSpecUtils::updateInputList(inputs, std::forward<InputSpec>(base_spec));
   }
@@ -388,21 +387,24 @@ bool finalizeOutput(ProcessingContext& context, T& producesGroup)
 template <is_spawns T>
 bool finalizeOutput(ProcessingContext& context, T& spawns)
 {
-  context.outputs().adopt(spawns.output(), spawns.asArrowTable());
+  auto matcher = DataSpecUtils::asConcreteDataMatcher(spawns.outputSpec);
+  context.outputs().adopt(Output{matcher.origin, matcher.description, matcher.subSpec}, spawns.asArrowTable());
   return true;
 }
 
 template <is_builds T>
 bool finalizeOutput(ProcessingContext& context, T& builds)
 {
-  context.outputs().adopt(builds.output(), builds.asArrowTable());
+  auto matcher = DataSpecUtils::asConcreteDataMatcher(builds.outputSpec);
+  context.outputs().adopt(Output{matcher.origin, matcher.description, matcher.subSpec}, builds.asArrowTable());
   return true;
 }
 
 template <is_defines T>
 bool finalizeOutput(ProcessingContext& context, T& defines)
 {
-  context.outputs().adopt(defines.output(), defines.asArrowTable());
+  auto matcher = DataSpecUtils::asConcreteDataMatcher(defines.outputSpec);
+  context.outputs().adopt(Output{matcher.origin, matcher.description, matcher.subSpec}, defines.asArrowTable());
   return true;
 }
 

Framework/Core/include/Framework/AnalysisTask.h

@@ -574,6 +574,12 @@ DataProcessorSpec adaptAnalysisTask(ConfigContext const& ctx, Args&&... args)
   requiredServices.insert(requiredServices.end(), arrowServices.begin(), arrowServices.end());
   homogeneous_apply_refs_sized<numElements>([&requiredServices](auto& element) { return analysis_task_parsers::addService(requiredServices, element); }, *task.get());
 
+  /// FIXME: In order to replace origins consistently, there are following things that need to be touched
+  /// 1. inputs and outputs, including their metadata
+  /// 2. inputInfos, that contain matchers for extracting arguments of process functions
+  /// 3. bindingKeys/bindingKeysUnsorted, that contain matchers to extract tables used to calculate slicing (created in init)
+  /// 4. Produces/Spawns/Defines/Builds contain matchers for required inputs and created outputs that need to be modified
+
   auto algo = AlgorithmSpec::InitCallback{[task = task, expressionInfos, inputInfos](InitContext& ic) mutable {
     Cache bindingsKeys;
     Cache bindingsKeysUnsorted;