From d548c7bf2503baa18e4adf09975b74ff8dcd3222 Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Tue, 25 Nov 2025 13:25:40 +0000 Subject: [PATCH] Please consider the following formatting changes --- .../AnalysisSupport/src/AODReaderHelpers.cxx | 3 +-- Framework/AnalysisSupport/src/AODReaderHelpers.h | 1 - Framework/Core/include/Framework/ASoA.h | 5 +++-- .../Core/include/Framework/AnalysisHelpers.h | 6 ++++-- Framework/Core/src/AnalysisHelpers.cxx | 3 ++- Framework/Core/src/ArrowSupport.cxx | 2 +- Framework/Core/src/IndexJSONHelpers.cxx | 15 +++++++++------ Framework/Core/src/WorkflowHelpers.cxx | 4 ++-- Framework/Core/test/test_IndexBuilder.cxx | 1 - 9 files changed, 22 insertions(+), 18 deletions(-) diff --git a/Framework/AnalysisSupport/src/AODReaderHelpers.cxx b/Framework/AnalysisSupport/src/AODReaderHelpers.cxx index a91aa52c05c80..40aa5a9537c7f 100644 --- a/Framework/AnalysisSupport/src/AODReaderHelpers.cxx +++ b/Framework/AnalysisSupport/src/AODReaderHelpers.cxx @@ -47,7 +47,7 @@ struct Buildable { std::stringstream iws(loc->defaultValue.get()); records = IndexJSONHelpers::read(iws); - loc = std::find_if(spec.metadata.begin(), spec.metadata.end(), [](ConfigParamSpec const& cps){ return cps.name.compare("index-exclusive") == 0; }); + loc = std::find_if(spec.metadata.begin(), spec.metadata.end(), [](ConfigParamSpec const& cps) { return cps.name.compare("index-exclusive") == 0; }); exclusive = loc->defaultValue.get(); for (auto const& r : records) { @@ -75,7 +75,6 @@ struct Buildable { version, nullptr}; } - }; } // namespace diff --git a/Framework/AnalysisSupport/src/AODReaderHelpers.h b/Framework/AnalysisSupport/src/AODReaderHelpers.h index 505bc95b863c0..197907ca3ccb1 100644 --- a/Framework/AnalysisSupport/src/AODReaderHelpers.h +++ b/Framework/AnalysisSupport/src/AODReaderHelpers.h @@ -18,7 +18,6 @@ namespace o2::framework::readers { - struct AODReaderHelpers { static AlgorithmSpec rootFileReaderCallback(); static AlgorithmSpec aodSpawnerCallback(ConfigContext const& ctx); diff --git a/Framework/Core/include/Framework/ASoA.h b/Framework/Core/include/Framework/ASoA.h index 6ec7fde930aa6..a30363605af36 100644 --- a/Framework/Core/include/Framework/ASoA.h +++ b/Framework/Core/include/Framework/ASoA.h @@ -217,7 +217,8 @@ using is_self_index_t = typename std::conditional_t, std namespace o2::aod { -namespace { +namespace +{ template map> static consteval int getIndexPosToKey_impl() { @@ -228,7 +229,7 @@ static consteval int getIndexPosToKey_impl() return -1; } } -} +} // namespace /// Base type for table metadata template diff --git a/Framework/Core/include/Framework/AnalysisHelpers.h b/Framework/Core/include/Framework/AnalysisHelpers.h index 2f5b5001d97d6..b973118abd417 100644 --- a/Framework/Core/include/Framework/AnalysisHelpers.h +++ b/Framework/Core/include/Framework/AnalysisHelpers.h @@ -263,8 +263,10 @@ inline constexpr auto getIndexMapping() } else { idx.emplace_back(o2::aod::label(), C::columnLabel(), getIndexKind(), pos); } - }.template operator()>(), ...); - }(std::make_index_sequence());; + }.template operator()>(), + ...); + }(std::make_index_sequence()); + ; return idx; } diff --git a/Framework/Core/src/AnalysisHelpers.cxx b/Framework/Core/src/AnalysisHelpers.cxx index b15bcec0516d3..b8e0348d5df9c 100644 --- a/Framework/Core/src/AnalysisHelpers.cxx +++ b/Framework/Core/src/AnalysisHelpers.cxx @@ -13,7 +13,8 @@ #include "ExpressionJSONHelpers.h" #include "IndexJSONHelpers.h" -namespace o2::soa { +namespace o2::soa +{ std::vector IndexBuilder::makeBuilders(std::vector>&& tables, std::vector const& records) { std::vector builders; diff --git a/Framework/Core/src/ArrowSupport.cxx b/Framework/Core/src/ArrowSupport.cxx index 98b0c07e55551..cf2d364027932 100644 --- a/Framework/Core/src/ArrowSupport.cxx +++ b/Framework/Core/src/ArrowSupport.cxx @@ -618,7 +618,7 @@ o2::framework::ServiceSpec ArrowSupport::arrowBackendSpec() builder->outputs.clear(); // replace AlgorithmSpec // FIXME: it should be made more generic, so it does not need replacement... - builder->algorithm = PluginManager::loadAlgorithmFromPlugin("O2FrameworkOnDemandTablesSupport", "IndexTableBuilder", ctx);//readers::AODReaderHelpers::indexBuilderCallback(ctx); + builder->algorithm = PluginManager::loadAlgorithmFromPlugin("O2FrameworkOnDemandTablesSupport", "IndexTableBuilder", ctx); // readers::AODReaderHelpers::indexBuilderCallback(ctx); AnalysisSupportHelpers::addMissingOutputsToBuilder(ac.requestedIDXs, ac.requestedAODs, ac.requestedDYNs, *builder); } diff --git a/Framework/Core/src/IndexJSONHelpers.cxx b/Framework/Core/src/IndexJSONHelpers.cxx index d18af7e43ddba..19ae94a4bcd4c 100644 --- a/Framework/Core/src/IndexJSONHelpers.cxx +++ b/Framework/Core/src/IndexJSONHelpers.cxx @@ -19,8 +19,10 @@ #include #include -namespace o2::framework { -namespace { +namespace o2::framework +{ +namespace +{ struct IndexRecordsReader : public rapidjson::BaseReaderHandler, IndexRecordsReader> { using Ch = rapidjson::UTF8<>::Ch; using SizeType = rapidjson::SizeType; @@ -179,7 +181,7 @@ struct IndexRecordsReader : public rapidjson::BaseReaderHandler IndexJSONHelpers::read(std::istream& s) { @@ -195,7 +197,8 @@ std::vector IndexJSONHelpers::read(std::istream& s) return irreader.records; } -namespace { +namespace +{ void writeRecords(rapidjson::Writer& w, std::vector& records) { for (auto& r : records) { @@ -211,7 +214,7 @@ void writeRecords(rapidjson::Writer& w, std::vector& irs) { @@ -224,4 +227,4 @@ void IndexJSONHelpers::write(std::ostream& o, std::vector& w.EndArray(); w.EndObject(); } -} +} // namespace o2::framework diff --git a/Framework/Core/src/WorkflowHelpers.cxx b/Framework/Core/src/WorkflowHelpers.cxx index 08660ebf5c3ad..61443f5f71616 100644 --- a/Framework/Core/src/WorkflowHelpers.cxx +++ b/Framework/Core/src/WorkflowHelpers.cxx @@ -415,7 +415,7 @@ void WorkflowHelpers::injectServiceDevices(WorkflowSpec& workflow, ConfigContext "internal-dpl-aod-index-builder", {}, {}, - PluginManager::loadAlgorithmFromPlugin("O2FrameworkOnDemandTablesSupport", "IndexTableBuilder", ctx),//readers::AODReaderHelpers::indexBuilderCallback(ctx), + PluginManager::loadAlgorithmFromPlugin("O2FrameworkOnDemandTablesSupport", "IndexTableBuilder", ctx), // readers::AODReaderHelpers::indexBuilderCallback(ctx), {}}; AnalysisSupportHelpers::addMissingOutputsToBuilder(ac.requestedIDXs, ac.requestedAODs, ac.requestedDYNs, indexBuilder); @@ -435,7 +435,7 @@ void WorkflowHelpers::injectServiceDevices(WorkflowSpec& workflow, ConfigContext "internal-dpl-aod-spawner", {}, {}, - PluginManager::loadAlgorithmFromPlugin("O2FrameworkOnDemandTablesSupport", "ExtendedTableSpawner", ctx),//readers::AODReaderHelpers::aodSpawnerCallback(ctx), + PluginManager::loadAlgorithmFromPlugin("O2FrameworkOnDemandTablesSupport", "ExtendedTableSpawner", ctx), // readers::AODReaderHelpers::aodSpawnerCallback(ctx), {}}; AnalysisSupportHelpers::addMissingOutputsToSpawner({}, ac.spawnerInputs, ac.requestedAODs, aodSpawner); diff --git a/Framework/Core/test/test_IndexBuilder.cxx b/Framework/Core/test/test_IndexBuilder.cxx index e34c5946ad55a..e357b1164af80 100644 --- a/Framework/Core/test/test_IndexBuilder.cxx +++ b/Framework/Core/test/test_IndexBuilder.cxx @@ -243,7 +243,6 @@ TEST_CASE("AdvancedIndexTables") } } - TEST_CASE("IndexRecordsSerialization") { auto map = getIndexMapping>::metadata>();