fixup! DPL Analysis: remove std::set from analysis task

Author: aalkin

Framework/Core/include/Framework/ASoA.h

@@ -1763,7 +1763,7 @@ class Table
   using columns_t = decltype(getColumns<ref, Ts...>());
 
   static constexpr auto column_hashes = []<typename... C>(framework::pack<C...>) consteval {
-    auto hashes = []<typename... CC>() consteval { return std::array{CC::hash...}; }.template operator()<C...>();
+    auto hashes = std::array{C::hash...};
     std::ranges::sort(hashes);
     return hashes;
   }(columns_t{});

Framework/Core/include/Framework/AnalysisHelpers.h

@@ -953,7 +953,7 @@ auto getTableFromFilter(soa::is_not_filtered_table auto const& table, soa::Selec
   return std::make_unique<o2::soa::Filtered<std::decay_t<decltype(table)>>>(std::vector{table.asArrowTableRef()}, std::forward<soa::SelectionVector>(selection));
 }
 
-void initializePartitionCaches(const std::span<const uint32_t>& hashes, std::shared_ptr<arrow::Schema> const& schema, expressions::Filter const& filter, gandiva::NodePtr& tree, gandiva::FilterPtr& gfilter);
+void initializePartitionCaches(std::span<const uint32_t> hashes, std::shared_ptr<arrow::Schema> const& schema, expressions::Filter const& filter, gandiva::NodePtr& tree, gandiva::FilterPtr& gfilter);
 
 /// Partition ties directly to the argument type
 /// in a case with several origins in subscriptions it will get the correct input, as the type contains the origin
@@ -975,7 +975,7 @@ struct Partition {
     setTable(table);
   }
 
-  void intializeCaches(std::span<const uint32_t> const& hashes, std::shared_ptr<arrow::Schema> const& schema)
+  void intializeCaches(std::span<const uint32_t> hashes, std::shared_ptr<arrow::Schema> const& schema)
   {
     initializePartitionCaches(hashes, schema, filter, tree, gfilter);
   }

Framework/Core/include/Framework/Expressions.h

@@ -681,7 +681,7 @@ using Operations = std::vector<ColumnOperationSpec>;
 Operations createOperations(Filter const& expression);
 
 /// Function to check compatibility of a given arrow schema with operation sequence
-bool isTableCompatible(const std::span<const uint32_t>& hashes, Operations const& specs);
+bool isTableCompatible(std::span<const uint32_t> hashes, Operations const& specs);
 /// Function to create gandiva expression tree from operation sequence
 gandiva::NodePtr createExpressionTree(Operations const& opSpecs,
                                       gandiva::SchemaPtr const& Schema);

Framework/Core/src/AnalysisHelpers.cxx

@@ -155,7 +155,7 @@ std::shared_ptr<arrow::Table> spawnerHelper(std::shared_ptr<arrow::Table> const&
   return arrow::Table::Make(newSchema, arrays);
 }
 
-void initializePartitionCaches(std::span<const uint32_t> const& hashes, std::shared_ptr<arrow::Schema> const& schema, expressions::Filter const& filter, gandiva::NodePtr& tree, gandiva::FilterPtr& gfilter)
+void initializePartitionCaches(std::span<const uint32_t> hashes, std::shared_ptr<arrow::Schema> const& schema, expressions::Filter const& filter, gandiva::NodePtr& tree, gandiva::FilterPtr& gfilter)
 {
   if (tree == nullptr) {
     expressions::Operations ops = createOperations(filter);

Framework/Core/src/Expressions.cxx

@@ -768,7 +768,7 @@ gandiva::NodePtr createExpressionTree(Operations const& opSpecs,
   return tree;
 }
 
-bool isTableCompatible(std::span<const uint32_t> const& hashes, Operations const& specs)
+bool isTableCompatible(std::span<const uint32_t> hashes, Operations const& specs)
 {
   std::vector<uint32_t> opHashes;
   for (auto const& spec : specs) {
@@ -779,8 +779,16 @@ bool isTableCompatible(std::span<const uint32_t> const& hashes, Operations const
       opHashes.emplace_back(spec.right.hash);
     }
   }
-
-  return std::ranges::includes(hashes, opHashes);
+  std::ranges::sort(opHashes);
+  auto [ret, last] = std::ranges::unique(opHashes);
+  opHashes.erase(ret, last);
+  bool contains = true;
+  std::ranges::for_each(opHashes, [hashes, &contains](auto const& hash){
+    contains = contains && std::ranges::any_of(hashes, [hash](auto const& h){
+        return h == hash;
+      });
+    });
+  return contains;
 }
 
 void updateExpressionInfos(expressions::Filter const& filter, std::vector<ExpressionInfo>& eInfos)