Skip to content

Commit 3d7ced3

Browse files
aalkinaalkin
committed
make O2Physics compile
1 parent bd7f342 commit 3d7ced3

9 files changed

Lines changed: 31 additions & 31 deletions

File tree

‎Framework/Core/include/Framework/ASoA.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1569,14 +1569,14 @@ template <soa::is_filtered_table T>
15691569
auto prepareFilteredSlice(T const* table, o2::soa::ArrowTableRef slice)
15701570
{
15711571
if (slice.range.offset >= static_cast<uint64_t>(table->tableSize())) {
1572-
Filtered<typename T::base_t> fresult{{{slice}}, SelectionVector{}, 0};
1572+
Filtered<typename T::base_t> fresult{{slice}, SelectionVector{}};
15731573
if (fresult.tableSize() != 0) {
15741574
table->copyIndexBindings(fresult);
15751575
}
15761576
return fresult;
15771577
}
15781578
auto slicedSelection = sliceSelection(table->getSelectedRows(), slice->num_rows(), slice.range.offset);
1579-
Filtered<typename T::base_t> fresult{{{slice}}, std::move(slicedSelection)};
1579+
Filtered<typename T::base_t> fresult{{slice}, std::move(slicedSelection)};
15801580
if (fresult.tableSize() != 0) {
15811581
table->copyIndexBindings(fresult);
15821582
}
@@ -1592,7 +1592,7 @@ auto doFilteredSliceBy(T const* table, o2::framework::PresliceBase<C, framework:
15921592
missingOptionalPreslice(getLabelFromType<T>().data(), container.bindingKey.key.c_str());
15931593
}
15941594
}
1595-
auto slice = container.getSliceFor(value, table->asArrowTable());
1595+
auto slice = container.getSliceFor(value, table->asArrowTableRef());
15961596
return prepareFilteredSlice(table, slice);
15971597
}
15981598

@@ -1617,7 +1617,7 @@ auto doFilteredSliceByCached(T const* table, framework::expressions::BindingNode
16171617
auto localCache = cache.ptr->getCacheFor({"", originReplacement(cache.ptr->newOrigin)(o2::soa::getMatcherFromTypeForKey<T>(node.name)),
16181618
node.name});
16191619
auto [offset, count] = localCache.getSliceFor(value);
1620-
return prepareFilteredSlice(table, table->asArrowTableRef().slice(static_cast<uint64_t>(offset), count));
1620+
return prepareFilteredSlice(table, table->asArrowTableRef().slice({static_cast<uint64_t>(offset), count}));
16211621
}
16221622

16231623
template <soa::is_table T>
@@ -1644,7 +1644,7 @@ auto doSliceByCachedUnsorted(T const* table, framework::expressions::BindingNode
16441644
template <with_originals T>
16451645
auto select(T const& t, framework::expressions::Filter const& f)
16461646
{
1647-
return Filtered<T>({t.asArrowTable()}, selectionToVector(framework::expressions::createSelection(t.asArrowTable(), f)));
1647+
return Filtered<T>({t.asArrowTableRef()}, selectionToVector(framework::expressions::createSelection(t.asArrowTable(), f)));
16481648
}
16491649

16501650
arrow::ChunkedArray* getIndexFromLabel(arrow::Table* table, std::string_view label);
@@ -3578,7 +3578,7 @@ class FilteredBase : public T
35783578

35793579
[[nodiscard]] int64_t tableSize() const
35803580
{
3581-
return table_t::asArrowTable()->num_rows();
3581+
return this->asArrowTableRef().range.size;
35823582
}
35833583

35843584
auto const& getSelectedRows() const
@@ -3591,12 +3591,12 @@ class FilteredBase : public T
35913591
SelectionVector newSelection;
35923592
newSelection.resize(static_cast<int64_t>(end - start + 1));
35933593
std::iota(newSelection.begin(), newSelection.end(), start);
3594-
return self_t{{this->asArrowTable()}, std::move(newSelection), 0};
3594+
return self_t{{this->asArrowTableRef()}, std::move(newSelection)};
35953595
}
35963596

35973597
auto emptySlice() const
35983598
{
3599-
return self_t{{this->asArrowTable()}, SelectionVector{}, 0};
3599+
return self_t{{this->asArrowTableRef()}, SelectionVector{}};
36003600
}
36013601

