Merge pull request #114 from alibuild/alibot-cleanup-14854

Author: aalkin

Framework/AnalysisSupport/src/AODReaderHelpers.cxx

@@ -47,7 +47,7 @@ struct Buildable {
     std::stringstream iws(loc->defaultValue.get<std::string>());
     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<bool>();
 
     for (auto const& r : records) {
@@ -75,7 +75,6 @@ struct Buildable {
       version,
       nullptr};
   }
-
 };
 
 } // namespace

Framework/AnalysisSupport/src/AODReaderHelpers.h

@@ -18,7 +18,6 @@
 namespace o2::framework::readers
 {
 
-
 struct AODReaderHelpers {
   static AlgorithmSpec rootFileReaderCallback();
   static AlgorithmSpec aodSpawnerCallback(ConfigContext const& ctx);

Framework/Core/include/Framework/ASoA.h

@@ -217,7 +217,8 @@ using is_self_index_t = typename std::conditional_t<is_self_index_column<C>, std
 
 namespace o2::aod
 {
-namespace {
+namespace
+{
 template <typename Key, size_t N, std::array<bool, N> map>
 static consteval int getIndexPosToKey_impl()
 {
@@ -228,7 +229,7 @@ static consteval int getIndexPosToKey_impl()
     return -1;
   }
 }
-}
+} // namespace
 
 /// Base type for table metadata
 template <typename D, typename... Cs>

Framework/Core/include/Framework/AnalysisHelpers.h

@@ -263,8 +263,10 @@ inline constexpr auto getIndexMapping()
       } else {
         idx.emplace_back(o2::aod::label<ref>(), C::columnLabel(), getIndexKind<typename C::type>(), pos);
       }
-    }.template operator()<refs[Is], typename framework::pack_element_t<Is, indices>>(), ...);
-  }(std::make_index_sequence<framework::pack_size(indices{})>());;
+    }.template operator()<refs[Is], typename framework::pack_element_t<Is, indices>>(),
+     ...);
+  }(std::make_index_sequence<framework::pack_size(indices{})>());
+  ;
   return idx;
 }
 

Framework/Core/src/AnalysisHelpers.cxx

@@ -13,7 +13,8 @@
 #include "ExpressionJSONHelpers.h"
 #include "IndexJSONHelpers.h"
 
-namespace o2::soa {
+namespace o2::soa
+{
 std::vector<framework::IndexColumnBuilder> IndexBuilder::makeBuilders(std::vector<std::shared_ptr<arrow::Table>>&& tables, std::vector<soa::IndexRecord> const& records)
 {
   std::vector<framework::IndexColumnBuilder> builders;

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);
       }
 

Framework/Core/src/IndexJSONHelpers.cxx

@@ -19,8 +19,10 @@
 #include <stack>
 #include <iostream>
 
-namespace o2::framework {
-namespace {
+namespace o2::framework
+{
+namespace
+{
 struct IndexRecordsReader : public rapidjson::BaseReaderHandler<rapidjson::UTF8<>, IndexRecordsReader> {
   using Ch = rapidjson::UTF8<>::Ch;
   using SizeType = rapidjson::SizeType;
@@ -179,7 +181,7 @@ struct IndexRecordsReader : public rapidjson::BaseReaderHandler<rapidjson::UTF8<
     return false;
   }
 };
-}
+} // namespace
 
 std::vector<o2::soa::IndexRecord> IndexJSONHelpers::read(std::istream& s)
 {
@@ -195,7 +197,8 @@ std::vector<o2::soa::IndexRecord> IndexJSONHelpers::read(std::istream& s)
   return irreader.records;
 }
 
-namespace {
+namespace
+{
 void writeRecords(rapidjson::Writer<rapidjson::OStreamWrapper>& w, std::vector<o2::soa::IndexRecord>& records)
 {
   for (auto& r : records) {
@@ -211,7 +214,7 @@ void writeRecords(rapidjson::Writer<rapidjson::OStreamWrapper>& w, std::vector<o
     w.EndObject();
   }
 }
-}
+} // namespace
 
 void IndexJSONHelpers::write(std::ostream& o, std::vector<o2::soa::IndexRecord>& irs)
 {
@@ -224,4 +227,4 @@ void IndexJSONHelpers::write(std::ostream& o, std::vector<o2::soa::IndexRecord>&
   w.EndArray();
   w.EndObject();
 }
-}
+} // namespace o2::framework

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);
 

Framework/Core/test/test_IndexBuilder.cxx

@@ -243,7 +243,6 @@ TEST_CASE("AdvancedIndexTables")
   }
 }
 
-
 TEST_CASE("IndexRecordsSerialization")
 {
   auto map = getIndexMapping<o2::aod::MetadataTrait<o2::aod::Hash<"Index1/0"_h>>::metadata>();