DPL Analysis: fix index columns for join / concat (#3006)

ktf · web-flow · commit c9ac246f2523 · 2020-02-25T07:15:37.000+01:00
diff --git a/Framework/Core/include/Framework/ASoA.h b/Framework/Core/include/Framework/ASoA.h
@@ -1110,12 +1110,13 @@ struct Join : JoinBase<Ts...> {
   {
   }
 
+  using base = JoinBase<Ts...>;
   using originals = framework::concatenated_pack_t<originals_pack_t<Ts>...>;
 
   template <typename... TA>
   void bindExternalIndices(TA*... externals)
   {
-    this->bindExternalIndices(externals...);
+    base::bindExternalIndices(externals...);
   }
 
   using table_t = JoinBase<Ts...>;
@@ -1128,12 +1129,13 @@ struct Concat : ConcatBase<T1, T2> {
   Concat(std::vector<std::shared_ptr<arrow::Table>> tables, uint64_t offset = 0)
     : ConcatBase<T1, T2>{ArrowHelpers::concatTables(std::move(tables)), offset} {}
 
+  using base = ConcatBase<T1, T2>;
   using originals = framework::concatenated_pack_t<originals_pack_t<T1>, originals_pack_t<T2>>;
 
   template <typename... TA>
   void bindExternalIndices(TA*... externals)
   {
-    this->bindExternalIndices(externals...);
+    base::bindExternalIndices(externals...);
   }
 
   // FIXME: can be remove when we do the same treatment we did for Join to Concatenate

Original file line number	Diff line number	Diff line change
`@@ -1110,12 +1110,13 @@ struct Join : JoinBase<Ts...> {`
`1110`	`1110`	`{`
`1111`	`1111`	`}`
`1112`	`1112`
	`1113`	`+ using base = JoinBase<Ts...>;`
`1113`	`1114`	`using originals = framework::concatenated_pack_t<originals_pack_t<Ts>...>;`
`1114`	`1115`
`1115`	`1116`	`template <typename... TA>`
`1116`	`1117`	`void bindExternalIndices(TA*... externals)`
`1117`	`1118`	`{`
`1118`		`- this->bindExternalIndices(externals...);`
	`1119`	`+ base::bindExternalIndices(externals...);`
`1119`	`1120`	`}`
`1120`	`1121`
`1121`	`1122`	`using table_t = JoinBase<Ts...>;`
`@@ -1128,12 +1129,13 @@ struct Concat : ConcatBase<T1, T2> {`
`1128`	`1129`	`Concat(std::vector<std::shared_ptr<arrow::Table>> tables, uint64_t offset = 0)`
`1129`	`1130`	`: ConcatBase<T1, T2>{ArrowHelpers::concatTables(std::move(tables)), offset} {}`
`1130`	`1131`
	`1132`	`+ using base = ConcatBase<T1, T2>;`
`1131`	`1133`	`using originals = framework::concatenated_pack_t<originals_pack_t<T1>, originals_pack_t<T2>>;`
`1132`	`1134`
`1133`	`1135`	`template <typename... TA>`
`1134`	`1136`	`void bindExternalIndices(TA*... externals)`
`1135`	`1137`	`{`
`1136`		`- this->bindExternalIndices(externals...);`
	`1138`	`+ base::bindExternalIndices(externals...);`
`1137`	`1139`	`}`
`1138`	`1140`
`1139`	`1141`	`// FIXME: can be remove when we do the same treatment we did for Join to Concatenate`