Skip to content

Commit b6bfa41

Browse files
aalkinaalkin
authored
Merge pull request #124 from alibuild/alibot-cleanup-14975
2 parents 383912b + 44f6882 commit b6bfa41

File tree

5 files changed

+32
-32
lines changed

5 files changed

+32
-32
lines changed

‎Framework/AnalysisSupport/src/AODReaderHelpers.cxx‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ struct Buildable {
5959
outputSchema = std::make_shared<arrow::Schema>([](std::vector<o2::soa::IndexRecord> const& recs) {
6060
std::vector<std::shared_ptr<arrow::Field>> fields;
6161
fields.reserve(recs.size());
62-
std::ranges::transform(recs, std::back_inserter(fields), [](auto& r){ return r.field(); });
62+
std::ranges::transform(recs, std::back_inserter(fields), [](auto& r) { return r.field(); });
6363
return fields;
6464
}(records))
6565
->WithMetadata(std::make_shared<arrow::KeyValueMetadata>(std::vector{std::string{"label"}}, std::vector{std::string{binding}}));
@@ -88,10 +88,10 @@ AlgorithmSpec AODReaderHelpers::indexBuilderCallback(ConfigContext const& /*ctx*
8888
auto const& requested = ic.services().get<DanglingEdgesContext>().requestedIDXs;
8989
std::vector<Builder> builders;
9090
builders.reserve(requested.size());
91-
std::ranges::transform(requested, std::back_inserter(builders), [](auto const& i){ return Buildable{i}.createBuilder(); });
91+
std::ranges::transform(requested, std::back_inserter(builders), [](auto const& i) { return Buildable{i}.createBuilder(); });
9292
return [builders](ProcessingContext& pc) mutable {
9393
auto outputs = pc.outputs();
94-
std::ranges::for_each(builders, [&pc, &outputs](auto& builder){ outputs.adopt(Output{builder.origin, builder.description, builder.version}, builder.materialize(pc)); });
94+
std::ranges::for_each(builders, [&pc, &outputs](auto& builder) { outputs.adopt(Output{builder.origin, builder.description, builder.version}, builder.materialize(pc)); });
9595
};
9696
}};
9797
}
@@ -140,14 +140,13 @@ struct Spawnable {
140140
views::filter_string_params_starts_with("input:") |
141141
std::ranges::views::transform(
142142
[](auto const& param) {
143-
return DataSpecUtils::fromMetadataString(param.defaultValue.template get<std::string>());
144-
}),
145-
std::back_inserter(matchers), [](auto const& i){ return std::get<ConcreteDataMatcher>(i.matcher); });
146-
143+
return DataSpecUtils::fromMetadataString(param.defaultValue.template get<std::string>());
144+
}),
145+
std::back_inserter(matchers), [](auto const& i) { return std::get<ConcreteDataMatcher>(i.matcher); });
147146

148147
std::vector<std::shared_ptr<arrow::Field>> fields;
149148
std::ranges::for_each(schemas,
150-
[&fields](auto const& s){
149+
[&fields](auto const& s) {
151150
std::ranges::copy(s->fields(), std::back_inserter(fields));
152151
});
153152

@@ -192,10 +191,10 @@ AlgorithmSpec AODReaderHelpers::aodSpawnerCallback(ConfigContext const& /*ctx*/)
192191
auto const& requested = ic.services().get<DanglingEdgesContext>().spawnerInputs;
193192
std::vector<Spawner> spawners;
194193
spawners.reserve(requested.size());
195-
std::ranges::transform(requested, std::back_inserter(spawners), [](auto const& i){ return Spawnable{i}.createMaker(); });
194+
std::ranges::transform(requested, std::back_inserter(spawners), [](auto const& i) { return Spawnable{i}.createMaker(); });
196195
return [spawners](ProcessingContext& pc) mutable {
197196
auto outputs = pc.outputs();
198-
std::ranges::for_each(spawners, [&pc, &outputs](auto& spawner){ outputs.adopt(Output{spawner.origin, spawner.description, spawner.version}, spawner.materialize(pc)); });
197+
std::ranges::for_each(spawners, [&pc, &outputs](auto& spawner) { outputs.adopt(Output{spawner.origin, spawner.description, spawner.version}, spawner.materialize(pc)); });
199198
};
200199
}};
201200
}

