fixup! update

Author: aalkin

Framework/Core/include/Framework/ASoA.h

@@ -1540,22 +1540,7 @@ auto doSliceBy(T const* table, o2::framework::PresliceBase<C, Policy, OPT> const
   return doSliceByHelper(table, selection);
 }
 
-auto sliceSelection(SelectionVector const& mSelectedRows, int64_t nrows, uint64_t offset);
-
-template <soa::is_table T>
-  requires(!soa::is_filtered_table<T>)
-auto prepareFilteredSlice(T const* table, std::shared_ptr<arrow::Table> slice, uint64_t offset)
-{
-  if (offset >= static_cast<uint64_t>(table->tableSize())) {
-    typename T::self_t fresult{{{slice}}, SelectionVector{}, 0};
-    table->copyIndexBindings(fresult);
-    return fresult;
-  }
-  auto slicedSelection = sliceSelection(table->getSelectedRows(), slice->num_rows(), offset);
-  typename T::self_t fresult{{{slice}}, std::move(slicedSelection), offset};
-  table->copyIndexBindings(fresult);
-  return fresult;
-}
+SelectionVector sliceSelection(gsl::span<int64_t const> const& mSelectedRows, int64_t nrows, uint64_t offset);
 
 template <soa::is_filtered_table T>
 auto prepareFilteredSlice(T const* table, std::shared_ptr<arrow::Table> slice, uint64_t offset)
@@ -1571,7 +1556,7 @@ auto prepareFilteredSlice(T const* table, std::shared_ptr<arrow::Table> slice, u
   return fresult;
 }
 
-template <typename T, typename C, bool OPT>
+template <soa::is_filtered_table T, typename C, bool OPT>
   requires(o2::soa::is_binding_compatible_v<C, T>())
 auto doFilteredSliceBy(T const* table, o2::framework::PresliceBase<C, framework::PreslicePolicySorted, OPT> const& container, int value)
 {

Framework/Core/src/ASoA.cxx

@@ -50,6 +50,20 @@ SelectionVector selectionToVector(gandiva::Selection const& sel)
   return rows;
 }
 
+SelectionVector sliceSelection(gsl::span<int64_t const> const& mSelectedRows, int64_t nrows, uint64_t offset)
+{
+  auto start = offset;
+  auto end = start + nrows;
+  auto start_iterator = std::lower_bound(mSelectedRows.begin(), mSelectedRows.end(), start);
+  auto stop_iterator = std::lower_bound(start_iterator, mSelectedRows.end(), end);
+  SelectionVector slicedSelection{start_iterator, stop_iterator};
+  std::transform(slicedSelection.begin(), slicedSelection.end(), slicedSelection.begin(),
+                 [&start](int64_t idx) {
+                   return idx - static_cast<int64_t>(start);
+                 });
+  return slicedSelection;
+}
+
 std::shared_ptr<arrow::Table> ArrowHelpers::joinTables(std::vector<std::shared_ptr<arrow::Table>>&& tables)
 {
   if (tables.size() == 1) {