cover more cases

Author: aalkin

Framework/Core/include/Framework/ASoA.h

@@ -1248,10 +1248,12 @@ struct TableIterator : IP, C... {
 };
 
 struct ArrowHelpers {
+  static o2::soa::ArrowTableRef joinTables(std::vector<std::shared_ptr<arrow::Table>>&& tables);
   static o2::soa::ArrowTableRef joinTables(std::vector<o2::soa::ArrowTableRef>&& tables);
   static o2::soa::ArrowTableRef joinTables(std::vector<o2::soa::ArrowTableRef>&& tables, std::span<const char* const> labels);
   static o2::soa::ArrowTableRef joinTables(std::vector<o2::soa::ArrowTableRef>&& tables, std::span<const std::string> labels);
   static o2::soa::ArrowTableRef concatTables(std::vector<o2::soa::ArrowTableRef>&& tables);
+  static o2::soa::ArrowTableRef concatTables(std::vector<std::shared_ptr<arrow::Table>>&& tables);
 };
 
 template <size_t N1, std::array<TableRef, N1> os1, size_t N2, std::array<TableRef, N2> os2>
@@ -1962,27 +1964,32 @@ class Table
     }
   }
 
-  Table(std::vector<std::shared_ptr<arrow::Table>>&& tables, ArrowRange range)
+  Table(std::shared_ptr<arrow::Table> table)
+    : Table(o2::soa::ArrowTableRef{table})
+  {
+  }
+
+  Table(std::vector<o2::soa::ArrowTableRef>&& tables)
     requires(ref.origin_hash != "CONC"_h)
-    : Table({ArrowHelpers::joinTables(std::move(tables), std::span{originalLabels}), range})
+    : Table(ArrowHelpers::joinTables(std::forward<std::vector<o2::soa::ArrowTableRef>>(tables), std::span{originalLabels}))
   {
   }
 
-  Table(std::vector<std::shared_ptr<arrow::Table>>&& tables, ArrowRange range)
+  Table(std::vector<o2::soa::ArrowTableRef>&& tables)
     requires(ref.origin_hash == "CONC"_h)
-    : Table({ArrowHelpers::concatTables(std::move(tables)), range})
+    : Table(ArrowHelpers::concatTables(std::forward<std::vector<o2::soa::ArrowTableRef>>(tables)))
   {
   }
 
-  Table(std::vector<o2::soa::ArrowTableRef>&& tables)
+  Table(std::vector<std::shared_ptr<arrow::Table>>&& tables)
     requires(ref.origin_hash != "CONC"_h)
-    : Table(ArrowHelpers::joinTables(std::move(tables), std::span{originalLabels}))
+    : Table(ArrowHelpers::joinTables(std::forward<std::vector<std::shared_ptr<arrow::Table>>>(tables)))
   {
   }
 
-  Table(std::vector<o2::soa::ArrowTableRef>&& tables)
+  Table(std::vector<std::shared_ptr<arrow::Table>>&& tables)
     requires(ref.origin_hash == "CONC"_h)
-    : Table(ArrowHelpers::concatTables(std::move(tables)))
+    : Table(ArrowHelpers::concatTables(std::forward<std::vector<std::shared_ptr<arrow::Table>>>(tables)))
   {
   }
 

Framework/Core/src/ASoA.cxx

@@ -126,7 +126,7 @@ std::shared_ptr<arrow::Table> joinTablesImpl(std::ranges::input_range auto table
 }
 
 template <typename T>
- ArrowTableRef joinTablesImpl(std::ranges::input_range auto tables, std::span<T> labels)
+ArrowTableRef joinTablesImpl(std::ranges::input_range auto tables, std::span<T> labels)
 {
   if (tables.size() == 1) {
     return tables.front();
@@ -137,6 +137,13 @@ template <typename T>
 }
 } // namespace
 
+o2::soa::ArrowTableRef ArrowHelpers::joinTables(std::vector<std::shared_ptr<arrow::Table>>&& tables)
+{
+  std::vector<ArrowTableRef> refs;
+  std::ranges::transform(tables, std::back_inserter(refs),[](auto const& table){ return ArrowTableRef{table}; });
+  return joinTablesImpl(refs, std::span<const char* const>());
+}
+
 o2::soa::ArrowTableRef ArrowHelpers::joinTables(std::vector<o2::soa::ArrowTableRef>&& tables)
 {
   return joinTablesImpl(tables, std::span<const char* const>());
@@ -187,6 +194,13 @@ o2::soa::ArrowTableRef ArrowHelpers::concatTables(std::vector<o2::soa::ArrowTabl
   return {arrow::Table::Make(std::make_shared<arrow::Schema>(resultFields), columns)};
 }
 
+o2::soa::ArrowTableRef ArrowHelpers::concatTables(std::vector<std::shared_ptr<arrow::Table>>&& tables)
+{
+  std::vector<ArrowTableRef> refs;
+  std::ranges::transform(tables, std::back_inserter(refs),[](auto const& table){ return ArrowTableRef{table}; });
+  return concatTables(std::move(refs));
+}
+
 // ASCII-only lowercase. Column labels are plain identifiers, so we deliberately
 // avoid the locale-aware std::tolower: it goes through the C locale facet on
 // every character and dominated getIndexFromLabel in profiles.