‎Framework/Core/src/ASoA.cxx‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ SelectionVector sliceSelection(std::span<int64_t const> const& mSelectedRows, in
6363
auto stop_iterator = std::lower_bound(start_iterator, mSelectedRows.end(), end);
6464
SelectionVector slicedSelection{start_iterator, stop_iterator};
6565
std::ranges::transform(slicedSelection.begin(), slicedSelection.end(), slicedSelection.begin(),
66-
[&start](int64_t idx) {
67-
return idx - static_cast<int64_t>(start);
68-
});
66+
[&start](int64_t idx) {
67+
return idx - static_cast<int64_t>(start);
68+
});
6969
return slicedSelection;
7070
}
7171

@@ -74,7 +74,7 @@ std::shared_ptr<arrow::Table> ArrowHelpers::joinTables(std::vector<std::shared_p
7474
std::vector<std::shared_ptr<arrow::Field>> fields;
7575
std::vector<std::shared_ptr<arrow::ChunkedArray>> columns;
7676
bool notEmpty = (tables[0]->num_rows() != 0);
77-
std::ranges::for_each(tables, [&fields, &columns, notEmpty](auto const& t){
77+
std::ranges::for_each(tables, [&fields, &columns, notEmpty](auto const& t) {
7878
std::ranges::copy(t->fields(), std::back_inserter(fields));
7979
if (notEmpty) {
8080
std::ranges::copy(t->columns(), std::back_inserter(columns));
@@ -84,7 +84,8 @@ std::shared_ptr<arrow::Table> ArrowHelpers::joinTables(std::vector<std::shared_p
8484
return arrow::Table::Make(schema, columns);
8585
}
8686

87-
namespace {
87+
namespace
88+
{
8889
template <typename T>
8990
requires(std::same_as<T, std::string>)
9091
auto makeString(T const& str)
@@ -108,7 +109,7 @@ void canNotJoin(std::vector<std::shared_ptr<arrow::Table>> const& tables, std::s
108109
}
109110
}
110111
}
111-
}
112+
} // namespace
112113

113114
std::shared_ptr<arrow::Table> ArrowHelpers::joinTables(std::vector<std::shared_ptr<arrow::Table>>&& tables, std::span<const char* const> labels)
114115
{

‎Framework/Core/src/AnalysisHelpers.cxx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,13 @@ std::shared_ptr<arrow::Table> IndexBuilder::materialize(std::vector<framework::I
6565

6666
if (!exclusive || found) {
6767
builders[0].fill(counter);
68-
std::ranges::for_each(builders.begin() + 1, builders.end(), [&idx](auto& builder){ builder.fill(idx); });
68+
std::ranges::for_each(builders.begin() + 1, builders.end(), [&idx](auto& builder) { builder.fill(idx); });
6969
}
7070
}
7171

7272
std::vector<std::shared_ptr<arrow::ChunkedArray>> arrays;
7373
arrays.reserve(builders.size());
74-
std::ranges::transform(builders, std::back_inserter(arrays), [](auto& builder){ return builder.result(); });
74+
std::ranges::transform(builders, std::back_inserter(arrays), [](auto& builder) { return builder.result(); });
7575

7676
return arrow::Table::Make(schema, arrays);
7777
}
@@ -130,7 +130,7 @@ std::shared_ptr<arrow::Table> spawnerHelper(std::shared_ptr<arrow::Table> const&
130130
}
131131

132132
arrays.reserve(nColumns);
133-
std::ranges::transform(chunks, std::back_inserter(arrays), [](auto&& chunk){ return std::make_shared<arrow::ChunkedArray>(chunk); });
133+
std::ranges::transform(chunks, std::back_inserter(arrays), [](auto&& chunk) { return std::make_shared<arrow::ChunkedArray>(chunk); });
134134

135135
return arrow::Table::Make(newSchema, arrays);
136136
}
@@ -175,7 +175,7 @@ std::vector<std::shared_ptr<arrow::Table>> extractSources(ProcessingContext& pc,
175175
{
176176
std::vector<std::shared_ptr<arrow::Table>> tables;
177177
tables.reserve(matchers.size());
178-
std::ranges::transform(matchers, std::back_inserter(tables), [&pc](auto const& matcher){ return pc.inputs().get<TableConsumer>(matcher)->asArrowTable(); });
178+
std::ranges::transform(matchers, std::back_inserter(tables), [&pc](auto const& matcher) { return pc.inputs().get<TableConsumer>(matcher)->asArrowTable(); });
179179
return tables;
180180
}
181181

‎Framework/Core/src/ArrowSupport.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ o2::framework::ServiceSpec ArrowSupport::arrowBackendSpec()
531531
dh->dataOrigin.str, dh->dataDescription.str);
532532
continue;
533533
}
534-
bool forwarded = std::ranges::any_of(ctx.services().get<DeviceSpec const>().forwards, [&dh](auto const& forward){ return DataSpecUtils::match(forward.matcher, *dh); });
534+
bool forwarded = std::ranges::any_of(ctx.services().get<DeviceSpec const>().forwards, [&dh](auto const& forward) { return DataSpecUtils::match(forward.matcher, *dh); });
535535
if (forwarded) {
536536
O2_SIGNPOST_EVENT_EMIT(rate_limiting, sid, "offer",
537537
"Message %{public}.4s/%{public}.16s is forwarded so we are not returning its memory.",

‎Framework/Core/src/WorkflowHelpers.cxx‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -440,21 +440,21 @@ void WorkflowHelpers::injectServiceDevices(WorkflowSpec& workflow, ConfigContext
440440
// Check if any of the provided outputs is a DISTSTF
441441
// Check if any of the requested inputs is for a 0xccdb message
442442
bool providesDISTSTF = std::ranges::any_of(workflow,
443-
[&matcher](auto const& dp) {
444-
return std::any_of(dp.outputs.begin(), dp.outputs.end(), [&matcher](auto const& output) {
445-
return DataSpecUtils::match(matcher, output);
446-
});
447-
});
443+
[&matcher](auto const& dp) {
444+
return std::any_of(dp.outputs.begin(), dp.outputs.end(), [&matcher](auto const& output) {
445+
return DataSpecUtils::match(matcher, output);
446+
});
447+
});
448448

449449
// If there is no CCDB requested, but we still ask for a FLP/DISTSUBTIMEFRAME/0xccdb
450450
// we add to the first data processor which has no inputs (apart from
451451
// enumerations / timers) the responsibility to provide the DISTSUBTIMEFRAME
452452
bool requiresDISTSUBTIMEFRAME = std::ranges::any_of(workflow,
453-
[&dstf](auto const& dp) {
454-
return std::any_of(dp.inputs.begin(), dp.inputs.end(), [&dstf](auto const& input) {
455-
return DataSpecUtils::match(input, dstf);
456-
});
457-
});
453+
[&dstf](auto const& dp) {
454+
return std::any_of(dp.inputs.begin(), dp.inputs.end(), [&dstf](auto const& input) {
455+
return DataSpecUtils::match(input, dstf);
456+
});
457+
});
458458

459459
// We find the first device which has either just enumerations or
460460
// just timers, and we will add the DISTSUBTIMEFRAME to it.
@@ -694,7 +694,7 @@ void WorkflowHelpers::adjustTopology(WorkflowSpec& workflow, ConfigContext const
694694

695695
if (distSTFCount > 0) {
696696
for (auto& spec : workflow) {
697-
if (std::ranges::any_of(spec.outputs, [](auto const& output){ return DataSpecUtils::match(output, ConcreteDataMatcher{"FLP", "DISTSUBTIMEFRAME", 0}); })) {
697+
if (std::ranges::any_of(spec.outputs, [](auto const& output) { return DataSpecUtils::match(output, ConcreteDataMatcher{"FLP", "DISTSUBTIMEFRAME", 0}); })) {
698698
for (unsigned int i = 1; i < distSTFCount; ++i) {
699699
spec.outputs.emplace_back(OutputSpec{ConcreteDataMatcher{"FLP", "DISTSUBTIMEFRAME", i}, Lifetime::Timeframe});
700700
}

0 commit comments

Comments
 (0)