From 0269632a16d6b25e8b21754517d38fec1ae55b45 Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Mon, 20 Jul 2026 08:48:09 +0000 Subject: [PATCH] Please consider the following formatting changes --- Framework/Core/include/Framework/ASoA.h | 67 +++++++------------ .../Core/include/Framework/AnalysisHelpers.h | 3 +- Framework/Core/include/Framework/Concepts.h | 11 ++- Framework/Core/src/ASoA.cxx | 5 +- 4 files changed, 30 insertions(+), 56 deletions(-) diff --git a/Framework/Core/include/Framework/ASoA.h b/Framework/Core/include/Framework/ASoA.h index 4ff52b3e70e4d..4af438802304a 100644 --- a/Framework/Core/include/Framework/ASoA.h +++ b/Framework/Core/include/Framework/ASoA.h @@ -230,8 +230,7 @@ static consteval int getIndexPosToKey_impl() /// Base type for table metadata template struct TableMetadata { - static constexpr void isTableMetadata() - {}; + static constexpr void isTableMetadata() {}; using columns = framework::pack; using persistent_columns_t = framework::selected_pack; using external_index_columns_t = framework::selected_pack; @@ -263,8 +262,7 @@ struct TableMetadata { template struct MetadataTrait { - static constexpr void isMetadataTrait() - {}; + static constexpr void isMetadataTrait() {}; using metadata = void; }; @@ -272,8 +270,7 @@ struct MetadataTrait { /// type signature template struct Hash { - static constexpr void isHash() - {}; + static constexpr void isHash() {}; static constexpr uint32_t hash = H; static constexpr char const* const str{""}; }; @@ -295,8 +292,7 @@ consteval auto filterForKey() #define O2HASH(_Str_) \ template <> \ struct Hash<_Str_ ""_h> { \ - static constexpr void isHash() \ - {}; \ + static constexpr void isHash() {}; \ static constexpr uint32_t hash = _Str_ ""_h; \ static constexpr char const* const str{_Str_}; \ }; @@ -305,10 +301,8 @@ consteval auto filterForKey() #define O2ORIGIN(_Str_) \ template <> \ struct Hash<_Str_ ""_h> { \ - static constexpr void isHash() \ - {}; \ - static constexpr void isOriginHash() \ - {}; \ + static constexpr void isHash() {}; \ + static constexpr void isOriginHash() {}; \ static constexpr header::DataOrigin origin{_Str_}; \ static constexpr uint32_t hash = _Str_ ""_h; \ static constexpr char const* const str{_Str_}; \ @@ -665,8 +659,7 @@ class ColumnIterator : ChunkingPolicy template struct Column { - static constexpr void isIteratableColumn() - {}; + static constexpr void isIteratableColumn() {}; using inherited_t = INHERIT; Column(ColumnIterator const& it) @@ -702,8 +695,7 @@ struct Column { /// method call. template struct DynamicColumn { - static constexpr void isDynamicColumn() - {}; + static constexpr void isDynamicColumn() {}; using inherited_t = INHERIT; static constexpr const char* const& columnLabel() { return INHERIT::mLabel; } @@ -711,8 +703,7 @@ struct DynamicColumn { template struct IndexColumn { - static constexpr void isEnumeratingColumn() - {}; + static constexpr void isEnumeratingColumn() {}; using inherited_t = INHERIT; static constexpr const uint32_t hash = 0; @@ -721,8 +712,7 @@ struct IndexColumn { template struct MarkerColumn { - static constexpr void isMarkingColumn() - {}; + static constexpr void isMarkingColumn() {}; using inherited_t = INHERIT; static constexpr const uint32_t hash = 0; @@ -832,8 +822,7 @@ struct IndexPolicyBase { }; struct RowViewSentinel { - static constexpr void isRowViewSentinel() - {}; + static constexpr void isRowViewSentinel() {}; int64_t const index; }; @@ -944,8 +933,7 @@ struct FilteredIndexPolicy : IndexPolicyBase { }; struct DefaultIndexPolicy : IndexPolicyBase { - static constexpr void isDefaultIndexPolicy() - {}; + static constexpr void isDefaultIndexPolicy() {}; /// Needed to be able to copy the policy DefaultIndexPolicy() = default; DefaultIndexPolicy(DefaultIndexPolicy&&) = default; @@ -1031,8 +1019,7 @@ struct ColumnDataHolder { template struct TableIterator : IP, C... { public: - static constexpr void isTableIterator() - {}; + static constexpr void isTableIterator() {}; using self_t = TableIterator; using policy_t = IP; using all_columns = framework::pack; @@ -1409,8 +1396,7 @@ namespace o2::framework { /// tracks origin in bindingKey matcher to handle the correct arguments struct PreslicePolicyBase { - static constexpr void isPreslicePolicy() - {}; + static constexpr void isPreslicePolicy() {}; const std::string binding; Entry bindingKey; @@ -1434,8 +1420,7 @@ struct PreslicePolicyGeneral : public PreslicePolicyBase { template struct PresliceBase : public Policy { - static constexpr void isPresliceContainer() - {}; + static constexpr void isPresliceContainer() {}; constexpr static bool optional = OPT; using target_t = T; using policy_t = Policy; @@ -1450,7 +1435,7 @@ struct PresliceBase : public Policy { { if constexpr (OPT) { if (Policy::isMissing()) { - return {nullptr, {0,0}}; + return {nullptr, {0, 0}}; } } return Policy::getSliceFor(value, input); @@ -1489,8 +1474,7 @@ using PresliceOptional = PresliceBase; /// /// preslices.perCol; struct PresliceGroup { - static constexpr void isPresliceGroup() - {}; + static constexpr void isPresliceGroup() {}; }; } // namespace o2::framework @@ -1703,8 +1687,7 @@ template ; using table_t = self_t; @@ -1912,7 +1895,7 @@ class Table using iterator_template = TableIteratorBase; template - using iterator_template_o = decltype([](){ + using iterator_template_o = decltype([]() { if constexpr (sizeof...(Ts) == 0) { return iterator_template{}; } else { @@ -3340,8 +3323,7 @@ namespace o2::soa { template struct Join : Table, o2::aod::Hash<"JOIN/0"_h>, o2::aod::Hash<"JOIN"_h>, Ts...> { - static constexpr void isJoin() - {}; + static constexpr void isJoin() {}; using base = Table, o2::aod::Hash<"JOIN/0"_h>, o2::aod::Hash<"JOIN"_h>, Ts...>; Join(std::vector&& tables) @@ -3503,8 +3485,7 @@ template class FilteredBase : public T { public: - static constexpr void isFilteredBase() - {}; + static constexpr void isFilteredBase() {}; using self_t = FilteredBase; using table_t = typename T::table_t; using T::originals; @@ -4028,8 +4009,7 @@ class Filtered> : public FilteredBase /// First index will be used by process() as the grouping template struct IndexTable : Table { - static constexpr void isIndexTable() - {}; + static constexpr void isIndexTable() {}; using self_t = IndexTable; using base_t = Table; using table_t = base_t; @@ -4073,8 +4053,7 @@ struct IndexTable : Table { template struct SmallGroupsBase : public Filtered { - static constexpr void isSmallGroups() - {}; + static constexpr void isSmallGroups() {}; static constexpr bool applyFilters = APPLY; SmallGroupsBase(std::vector&& tables, is_a_selection auto selection) diff --git a/Framework/Core/include/Framework/AnalysisHelpers.h b/Framework/Core/include/Framework/AnalysisHelpers.h index 7acdda13b1525..e4d9682b35302 100644 --- a/Framework/Core/include/Framework/AnalysisHelpers.h +++ b/Framework/Core/include/Framework/AnalysisHelpers.h @@ -645,8 +645,7 @@ struct Produces : WritingCursor { /// /// Notice the label MySetOfProduces is just a mnemonic and can be omitted. struct ProducesGroup { - static constexpr void isProducesGroup() - {}; + static constexpr void isProducesGroup() {}; }; /// Helper template for table transformations diff --git a/Framework/Core/include/Framework/Concepts.h b/Framework/Core/include/Framework/Concepts.h index e868b439bb286..fea40b25ff1ff 100644 --- a/Framework/Core/include/Framework/Concepts.h +++ b/Framework/Core/include/Framework/Concepts.h @@ -46,18 +46,16 @@ concept is_persistent_column = requires(C c) { c.isIteratableColumn(); }; /// 2. require self-index column template -concept is_self_index_column = requires(C c) -{ +concept is_self_index_column = requires(C c) { typename C::compatible_signature; - //requires aod::is_aod_hash; + // requires aod::is_aod_hash; typename C::self_index_t; requires std::same_as; }; /// 3. require bindable index column template -concept is_index_column = requires(C c) -{ +concept is_index_column = requires(C c) { typename C::binding_t; requires not_void; }; @@ -138,8 +136,7 @@ concept is_table_or_iterator = is_table || is_iterator; /// 10. require soa::IndexTable template -concept is_index_table = requires(T t) -{ +concept is_index_table = requires(T t) { t.isIndexTable(); }; diff --git a/Framework/Core/src/ASoA.cxx b/Framework/Core/src/ASoA.cxx index 605ab891bdacc..486783c39d18a 100644 --- a/Framework/Core/src/ASoA.cxx +++ b/Framework/Core/src/ASoA.cxx @@ -98,7 +98,7 @@ void canNotJoin(std::vector> const& tables, std::s template void IncompatibleRanges(std::vector const& tables, std::span labels) { - auto loc = std::ranges::adjacent_find(tables, [](auto const& l, auto const& r){ return l.range != r.range; }); + auto loc = std::ranges::adjacent_find(tables, [](auto const& l, auto const& r) { return l.range != r.range; }); if (loc != std::ranges::cend(tables)) { auto pos = std::distance(tables.begin(), loc); auto next = loc + 1; @@ -140,7 +140,7 @@ ArrowTableRef joinTablesImpl(std::ranges::input_range auto tables, std::span o2::soa::ArrowTableRef ArrowHelpers::joinTables(std::vector>&& tables) { std::vector refs; - std::ranges::transform(tables, std::back_inserter(refs),[](auto const& table){ return ArrowTableRef{table}; }); + std::ranges::transform(tables, std::back_inserter(refs), [](auto const& table) { return ArrowTableRef{table}; }); return joinTablesImpl(refs, std::span()); } @@ -207,7 +207,6 @@ o2::soa::ArrowTableRef ArrowHelpers::concatTables(std::vector(resultFields), columns)}; } - arrow::ChunkedArray* getIndexFromLabel(arrow::Table* table, std::string_view label) { // Take the exact-match common case first (string_view comparison checks length