Skip to content

DPL Analysis: When bound to a filtered table, index column now returns iterator to the original #6602

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
aalkin wants to merge 1 commit into from
Closed

DPL Analysis: When bound to a filtered table, index column now returns iterator to the original #6602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Framework/Core/include/Framework/ASoA.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1370,7 +1370,7 @@ constexpr auto is_binding_compatible_v()
auto _Getter_##_as() const \
{ \
assert(mBinding != nullptr); \
return static_cast<T*>(mBinding)->begin() + *mColumnIterator; \
return static_cast<T*>(mBinding)->iteratorAt(*mColumnIterator); \
} \
\
auto _Getter_() const \
Expand Down Expand Up @@ -1589,6 +1589,8 @@ struct Join : JoinBase<Ts...> {
using persistent_columns_t = typename table_t::persistent_columns_t;
using iterator = typename table_t::template RowView<Join<Ts...>, Ts...>;
using const_iterator = iterator;
using unfiltered_iterator = iterator;
using unfiltered_const_iterator = const_iterator;
using filtered_iterator = typename table_t::template RowViewFiltered<Join<Ts...>, Ts...>;
using filtered_const_iterator = filtered_iterator;
};
Expand Down Expand Up @@ -1661,6 +1663,8 @@ class FilteredPolicy : public T
}
using iterator = decltype(make_it<FilteredPolicy<T>>(originals{}));
using const_iterator = iterator;
using unfiltered_iterator = typename table_t::iterator;
using unfiltered_const_iterator = typename table_t::const_iterator;

FilteredPolicy(std::vector<std::shared_ptr<arrow::Table>>&& tables, SelectionVector&& selection, uint64_t offset = 0)
: T{std::move(tables), offset},
Expand Down
37 changes: 37 additions & 0 deletions Framework/Core/test/test_ASoA.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,6 +628,43 @@ BOOST_AUTO_TEST_CASE(TestNestedFiltering)
BOOST_CHECK_EQUAL(i, 1);
}

DECLARE_SOA_TABLE(Origins, "TST", "ORIG", o2::soa::Index<>, test::X, test::SomeBool);
namespace test
{
DECLARE_SOA_INDEX_COLUMN(Origin, origin);
}
DECLARE_SOA_TABLE(References, "TST", "REFS", o2::soa::Index<>, test::OriginId);

BOOST_AUTO_TEST_CASE(TestIndexToFiltered)
{
TableBuilder b;
auto writer = b.cursor<Origins>();
for (auto i = 0; i < 20; ++i) {
writer(0, i, i % 3 == 0);
}
auto origins = b.finalize();
Origins o{origins};

TableBuilder w;
auto writer_w = w.cursor<References>();
for (auto i = 0; i < 5 * 20; ++i) {
writer_w(0, i % 20);
}
auto refs = w.finalize();
References r{refs};
expressions::Filter flt = test::someBool == true;
using Flt = o2::soa::Filtered<Origins>;
Flt f{{o.asArrowTable()}, expressions::createSelection(o.asArrowTable(), flt)};
r.bindExternalIndices(&f);
auto it = r.begin();
it.moveByIndex(23);
BOOST_CHECK_EQUAL(it.origin().globalIndex(), 3);
it++;
BOOST_CHECK_EQUAL(it.origin().globalIndex(), 4);
it++;
BOOST_CHECK_EQUAL(it.origin().globalIndex(), 5);
}

BOOST_AUTO_TEST_CASE(TestEmptyTables)
{
TableBuilder bPoints;
Expand Down