Skip to content

Commit 4c49bf2

Browse files
alibuildalibuild
committed
Please consider the following formatting changes
1 parent 3987992 commit 4c49bf2

3 files changed

Lines changed: 26 additions & 51 deletions

File tree

‎Framework/Core/include/Framework/ASoA.h‎

Lines changed: 21 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,7 @@ static consteval int getIndexPosToKey_impl()
222222
/// Base type for table metadata
223223
template <typename D, typename... Cs>
224224
struct TableMetadata {
225-
static constexpr void isTableMetadata()
226-
{};
225+
static constexpr void isTableMetadata() {};
227226
using columns = framework::pack<Cs...>;
228227
using persistent_columns_t = framework::selected_pack<soa::is_persistent_column_t, Cs...>;
229228
using external_index_columns_t = framework::selected_pack<soa::is_external_index_t, Cs...>;
@@ -255,17 +254,15 @@ struct TableMetadata {
255254

256255
template <typename D>
257256
struct MetadataTrait {
258-
static constexpr void isMetadataTrait()
259-
{};
257+
static constexpr void isMetadataTrait() {};
260258
using metadata = void;
261259
};
262260

263261
/// Special struc to map the string hash back to the string and wrap a string literal into the
264262
/// type signature
265263
template <uint32_t H>
266264
struct Hash {
267-
static constexpr void isHash()
268-
{};
265+
static constexpr void isHash() {};
269266
static constexpr uint32_t hash = H;
270267
static constexpr char const* const str{""};
271268
};
@@ -287,8 +284,7 @@ consteval auto filterForKey()
287284
#define O2HASH(_Str_) \
288285
template <> \
289286
struct Hash<_Str_ ""_h> { \
290-
static constexpr void isHash() \
291-
{}; \
287+
static constexpr void isHash() {}; \
292288
static constexpr uint32_t hash = _Str_ ""_h; \
293289
static constexpr char const* const str{_Str_}; \
294290
};
@@ -297,10 +293,8 @@ consteval auto filterForKey()
297293
#define O2ORIGIN(_Str_) \
298294
template <> \
299295
struct Hash<_Str_ ""_h> { \
300-
static constexpr void isHash() \
301-
{}; \
302-
static constexpr void isOriginHash() \
303-
{}; \
296+
static constexpr void isHash() {}; \
297+
static constexpr void isOriginHash() {}; \
304298
static constexpr header::DataOrigin origin{_Str_}; \
305299
static constexpr uint32_t hash = _Str_ ""_h; \
306300
static constexpr char const* const str{_Str_}; \
@@ -663,8 +657,7 @@ class ColumnIterator : ChunkingPolicy
663657

664658
template <typename T, typename INHERIT>
665659
struct Column {
666-
static constexpr void isIteratableColumn()
667-
{};
660+
static constexpr void isIteratableColumn() {};
668661

669662
using inherited_t = INHERIT;
670663
Column(ColumnIterator<T> const& it)
@@ -700,17 +693,15 @@ struct Column {
700693
/// method call.
701694
template <typename F, typename INHERIT>
702695
struct DynamicColumn {
703-
static constexpr void isDynamicColumn()
704-
{};
696+
static constexpr void isDynamicColumn() {};
705697
using inherited_t = INHERIT;
706698

707699
static constexpr const char* const& columnLabel() { return INHERIT::mLabel; }
708700
};
709701

710702
template <typename INHERIT>
711703
struct IndexColumn {
712-
static constexpr void isEnumeratingColumn()
713-
{};
704+
static constexpr void isEnumeratingColumn() {};
714705
using inherited_t = INHERIT;
715706
static constexpr const uint32_t hash = 0;
716707

@@ -719,8 +710,7 @@ struct IndexColumn {
719710

720711
template <typename INHERIT>
721712
struct MarkerColumn {
722-
static constexpr void isMarkingColumn()
723-
{};
713+
static constexpr void isMarkingColumn() {};
724714
using inherited_t = INHERIT;
725715
static constexpr const uint32_t hash = 0;
726716

@@ -830,8 +820,7 @@ struct IndexPolicyBase {
830820
};
831821

832822
struct RowViewSentinel {
833-
static constexpr void isRowViewSentinel()
834-
{};
823+
static constexpr void isRowViewSentinel() {};
835824
int64_t const index;
836825
};
837826

@@ -942,8 +931,7 @@ struct FilteredIndexPolicy : IndexPolicyBase {
942931
};
943932

944933
struct DefaultIndexPolicy : IndexPolicyBase {
945-
static constexpr void isDefaultIndexPolicy()
946-
{};
934+
static constexpr void isDefaultIndexPolicy() {};
947935
/// Needed to be able to copy the policy
948936
DefaultIndexPolicy() = default;
949937
DefaultIndexPolicy(DefaultIndexPolicy&&) = default;
@@ -1029,8 +1017,7 @@ struct ColumnDataHolder {
10291017
template <typename D, typename O, typename IP, typename... C>
10301018
struct TableIterator : IP, C... {
10311019
public:
1032-
static constexpr void isTableIterator()
1033-
{};
1020+
static constexpr void isTableIterator() {};
10341021
using self_t = TableIterator<D, O, IP, C...>;
10351022
using policy_t = IP;
10361023
using all_columns = framework::pack<C...>;
@@ -1404,8 +1391,7 @@ namespace o2::framework
14041391
{
14051392
/// tracks origin in bindingKey matcher to handle the correct arguments
14061393
struct PreslicePolicyBase {
1407-
static constexpr void isPreslicePolicy()
1408-
{};
1394+
static constexpr void isPreslicePolicy() {};
14091395
const std::string binding;
14101396
Entry bindingKey;
14111397

@@ -1434,8 +1420,7 @@ struct PreslicePolicyGeneral : public PreslicePolicyBase {
14341420

14351421
template <soa::is_table T, is_preslice_policy Policy, bool OPT = false>
14361422
struct PresliceBase : public Policy {
1437-
static constexpr void isPresliceContainer()
1438-
{};
1423+
static constexpr void isPresliceContainer() {};
14391424
constexpr static bool optional = OPT;
14401425
using target_t = T;
14411426
using policy_t = Policy;
@@ -1489,8 +1474,7 @@ using PresliceOptional = PresliceBase<T, PreslicePolicySorted, true>;
14891474
///
14901475
/// preslices.perCol;
14911476
struct PresliceGroup {
1492-
static constexpr void isPresliceGroup()
1493-
{};
1477+
static constexpr void isPresliceGroup() {};
14941478
};
14951479
} // namespace o2::framework
14961480

@@ -1716,8 +1700,7 @@ template <aod::is_aod_hash L, aod::is_aod_hash D, aod::is_origin_hash O, typenam
17161700
class Table
17171701
{
17181702
public:
1719-
static constexpr void isSOATable()
1720-
{};
1703+
static constexpr void isSOATable() {};
17211704
static constexpr const auto ref = TableRef{L::hash, D::hash, O::hash, o2::aod::version(D::str)};
17221705
using self_t = Table<L, D, O, Ts...>;
17231706
using table_t = self_t;
@@ -3329,8 +3312,7 @@ namespace o2::soa
33293312
{
33303313
template <typename... Ts>
33313314
struct Join : Table<o2::aod::Hash<"JOIN"_h>, o2::aod::Hash<"JOIN/0"_h>, o2::aod::Hash<"JOIN"_h>, Ts...> {
3332-
static constexpr void isJoin()
3333-
{};
3315+
static constexpr void isJoin() {};
33343316
using base = Table<o2::aod::Hash<"JOIN"_h>, o2::aod::Hash<"JOIN/0"_h>, o2::aod::Hash<"JOIN"_h>, Ts...>;
33353317

33363318
Join(std::shared_ptr<arrow::Table>&& table, uint64_t offset = 0)
@@ -3484,8 +3466,7 @@ template <soa::is_table T>
34843466
class FilteredBase : public T
34853467
{
34863468
public:
3487-
static constexpr void isFilteredBase()
3488-
{};
3469+
static constexpr void isFilteredBase() {};
34893470
using self_t = FilteredBase<T>;
34903471
using table_t = typename T::table_t;
34913472
using T::originals;
@@ -4097,8 +4078,7 @@ class Filtered<Filtered<T>> : public FilteredBase<typename T::table_t>
40974078
/// First index will be used by process() as the grouping
40984079
template <typename L, typename D, typename O, typename Key, typename H, typename... Ts>
40994080
struct IndexTable : Table<L, D, O> {
4100-
static constexpr void isIndexTable()
4101-
{};
4081+
static constexpr void isIndexTable() {};
41024082
using self_t = IndexTable<L, D, O, Key, H, Ts...>;
41034083
using base_t = Table<L, D, O>;
41044084
using table_t = base_t;
@@ -4144,8 +4124,7 @@ struct IndexTable : Table<L, D, O> {
41444124

41454125
template <typename T, bool APPLY>
41464126
struct SmallGroupsBase : public Filtered<T> {
4147-
static constexpr void isSmallGroups()
4148-
{};
4127+
static constexpr void isSmallGroups() {};
41494128
static constexpr bool applyFilters = APPLY;
41504129
SmallGroupsBase(std::vector<std::shared_ptr<arrow::Table>>&& tables, gandiva::Selection const& selection, uint64_t offset = 0)
41514130
: Filtered<T>(std::move(tables), selection, offset) {}

‎Framework/Core/include/Framework/AnalysisHelpers.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -645,8 +645,7 @@ struct Produces : WritingCursor<T> {
645645
///
646646
/// Notice the label MySetOfProduces is just a mnemonic and can be omitted.
647647
struct ProducesGroup {
648-
static constexpr void isProducesGroup()
649-
{};
648+
static constexpr void isProducesGroup() {};
650649
};
651650

652651
/// Helper template for table transformations

‎Framework/Core/include/Framework/Concepts.h‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,18 +45,16 @@ concept is_persistent_column = requires(C c) { c.isIteratableColumn(); };
4545

4646
/// 2. require self-index column
4747
template <typename C>
48-
concept is_self_index_column = requires(C c)
49-
{
48+
concept is_self_index_column = requires(C c) {
5049
typename C::compatible_signature;
51-
//requires aod::is_aod_hash<typename C::compatible_signature>;
50+
// requires aod::is_aod_hash<typename C::compatible_signature>;
5251
typename C::self_index_t;
5352
requires std::same_as<typename C::self_index_t, std::true_type>;
5453
};
5554

5655
/// 3. require bindable index column
5756
template <typename C>
58-
concept is_index_column = requires(C c)
59-
{
57+
concept is_index_column = requires(C c) {
6058
typename C::binding_t;
6159
requires not_void<typename C::binding_t>;
6260
};
@@ -137,8 +135,7 @@ concept is_table_or_iterator = is_table<T> || is_iterator<T>;
137135

138136
/// 10. require soa::IndexTable
139137
template <typename T>
140-
concept is_index_table = requires(T t)
141-
{
138+
concept is_index_table = requires(T t) {
142139
t.isIndexTable();
143140
};
144141

0 commit comments

Comments
 (0)