Please consider the following formatting changes

alibuild · aalkin · commit 7b4da70fb61a · 2024-11-11T11:03:54.000+01:00
diff --git a/Framework/Core/include/Framework/ASoA.h b/Framework/Core/include/Framework/ASoA.h
diff --git a/Framework/Core/include/Framework/AnalysisHelpers.h b/Framework/Core/include/Framework/AnalysisHelpers.h
@@ -89,7 +89,7 @@ concept producable = soa::has_metadata<T> || soa::has_metadata<typename T::paren
 template <producable T>
 struct WritingCursor {
  public:
-  using persistent_table_t = decltype([](){ if constexpr (soa::is_iterator<T>) { return typename T::parent_t{nullptr}; } else { return T{nullptr}; } }());//std::conditional<soa::is_iterator<T>, typename T::parent_t, T>;
+  using persistent_table_t = decltype([]() { if constexpr (soa::is_iterator<T>) { return typename T::parent_t{nullptr}; } else { return T{nullptr}; } }());  // std::conditional<soa::is_iterator<T>, typename T::parent_t, T>;
   using cursor_t = decltype(std::declval<TableBuilder>().cursor<persistent_table_t>());
 
   template <typename... Ts>
@@ -133,7 +133,7 @@ struct WritingCursor {
 
   decltype(FFL(std::declval<cursor_t>())) cursor;
 
- private: 
+ private:
   template <typename A>
   static decltype(auto) extract(A const& arg)
   {
diff --git a/Framework/Core/include/Framework/AnalysisManagers.h b/Framework/Core/include/Framework/AnalysisManagers.h
@@ -466,7 +466,7 @@ struct ServiceManager<Service<T>> {
   {
     // FIXME: for the moment we only need endOfStream to be
     // stateless. In the future we might want to pass it EndOfStreamContext
-    if constexpr (requires (T t) { t.endOfStream(); }) {
+    if constexpr (requires(T t) { t.endOfStream(); }) {
       service.service->endOfStream();
       return true;
     }
diff --git a/Framework/Core/include/Framework/AnalysisTask.h b/Framework/Core/include/Framework/AnalysisTask.h
@@ -85,8 +85,8 @@ struct AnalysisDataProcessorBuilder {
   template <soa::with_sources T>
   static inline auto getSources()
   {
-    return []<size_t N, std::array<soa::TableRef, N> refs>(){
-      return []<size_t... Is>(std::index_sequence<Is...>){
+    return []<size_t N, std::array<soa::TableRef, N> refs>() {
+      return []<size_t... Is>(std::index_sequence<Is...>) {
         return std::vector{soa::tableRef2ConfigParamSpec<refs[Is]>()...};
       }(std::make_index_sequence<N>());
     }.template operator()<T::sources.size(), T::sources>();
@@ -195,20 +195,20 @@ struct AnalysisDataProcessorBuilder {
   template <soa::is_table T>
   static auto extractFromRecord(InputRecord& record)
   {
-    return T{[&record]<size_t N, std::array<soa::TableRef, N> refs, size_t... Is>(std::index_sequence<Is...>){ return std::vector{extractTableFromRecord<refs[Is]>(record)...}; }.template operator()<T::originals.size(), T::originals>(std::make_index_sequence<T::originals.size()>())};
+    return T { [&record]<size_t N, std::array<soa::TableRef, N> refs, size_t... Is>(std::index_sequence<Is...>) { return std::vector{extractTableFromRecord<refs[Is]>(record)...}; }.template operator()<T::originals.size(), T::originals>(std::make_index_sequence<T::originals.size()>()) };
   }
 
   template <soa::is_iterator T>
   static auto extractFromRecord(InputRecord& record)
   {
-    return typename T::parent_t{[&record]<size_t N, std::array<soa::TableRef, N> refs, size_t... Is>(std::index_sequence<Is...>){ return std::vector{extractTableFromRecord<refs[Is]>(record)...}; }.template operator()<T::parent_t::originals.size(), T::parent_t::originals>(std::make_index_sequence<T::parent_t::originals.size()>())};
+    return typename T::parent_t { [&record]<size_t N, std::array<soa::TableRef, N> refs, size_t... Is>(std::index_sequence<Is...>) { return std::vector{extractTableFromRecord<refs[Is]>(record)...}; }.template operator()<T::parent_t::originals.size(), T::parent_t::originals>(std::make_index_sequence<T::parent_t::originals.size()>()) };
   }
 
   template <soa::is_filtered T>
   static auto extractFilteredFromRecord(InputRecord& record, ExpressionInfo& info)
   {
     std::shared_ptr<arrow::Table> table = nullptr;
-    auto joiner = [&record]<size_t N, std::array<soa::TableRef, N> refs, size_t... Is>(std::index_sequence<Is...>){ return std::vector{extractTableFromRecord<refs[Is]>(record)...}; };
+    auto joiner = [&record]<size_t N, std::array<soa::TableRef, N> refs, size_t... Is>(std::index_sequence<Is...>) { return std::vector{extractTableFromRecord<refs[Is]>(record)...}; };
     if constexpr (soa::is_iterator<T>) {
       table = o2::soa::ArrowHelpers::joinTables(joiner.template operator()<T::parent_t::originals.size(), T::parent_t::originals>(std::make_index_sequence<T::parent_t::originals.size()>()));
     } else {
diff --git a/Framework/Core/include/Framework/TableBuilder.h b/Framework/Core/include/Framework/TableBuilder.h
@@ -901,7 +901,8 @@ auto spawner(std::vector<std::shared_ptr<arrow::Table>>&& tables, const char* na
   auto projectors = []<typename... C>(framework::pack<C...>) -> std::array<expressions::Projector, sizeof...(C)>
   {
     return {{std::move(C::Projector())...}};
-  }(expression_pack_t{});
+  }
+  (expression_pack_t{});
 
   return spawnerHelper(fullTable, new_schema, framework::pack_size(expression_pack_t{}), projectors.data(), fields, name);
 }
@@ -911,14 +912,15 @@ auto spawner(std::shared_ptr<arrow::Table> const& fullTable, const char* name)
 {
   using expression_pack_t = typename o2::aod::MetadataTrait<D>::metadata::expression_pack_t;
   if (fullTable->num_rows() == 0) {
-    return makeEmptyTable(name,expression_pack_t{});
+    return makeEmptyTable(name, expression_pack_t{});
   }
   static auto fields = o2::soa::createFieldsFromColumns(expression_pack_t{});
   static auto new_schema = std::make_shared<arrow::Schema>(fields);
   auto projectors = []<typename... C>(framework::pack<C...>) -> std::array<expressions::Projector, sizeof...(C)>
   {
     return {{std::move(C::Projector())...}};
-  }(expression_pack_t{});
+  }
+  (expression_pack_t{});
 
   return spawnerHelper(fullTable, new_schema, framework::pack_size(expression_pack_t{}), projectors.data(), fields, name);
 }
diff --git a/Framework/Core/src/ASoA.cxx b/Framework/Core/src/ASoA.cxx
@@ -115,7 +115,7 @@ std::shared_ptr<arrow::Table> ArrowHelpers::concatTables(std::vector<std::shared
 
 arrow::ChunkedArray* getIndexFromLabel(arrow::Table* table, const char* label)
 {
-  auto field = std::find_if(table->schema()->fields().begin(), table->schema()->fields().end(), [&](std::shared_ptr<arrow::Field> const& f){
+  auto field = std::find_if(table->schema()->fields().begin(), table->schema()->fields().end(), [&](std::shared_ptr<arrow::Field> const& f) {
     return o2::framework::strToUpper(label) == o2::framework::strToUpper(std::string{f->name()});
   });
   if (field == table->schema()->fields().end()) {
@@ -155,7 +155,7 @@ std::string cutString(std::string&& str)
 
 std::string strToUpper(std::string&& str)
 {
-  std::transform(str.begin(), str.end(), str.begin(), [](unsigned char c){ return std::toupper(c); });
+  std::transform(str.begin(), str.end(), str.begin(), [](unsigned char c) { return std::toupper(c); });
   return str;
 }
 } // namespace o2::framework
diff --git a/Framework/Core/test/test_AnalysisDataModel.cxx b/Framework/Core/test/test_AnalysisDataModel.cxx
@@ -31,7 +31,7 @@ DECLARE_SOA_COLUMN(D, d, float);
 
 DECLARE_SOA_TABLE(XY, "AOD", "XY", col::X, col::Y);
 DECLARE_SOA_TABLE(ZD, "AOD", "ZD", col::Z, col::D);
-}
+} // namespace o2::aod
 
 TEST_CASE("TestJoinedTablesContains")
 {
diff --git a/Framework/Core/test/test_TableSpawner.cxx b/Framework/Core/test/test_TableSpawner.cxx
@@ -26,13 +26,13 @@ namespace test
 DECLARE_SOA_COLUMN(X, x, float);
 DECLARE_SOA_COLUMN(Y, y, float);
 DECLARE_SOA_COLUMN(Z, z, float);
-DECLARE_SOA_EXPRESSION_COLUMN(Rsq, rsq, float, test::x * test::x + test::y * test::y + test::z * test::z);
-DECLARE_SOA_EXPRESSION_COLUMN(Sin, sin, float, test::x / nsqrt (test::x * test::x + test::y * test::y));
-}
+DECLARE_SOA_EXPRESSION_COLUMN(Rsq, rsq, float, test::x* test::x + test::y * test::y + test::z * test::z);
+DECLARE_SOA_EXPRESSION_COLUMN(Sin, sin, float, test::x / nsqrt(test::x * test::x + test::y * test::y));
+} // namespace test
 
 DECLARE_SOA_TABLE(Points, "AOD", "PTSNG", test::X, test::Y, test::Z);
 DECLARE_SOA_EXTENDED_TABLE(ExPoints, Points, "EXPTSNG", 0, test::Rsq, test::Sin);
-}
+} // namespace o2::aod
 
 TEST_CASE("TestTableSpawner")
 {
diff --git a/Framework/Foundation/include/Framework/Pack.h b/Framework/Foundation/include/Framework/Pack.h
@@ -226,21 +226,21 @@ inline constexpr bool has_type_conditional_v = has_type_conditional<Condition, T
 template <typename T, typename... Ts>
 consteval size_t has_type_at_v(pack<Ts...>)
 {
-    constexpr size_t size = sizeof...(Ts);
-    constexpr bool found[size] = { std::same_as<T, Ts> ... };
-    for (size_t i = 0; i < size; ++i) {
-      if (found[i]) {
-        return i;
-      }
+  constexpr size_t size = sizeof...(Ts);
+  constexpr bool found[size] = {std::same_as<T, Ts>...};
+  for (size_t i = 0; i < size; ++i) {
+    if (found[i]) {
+      return i;
     }
-    return size + 1;
+  }
+  return size + 1;
 }
 
 template <template <typename, typename> typename Condition, typename T, typename... Ts>
 consteval size_t has_type_at_conditional_v(pack<Ts...>)
 {
   constexpr size_t size = sizeof...(Ts);
-  constexpr bool found[size] = { Condition<T, Ts>::value ... };
+  constexpr bool found[size] = {Condition<T, Ts>::value...};
   for (size_t i = 0; i < size; ++i) {
     if (found[i]) {
       return i;
diff --git a/Framework/Foundation/include/Framework/Traits.h b/Framework/Foundation/include/Framework/Traits.h
@@ -33,7 +33,9 @@ inline constexpr bool is_specialization_v = is_specialization<T, Ref>::value;
 
 template <template <typename...> typename B, typename S>
 concept specialization = requires {
-  {[]<typename... Ts>(B<Ts...>*) -> B<Ts...> {}(std::declval<S*>())} -> std::same_as<S>;
+  {
+    []<typename... Ts>(B<Ts...>*) -> B<Ts...> {}(std::declval<S*>())
+  } -> std::same_as<S>;
 };
 
 template <typename A, typename B>
@@ -63,7 +65,7 @@ inline constexpr bool always_static_assert_v = always_static_assert<T...>::value
 
 template <template <typename...> typename B, typename D>
 concept base_of_template = requires {
-  []<typename... Ts>(B<Ts...>*){ }(std::declval<D*>());
+  []<typename... Ts>(B<Ts...>*) {}(std::declval<D*>());
 };
 
 template <template <typename...> typename B, typename D>

Original file line number	Diff line number	Diff line change
`@@ -466,7 +466,7 @@ struct ServiceManager<Service<T>> {`
`466`	`466`	`{`
`467`	`467`	`// FIXME: for the moment we only need endOfStream to be`
`468`	`468`	`// stateless. In the future we might want to pass it EndOfStreamContext`
`469`		`- if constexpr (requires (T t) { t.endOfStream(); }) {`
	`469`	`+ if constexpr (requires(T t) { t.endOfStream(); }) {`
`470`	`470`	`service.service->endOfStream();`
`471`	`471`	`return true;`
`472`	`472`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,8 +85,8 @@ struct AnalysisDataProcessorBuilder {`
`85`	`85`	`template <soa::with_sources T>`
`86`	`86`	`static inline auto getSources()`
`87`	`87`	`{`
`88`		`- return []<size_t N, std::array<soa::TableRef, N> refs>(){`
`89`		`- return []<size_t... Is>(std::index_sequence<Is...>){`
	`88`	`+ return []<size_t N, std::array<soa::TableRef, N> refs>() {`
	`89`	`+ return []<size_t... Is>(std::index_sequence<Is...>) {`
`90`	`90`	`return std::vector{soa::tableRef2ConfigParamSpec<refs[Is]>()...};`
`91`	`91`	`}(std::make_index_sequence<N>());`
`92`	`92`	`}.template operator()<T::sources.size(), T::sources>();`
`@@ -195,20 +195,20 @@ struct AnalysisDataProcessorBuilder {`
`195`	`195`	`template <soa::is_table T>`
`196`	`196`	`static auto extractFromRecord(InputRecord& record)`
`197`	`197`	`{`
`198`		`- return T{[&record]<size_t N, std::array<soa::TableRef, N> refs, size_t... Is>(std::index_sequence<Is...>){ return std::vector{extractTableFromRecord<refs[Is]>(record)...}; }.template operator()<T::originals.size(), T::originals>(std::make_index_sequence<T::originals.size()>())};`
	`198`	`+ return T { [&record]<size_t N, std::array<soa::TableRef, N> refs, size_t... Is>(std::index_sequence<Is...>) { return std::vector{extractTableFromRecord<refs[Is]>(record)...}; }.template operator()<T::originals.size(), T::originals>(std::make_index_sequence<T::originals.size()>()) };`
`199`	`199`	`}`
`200`	`200`
`201`	`201`	`template <soa::is_iterator T>`
`202`	`202`	`static auto extractFromRecord(InputRecord& record)`
`203`	`203`	`{`
`204`		`- return typename T::parent_t{[&record]<size_t N, std::array<soa::TableRef, N> refs, size_t... Is>(std::index_sequence<Is...>){ return std::vector{extractTableFromRecord<refs[Is]>(record)...}; }.template operator()<T::parent_t::originals.size(), T::parent_t::originals>(std::make_index_sequence<T::parent_t::originals.size()>())};`
	`204`	`+ return typename T::parent_t { [&record]<size_t N, std::array<soa::TableRef, N> refs, size_t... Is>(std::index_sequence<Is...>) { return std::vector{extractTableFromRecord<refs[Is]>(record)...}; }.template operator()<T::parent_t::originals.size(), T::parent_t::originals>(std::make_index_sequence<T::parent_t::originals.size()>()) };`
`205`	`205`	`}`
`206`	`206`
`207`	`207`	`template <soa::is_filtered T>`
`208`	`208`	`static auto extractFilteredFromRecord(InputRecord& record, ExpressionInfo& info)`
`209`	`209`	`{`
`210`	`210`	`std::shared_ptr<arrow::Table> table = nullptr;`
`211`		`- auto joiner = [&record]<size_t N, std::array<soa::TableRef, N> refs, size_t... Is>(std::index_sequence<Is...>){ return std::vector{extractTableFromRecord<refs[Is]>(record)...}; };`
	`211`	`+ auto joiner = [&record]<size_t N, std::array<soa::TableRef, N> refs, size_t... Is>(std::index_sequence<Is...>) { return std::vector{extractTableFromRecord<refs[Is]>(record)...}; };`
`212`	`212`	`if constexpr (soa::is_iterator<T>) {`
`213`	`213`	`table = o2::soa::ArrowHelpers::joinTables(joiner.template operator()<T::parent_t::originals.size(), T::parent_t::originals>(std::make_index_sequence<T::parent_t::originals.size()>()));`
`214`	`214`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -901,7 +901,8 @@ auto spawner(std::vector<std::shared_ptr<arrow::Table>>&& tables, const char* na`
`901`	`901`	`auto projectors = []<typename... C>(framework::pack<C...>) -> std::array<expressions::Projector, sizeof...(C)>`
`902`	`902`	`{`
`903`	`903`	`return {{std::move(C::Projector())...}};`
`904`		`- }(expression_pack_t{});`
	`904`	`+ }`
	`905`	`+ (expression_pack_t{});`
`905`	`906`
`906`	`907`	`return spawnerHelper(fullTable, new_schema, framework::pack_size(expression_pack_t{}), projectors.data(), fields, name);`
`907`	`908`	`}`
`@@ -911,14 +912,15 @@ auto spawner(std::shared_ptr<arrow::Table> const& fullTable, const char* name)`
`911`	`912`	`{`
`912`	`913`	`using expression_pack_t = typename o2::aod::MetadataTrait<D>::metadata::expression_pack_t;`
`913`	`914`	`if (fullTable->num_rows() == 0) {`
`914`		`- return makeEmptyTable(name,expression_pack_t{});`
	`915`	`+ return makeEmptyTable(name, expression_pack_t{});`
`915`	`916`	`}`
`916`	`917`	`static auto fields = o2::soa::createFieldsFromColumns(expression_pack_t{});`
`917`	`918`	`static auto new_schema = std::make_shared<arrow::Schema>(fields);`
`918`	`919`	`auto projectors = []<typename... C>(framework::pack<C...>) -> std::array<expressions::Projector, sizeof...(C)>`
`919`	`920`	`{`
`920`	`921`	`return {{std::move(C::Projector())...}};`
`921`		`- }(expression_pack_t{});`
	`922`	`+ }`
	`923`	`+ (expression_pack_t{});`
`922`	`924`
`923`	`925`	`return spawnerHelper(fullTable, new_schema, framework::pack_size(expression_pack_t{}), projectors.data(), fields, name);`
`924`	`926`	`}`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ std::shared_ptr<arrow::Table> ArrowHelpers::concatTables(std::vector<std::shared`
`115`	`115`
`116`	`116`	`arrow::ChunkedArray* getIndexFromLabel(arrow::Table* table, const char* label)`
`117`	`117`	`{`
`118`		`- auto field = std::find_if(table->schema()->fields().begin(), table->schema()->fields().end(), [&](std::shared_ptr<arrow::Field> const& f){`
	`118`	`+ auto field = std::find_if(table->schema()->fields().begin(), table->schema()->fields().end(), [&](std::shared_ptr<arrow::Field> const& f) {`
`119`	`119`	`return o2::framework::strToUpper(label) == o2::framework::strToUpper(std::string{f->name()});`
`120`	`120`	`});`
`121`	`121`	`if (field == table->schema()->fields().end()) {`
`@@ -155,7 +155,7 @@ std::string cutString(std::string&& str)`
`155`	`155`
`156`	`156`	`std::string strToUpper(std::string&& str)`
`157`	`157`	`{`
`158`		`- std::transform(str.begin(), str.end(), str.begin(), [](unsigned char c){ return std::toupper(c); });`
	`158`	`+ std::transform(str.begin(), str.end(), str.begin(), [](unsigned char c) { return std::toupper(c); });`
`159`	`159`	`return str;`
`160`	`160`	`}`
`161`	`161`	`} // namespace o2::framework`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ DECLARE_SOA_COLUMN(D, d, float);`
`31`	`31`
`32`	`32`	`DECLARE_SOA_TABLE(XY, "AOD", "XY", col::X, col::Y);`
`33`	`33`	`DECLARE_SOA_TABLE(ZD, "AOD", "ZD", col::Z, col::D);`
`34`		`-}`
	`34`	`+} // namespace o2::aod`
`35`	`35`
`36`	`36`	`TEST_CASE("TestJoinedTablesContains")`
`37`	`37`	`{`