36023602
static inline auto getSpan(gandiva::Selection const& sel)

‎Framework/Core/include/Framework/AnalysisHelpers.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -983,7 +983,7 @@ struct Partition {
983983

984984
void bindTable(T const& table)
985985
{
986-
intializeCaches(T::table_t::hashes(), table.asArrowTable()->schema());
986+
intializeCaches(T::table_t::hashes(), table.asArrowTableRef()->schema());
987987
if (dataframeChanged) {
988988
mFiltered = getTableFromFilter(table, soa::selectionToVector(framework::expressions::createSelection(table.asArrowTable(), gfilter)));
989989
dataframeChanged = false;
@@ -1096,7 +1096,7 @@ template <soa::is_table T, soa::is_dynamic_column... Cs>
10961096
auto Attach(T const& table)
10971097
{
10981098
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...>>;
1099-
return output_t{{table.asArrowTable()}, table.offset()};
1099+
return output_t{{table.asArrowTableRef()}};
11001100
}
11011101
} // namespace o2::soa
11021102

‎Framework/Core/include/Framework/AnalysisManagers.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ bool prepareOutput(ProcessingContext& context, T& defines)
353353
defines.projectors.data(),
354354
defines.projector,
355355
defines.schema));
356-
defines.table = std::make_shared<typename T::spawnable_t::table_t>(soa::ArrowHelpers::joinTables({defines.extension->asArrowTable(), originalTable}, std::span{T::spawnable_t::table_t::originalLabels}));
356+
defines.table = std::make_shared<typename T::spawnable_t::table_t>(soa::ArrowHelpers::joinTables({defines.extension->asArrowTableRef(), originalTable}, std::span{T::spawnable_t::table_t::originalLabels}));
357357
return true;
358358
}
359359

@@ -385,7 +385,7 @@ bool prepareDelayedOutput(ProcessingContext& context, T& defines)
385385
defines.projectors.data(),
386386
defines.projector,
387387
defines.schema));
388-
defines.table = std::make_shared<typename T::spawnable_t::table_t>(soa::ArrowHelpers::joinTables({defines.extension->asArrowTable(), originalTable}, std::span{T::spawnable_t::table_t::originalLabels}));
388+
defines.table = std::make_shared<typename T::spawnable_t::table_t>(soa::ArrowHelpers::joinTables({defines.extension->asArrowTableRef(), originalTable}, std::span{T::spawnable_t::table_t::originalLabels}));
389389
return true;
390390
}
391391

‎Framework/Core/include/Framework/GroupSlicer.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ struct GroupSlicer {
194194
}
195195
}
196196
}
197-
std::decay_t<A1> typedTable{{originalTable.asArrowTable()}, std::move(s)};
197+
std::decay_t<A1> typedTable{{originalTable.asArrowTableRef()}, std::move(s)};
198198
typedTable.bindInternalIndicesTo(&originalTable);
199199
return typedTable;
200200
}

