Skip to content

Commit 55a1cda

Browse files
committed
Please consider the following formatting changes
1 parent 8294717 commit 55a1cda

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

Framework/Core/include/Framework/AnalysisTask.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ struct AnalysisDataProcessorBuilder {
166166
}
167167
/// 1. enumeration (must be the only argument)
168168
template <typename R, typename C, is_enumeration A>
169-
static void inputsFromArgs(R (C::*)(A), const char* /*name*/, bool /*value*/, std::vector<InputSpec>& inputs, std::vector<ExpressionInfo>&)//, Cache&, Cache&)
169+
static void inputsFromArgs(R (C::*)(A), const char* /*name*/, bool /*value*/, std::vector<InputSpec>& inputs, std::vector<ExpressionInfo>&) //, Cache&, Cache&)
170170
{
171171
std::vector<ConfigParamSpec> inputMetadata;
172172
// FIXME: for the moment we do not support begin, end and step.
@@ -175,7 +175,7 @@ struct AnalysisDataProcessorBuilder {
175175

176176
/// 2. 1st argument is an iterator
177177
template <typename R, typename C, soa::is_iterator A, soa::is_table... Args>
178-
static void inputsFromArgs(R (C::*)(A, Args...), const char* name, bool value, std::vector<InputSpec>& inputs, std::vector<ExpressionInfo>& eInfos)//, Cache& bk, Cache& bku)
178+
static void inputsFromArgs(R (C::*)(A, Args...), const char* name, bool value, std::vector<InputSpec>& inputs, std::vector<ExpressionInfo>& eInfos) //, Cache& bk, Cache& bku)
179179
requires(std::is_lvalue_reference_v<A> && (std::is_lvalue_reference_v<Args> && ...))
180180
{
181181
constexpr auto hash = o2::framework::TypeIdHelpers::uniqueId<R (C::*)(A, Args...)>();
@@ -184,7 +184,7 @@ struct AnalysisDataProcessorBuilder {
184184

185185
/// 3. generic case
186186
template <typename R, typename C, soa::is_table... Args>
187-
static void inputsFromArgs(R (C::*)(Args...), const char* name, bool value, std::vector<InputSpec>& inputs, std::vector<ExpressionInfo>& eInfos)//, Cache&, Cache&)
187+
static void inputsFromArgs(R (C::*)(Args...), const char* name, bool value, std::vector<InputSpec>& inputs, std::vector<ExpressionInfo>& eInfos) //, Cache&, Cache&)
188188
requires(std::is_lvalue_reference_v<Args> && ...)
189189
{
190190
constexpr auto hash = o2::framework::TypeIdHelpers::uniqueId<R (C::*)(Args...)>();
@@ -526,10 +526,10 @@ DataProcessorSpec adaptAnalysisTask(ConfigContext const& ctx, Args&&... args)
526526
AnalysisDataProcessorBuilder::inputsFromArgs(&T::process, "default", true, inputs, expressionInfos);
527527
}
528528
homogeneous_apply_refs(
529-
[name = name_str, &expressionInfos, &inputs](auto& x) mutable {
530-
// this pushes (argumentIndex, processHash, schemaPtr, nullptr) into expressionInfos for arguments that are Filtered/filtered_iterators
531-
return AnalysisDataProcessorBuilder::requestInputsFromArgs(x, name, inputs, expressionInfos);
532-
},
529+
[name = name_str, &expressionInfos, &inputs](auto& x) mutable {
530+
// this pushes (argumentIndex, processHash, schemaPtr, nullptr) into expressionInfos for arguments that are Filtered/filtered_iterators
531+
return AnalysisDataProcessorBuilder::requestInputsFromArgs(x, name, inputs, expressionInfos);
532+
},
533533
*task.get());
534534

535535
// request base tables for spawnable extended tables and indices to be built

Framework/Core/src/ArrowTableSlicingCache.cxx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ arrow::Status ArrowTableSlicingCache::updateCacheEntry(int pos, std::shared_ptr<
110110
counts[pos].reset();
111111
return arrow::Status::OK();
112112
}
113-
auto& [b,k,e] = bindingsKeys[pos];
113+
auto& [b, k, e] = bindingsKeys[pos];
114114
if (!e) {
115115
throw runtime_error_f("Disabled cache %s/%s update requested", b.c_str(), k.c_str());
116116
}
@@ -197,7 +197,7 @@ SliceInfoPtr ArrowTableSlicingCache::getCacheFor(Entry const& bindingKey) const
197197
if (!s) {
198198
throw runtime_error_f("%s/%s is found in unsorted cache", bindingKey.binding.c_str(), bindingKey.key.c_str());
199199
}
200-
if(!bindingsKeys[p].enabled) {
200+
if (!bindingsKeys[p].enabled) {
201201
throw runtime_error_f("Disabled cache %s/%s is requested", bindingKey.binding.c_str(), bindingKey.key.c_str());
202202
}
203203

@@ -210,7 +210,7 @@ SliceInfoUnsortedPtr ArrowTableSlicingCache::getCacheUnsortedFor(const Entry& bi
210210
if (s) {
211211
throw runtime_error_f("%s/%s is found in sorted cache", bindingKey.binding.c_str(), bindingKey.key.c_str());
212212
}
213-
if(!bindingsKeys[p].enabled) {
213+
if (!bindingsKeys[p].enabled) {
214214
throw runtime_error_f("Disabled unsorted cache %s/%s is requested", bindingKey.binding.c_str(), bindingKey.key.c_str());
215215
}
216216

0 commit comments

Comments
 (0)