Skip to content

Commit ea105c7

Browse files
committed
update join
1 parent 066edd8 commit ea105c7

1 file changed

Lines changed: 15 additions & 7 deletions

File tree

  • Framework/Core/include/Framework

Framework/Core/include/Framework/ASoA.h

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3353,19 +3353,27 @@ struct Join : Table<o2::aod::Hash<"JOIN"_h>, o2::aod::Hash<"JOIN/0"_h>, o2::aod:
33533353
{};
33543354
using base = Table<o2::aod::Hash<"JOIN"_h>, o2::aod::Hash<"JOIN/0"_h>, o2::aod::Hash<"JOIN"_h>, Ts...>;
33553355

3356-
Join(std::shared_ptr<arrow::Table>&& table, uint64_t offset = 0)
3357-
: base{std::move(table), offset}
3356+
Join(ArrowTableRef table)
3357+
: base{table}
33583358
{
33593359
if (this->tableSize() != 0) {
33603360
bindInternalIndicesTo(this);
33613361
}
33623362
}
3363-
Join(std::vector<std::shared_ptr<arrow::Table>>&& tables, uint64_t offset = 0)
3364-
: base{ArrowHelpers::joinTables(std::move(tables), std::span{base::originalLabels}), offset}
3363+
3364+
Join(std::shared_ptr<arrow::Table>&& table)
3365+
: Join{ArrowTableRef{std::move(table)}}
3366+
{
3367+
}
3368+
3369+
Join(std::vector<ArrowTableRef>&& tables)
3370+
: Join{ArrowHelpers::joinTables(std::move(tables))}
3371+
{
3372+
}
3373+
3374+
Join(std::vector<std::shared_ptr<arrow::Table>>&& tables)
3375+
: Join{ArrowTableRef{ArrowHelpers::joinTables(std::move(tables), std::span{base::originalLabels})}}
33653376
{
3366-
if (this->tableSize() != 0) {
3367-
bindInternalIndicesTo(this);
3368-
}
33693377
}
33703378
using base::bindExternalIndices;
33713379
using base::bindInternalIndicesTo;

0 commit comments

Comments
 (0)