‎Framework/Core/include/Framework/GroupedCombinations.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,15 @@ struct GroupedCombinationsGenerator {
7070
template <typename... T2s>
7171
GroupedIterator(const GroupingPolicy& groupingPolicy, const G& grouping, const std::tuple<T2s...>& associated, SliceCache* cache_)
7272
: GroupingPolicy(groupingPolicy),
73-
mGrouping{std::make_shared<G>(std::vector{grouping.asArrowTable()})},
73+
mGrouping{std::make_shared<G>(std::vector{grouping.asArrowTableRef()})},
7474
mAssociated{std::make_shared<std::tuple<As...>>(std::make_tuple(std::get<has_type_at<As>(pack<T2s...>{})>(associated)...))},
7575
mIndexColumns{getMatchingIndexNode<G, As>()...},
7676
cache{cache_}
7777
{
7878
if constexpr (soa::is_filtered_table<std::decay_t<G>>) {
79-
mGrouping = std::make_shared<G>(std::vector{grouping.asArrowTable()}, grouping.getSelectedRows());
79+
mGrouping = std::make_shared<G>(std::vector{grouping.asArrowTableRef()}, grouping.getSelectedRows());
8080
} else {
81-
mGrouping = std::make_shared<G>(std::vector{grouping.asArrowTable()});
81+
mGrouping = std::make_shared<G>(std::vector{grouping.asArrowTableRef()});
8282
}
8383
setMultipleGroupingTables<sizeof...(As)>(grouping);
8484
if (!this->mIsEnd) {
@@ -94,9 +94,9 @@ struct GroupedCombinationsGenerator {
9494
void setTables(const G& grouping, const std::tuple<T2s...>& associated)
9595
{
9696
if constexpr (soa::is_filtered_table<std::decay_t<G>>) {
97-
mGrouping = std::make_shared<G>(std::vector{grouping.asArrowTable()}, grouping.getSelectedRows());
97+
mGrouping = std::make_shared<G>(std::vector{grouping.asArrowTableRef()}, grouping.getSelectedRows());
9898
} else {
99-
mGrouping = std::make_shared<G>(std::vector{grouping.asArrowTable()});
99+
mGrouping = std::make_shared<G>(std::vector{grouping.asArrowTableRef()});
100100
}
101101
mAssociated = std::make_shared<std::tuple<As...>>(std::make_tuple(std::get<has_type_at_v<As>(pack<T2s...>{})>(associated)...));
102102
setMultipleGroupingTables<sizeof...(As)>(grouping);

‎Framework/Core/test/test_ASoA.cxx‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ TEST_CASE("TestConcatTables")
430430
gandiva::Selection selection_f = expressions::createSelection(tableA, testf);
431431

432432
TestA testA{tableA};
433-
FilteredTest filtered{{testA.asArrowTable()}, selection_f};
433+
FilteredTest filtered{{testA.asArrowTableRef()}, selection_f};
434434
REQUIRE(2 == filtered.size());
435435

436436
auto i = 0;
@@ -453,7 +453,7 @@ TEST_CASE("TestConcatTables")
453453
selectionConcat->SetIndex(2, 10);
454454
selectionConcat->SetNumSlots(3);
455455
ConcatTest concatTest{tableA, tableB};
456-
FilteredConcatTest concatTestTable{{concatTest.asArrowTable()}, selectionConcat};
456+
FilteredConcatTest concatTestTable{{concatTest.asArrowTableRef()}, selectionConcat};
457457
REQUIRE(3 == concatTestTable.size());
458458

459459
i = 0;
@@ -483,7 +483,7 @@ TEST_CASE("TestConcatTables")
483483
selectionJoin->SetIndex(2, 4);
484484
selectionJoin->SetNumSlots(3);
485485
JoinedTest testJoin{{tableA, tableC}};
486-
FilteredJoinTest filteredJoin{{testJoin.asArrowTable()}, selectionJoin};
486+
FilteredJoinTest filteredJoin{{testJoin.asArrowTableRef()}, selectionJoin};
487487

488488
i = 0;
489489
REQUIRE(filteredJoin.begin() != filteredJoin.end());
@@ -600,12 +600,12 @@ TEST_CASE("TestFilteredOperators")
600600

601601
TestA testA{tableA};
602602
auto s1 = expressions::createSelection(testA.asArrowTable(), f1);
603-
FilteredTest filtered1{{testA.asArrowTable()}, s1};
603+
FilteredTest filtered1{{testA.asArrowTableRef()}, s1};
604604
REQUIRE(4 == filtered1.size());
605605
REQUIRE(filtered1.begin() != filtered1.end());
606606

607607
auto s2 = expressions::createSelection(testA.asArrowTable(), f2);
608-
FilteredTest filtered2{{testA.asArrowTable()}, s2};
608+
FilteredTest filtered2{{testA.asArrowTableRef()}, s2};
609609
REQUIRE(2 == filtered2.size());
610610
REQUIRE(filtered2.begin() != filtered2.end());
611611

@@ -633,7 +633,7 @@ TEST_CASE("TestFilteredOperators")
633633

634634
expressions::Filter f3 = o2::aod::test::x < 3;
635635
auto s3 = expressions::createSelection(testA.asArrowTable(), f3);
636-
FilteredTest filtered3{{testA.asArrowTable()}, s3};
636+
FilteredTest filtered3{{testA.asArrowTableRef()}, s3};
637637
REQUIRE(3 == filtered3.size());
638638
REQUIRE(filtered3.begin() != filtered3.end());
639639

@@ -677,7 +677,7 @@ TEST_CASE("TestNestedFiltering")
677677

678678
TestA testA{tableA};
679679
auto s1 = expressions::createSelection(testA.asArrowTable(), f1);
680-
FilteredTest filtered{{testA.asArrowTable()}, s1};
680+
FilteredTest filtered{{testA.asArrowTableRef()}, s1};
681681
REQUIRE(4 == filtered.size());
682682
REQUIRE(filtered.begin() != filtered.end());
683683

@@ -774,7 +774,7 @@ TEST_CASE("TestIndexToFiltered")
774774
expressions::Filter flt = o2::aod::test::someBool == true;
775775
using Flt = o2::soa::Filtered<o2::aod::Origints>;
776776
auto selection = expressions::createSelection(o.asArrowTable(), flt);
777-
Flt f{{o.asArrowTable()}, selection};
777+
Flt f{{o.asArrowTableRef()}, selection};
778778
r.bindExternalIndices(&f);
779779
auto it = r.begin();
780780
it.moveByIndex(23);

‎Framework/Core/test/test_ASoAHelpers.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ TEST_CASE("IteratorTuple")
7272
REQUIRE(*(static_cast<test::X>(std::get<1>(maxOffset2)).getIterator().mCurrentPos) == 8);
7373

7474
expressions::Filter filter = test::x > 3;
75-
auto filtered = Filtered<TestA>{{tests.asArrowTable()}, o2::framework::expressions::createSelection(tests.asArrowTable(), filter)};
75+
auto filtered = Filtered<TestA>{{tests.asArrowTableRef()}, o2::framework::expressions::createSelection(tests.asArrowTable(), filter)};
7676
std::tuple<Filtered<TestA>, Filtered<TestA>> filteredTuple = std::make_tuple(filtered, filtered);
7777

7878
auto it1 = std::get<0>(filteredTuple).begin();
@@ -164,7 +164,7 @@ TEST_CASE("CombinationsGeneratorConstruction")
164164

165165
o2::framework::expressions::Filter filter = test::x > 3;
166166
auto s1 = o2::framework::expressions::createSelection(testsA.asArrowTable(), filter);
167-
auto filtered = Filtered<TestA>{{testsA.asArrowTable()}, s1};
167+
auto filtered = Filtered<TestA>{{testsA.asArrowTableRef()}, s1};
168168

169169
CombinationsGenerator<CombinationsStrictlyUpperIndexPolicy<Filtered<TestA>, Filtered<TestA>>>::CombinationsIterator combItFiltered(CombinationsStrictlyUpperIndexPolicy(filtered, filtered));
170170
REQUIRE(!(static_cast<test::X>(std::get<0>(*(combItFiltered))).getIterator().mCurrentPos == nullptr));

‎Framework/Core/test/test_AnalysisDataModel.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ TEST_CASE("TestJoinedTablesContains")
5050
using Test = o2::soa::Join<XY, ZD>;
5151

5252
Test tests{{tXY, tZD}};
53-
REQUIRE(tests.asArrowTable()->num_columns() != 0);
54-
REQUIRE(tests.asArrowTable()->num_columns() ==
53+
REQUIRE(tests.asArrowTableRef()->num_columns() != 0);
54+
REQUIRE(tests.asArrowTableRef()->num_columns() ==
5555
tXY->num_columns() + tZD->num_columns());
5656
auto tests2 = join(XY{tXY}, ZD{tZD});
5757
static_assert(std::same_as<Test::table_t, decltype(tests2)::table_t>,

‎Framework/Core/test/test_AnalysisTask.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ TEST_CASE("TestPartitionIteration")
314314

315315
expressions::Filter f1 = aod::test::x < 4.0f;
316316
auto selection = expressions::createSelection(testA.asArrowTable(), f1);
317-
FilteredTest filtered{{testA.asArrowTable()}, o2::soa::selectionToVector(selection)};
317+
FilteredTest filtered{{testA.asArrowTableRef()}, o2::soa::selectionToVector(selection)};
318318
PartitionFilteredTest p2 = aod::test::y > 9.0f;
319319
p2.bindTable(filtered);
320320

0 commit comments

Comments
 (0)