DPL Analysis: make Attach preserve the filtered status of the table

Author: aalkin

Framework/Core/include/Framework/ASoA.h

@@ -2283,6 +2283,10 @@ O2ORIGIN("CONC");
 O2HASH("CONC/0");
 O2ORIGIN("TEST");
 O2HASH("TEST/0");
+O2HASH("ATT/0");
+O2ORIGIN("ATT");
+O2HASH("EXT/0");
+O2ORIGIN("EXT");
 } // namespace o2::aod
 
 #define DECLARE_EQUIVALENT_FOR_INDEX(_Base_, _Equiv_)                                                     \

Framework/Core/include/Framework/AnalysisHelpers.h

@@ -698,18 +698,29 @@ namespace o2::soa
 template <soa::is_table T, soa::is_spawnable_column... Cs>
 auto Extend(T const& table)
 {
-  using output_t = Join<T, soa::Table<o2::aod::Hash<"JOIN"_h>, o2::aod::Hash<"JOIN/0"_h>, o2::aod::Hash<"JOIN"_h>, Cs...>>;
+  using output_t = Join<T, soa::Table<o2::aod::Hash<"EXT"_h>, o2::aod::Hash<"EXT/0"_h>, o2::aod::Hash<"EXT"_h>, Cs...>>;
   return output_t{{o2::framework::spawner(framework::pack<Cs...>{}, {table.asArrowTable()}, "dynamicExtension"), table.asArrowTable()}, 0};
 }
 
 /// Template function to attach dynamic columns on-the-fly (e.g. inside
 /// process() function). Dynamic columns need to be compatible with the table.
 template <soa::is_table T, soa::is_dynamic_column... Cs>
+  requires(!soa::is_filtered_table<T>)
 auto Attach(T const& table)
 {
-  using output_t = Join<T, o2::soa::Table<o2::aod::Hash<"JOIN"_h>, o2::aod::Hash<"JOIN/0"_h>, o2::aod::Hash<"JOIN"_h>, Cs...>>;
+  using output_t = Join<T, o2::soa::Table<o2::aod::Hash<"ATT"_h>, o2::aod::Hash<"ATT/0"_h>, o2::aod::Hash<"ATT"_h>, Cs...>>;
   return output_t{{table.asArrowTable()}, table.offset()};
 }
+
+template <soa::is_filtered_table T, soa::is_dynamic_column... Cs>
+auto Attach(T const& table)
+{
+  using output_t = soa::Filtered<soa::Join<typename T::table_t, o2::soa::Table<o2::aod::Hash<"ATT"_h>, o2::aod::Hash<"ATT/0"_h>, o2::aod::Hash<"ATT"_h>, Cs...>>>;
+  SelectionVector selection;
+  selection.reserve(table->getSelectedRows().size());
+  std::copy(table->getSelectedRows().begin(), table->getSelectedRows().end(), std::back_inserter(selection));
+  return output_t{{table.asArrowTable()}, std::move(selection), table.offset()};
+}
 }  // namespace o2::soa
 
 #endif  // o2_framework_AnalysisHelpers_H_DEFINED