DPL Analysis: allow binding all the columns which refer to a different table

Author: ktf

Framework/Core/include/Framework/ASoA.h

@@ -804,16 +804,27 @@ class Table
     return unfiltered_const_iterator{mEnd};
   }
 
+  /// Return a type erased arrow table backing store for / the type safe table.
   std::shared_ptr<arrow::Table> asArrowTable() const
   {
     return mTable;
   }
 
+  /// Size of the table, in rows.
   int64_t size() const
   {
     return mTable->num_rows();
   }
 
+  /// Bind the columns which refer to other tables
+  /// to the associated tables.
+  template <typename... TA>
+  void bindExternalIndices(TA*... current)
+  {
+    mBegin.bindExternalIndices(current...);
+    mEnd.bindExternalIndices(current...);
+  }
+
  private:
   template <typename T>
   arrow::Column* lookupColumn()
@@ -1098,6 +1109,13 @@ struct Join : JoinBase<Ts...> {
   }
 
   using originals = framework::concatenated_pack_t<originals_pack_t<Ts>...>;
+
+  template <typename... TA>
+  void bindExternalIndices(TA*... externals)
+  {
+    this->bindExternalIndices(externals...);
+  }
+
   using table_t = JoinBase<Ts...>;
 };
 
@@ -1109,6 +1127,13 @@ struct Concat : ConcatBase<T1, T2> {
     : ConcatBase<T1, T2>{ArrowHelpers::concatTables(std::move(tables)), offset} {}
 
   using originals = framework::concatenated_pack_t<originals_pack_t<T1>, originals_pack_t<T2>>;
+
+  template <typename... TA>
+  void bindExternalIndices(TA*... externals)
+  {
+    this->bindExternalIndices(externals...);
+  }
+
   // FIXME: can be remove when we do the same treatment we did for Join to Concatenate
   using left_t = T1;
   using right_t = T2;

Framework/Core/test/test_ASoA.cxx

@@ -456,7 +456,7 @@ BOOST_AUTO_TEST_CASE(TestDereference)
   auto infoWriter = builderA2.cursor<Infos>();
   infoWriter(0, 0);
   infoWriter(0, 1);
-  infoWriter(0, 2);
+  infoWriter(0, 4);
   auto infosT = builderA2.finalize();
   Infos infos{infosT};
   BOOST_REQUIRE_EQUAL(infosT->num_rows(), 3);
@@ -475,9 +475,18 @@ BOOST_AUTO_TEST_CASE(TestDereference)
   using namespace o2::framework;
   i.bindExternalIndices(&points, &infos);
   BOOST_CHECK_EQUAL(i.n(), 10);
-  BOOST_CHECK_EQUAL(i.info().color(), 2);
+  BOOST_CHECK_EQUAL(i.info().color(), 4);
   BOOST_CHECK_EQUAL(i.pointA().x(), 0);
   BOOST_CHECK_EQUAL(i.pointA().y(), 0);
   BOOST_CHECK_EQUAL(i.pointB().x(), 3);
   BOOST_CHECK_EQUAL(i.pointB().y(), 4);
+
+  segments.bindExternalIndices(&points, &infos);
+  auto j = segments.begin();
+  BOOST_CHECK_EQUAL(j.n(), 10);
+  BOOST_CHECK_EQUAL(j.info().color(), 4);
+  BOOST_CHECK_EQUAL(j.pointA().x(), 0);
+  BOOST_CHECK_EQUAL(j.pointA().y(), 0);
+  BOOST_CHECK_EQUAL(j.pointB().x(), 3);
+  BOOST_CHECK_EQUAL(j.pointB().y(), 4);
 }