Skip to content

Please consider the following formatting changes to #14257 #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aalkin merged 1 commit into from
May 9, 2025
Merged

Please consider the following formatting changes to #14257 #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Framework/Core/include/Framework/AnalysisTask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ struct AnalysisDataProcessorBuilder {
}
/// 1. enumeration (must be the only argument)
template <typename R, typename C, is_enumeration A>
static void inputsFromArgs(R (C::*)(A), const char* /*name*/, bool /*value*/, std::vector<InputSpec>& inputs, std::vector<ExpressionInfo>&)//, Cache&, Cache&)
static void inputsFromArgs(R (C::*)(A), const char* /*name*/, bool /*value*/, std::vector<InputSpec>& inputs, std::vector<ExpressionInfo>&) //, Cache&, Cache&)
{
std::vector<ConfigParamSpec> inputMetadata;
// FIXME: for the moment we do not support begin, end and step.
Expand All @@ -175,7 +175,7 @@ struct AnalysisDataProcessorBuilder {

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

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

// request base tables for spawnable extended tables and indices to be built
Expand Down
6 changes: 3 additions & 3 deletions Framework/Core/src/ArrowTableSlicingCache.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ arrow::Status ArrowTableSlicingCache::updateCacheEntry(int pos, std::shared_ptr<
counts[pos].reset();
return arrow::Status::OK();
}
auto& [b,k,e] = bindingsKeys[pos];
auto& [b, k, e] = bindingsKeys[pos];
if (!e) {
throw runtime_error_f("Disabled cache %s/%s update requested", b.c_str(), k.c_str());
}
Expand Down Expand Up @@ -197,7 +197,7 @@ SliceInfoPtr ArrowTableSlicingCache::getCacheFor(Entry const& bindingKey) const
if (!s) {
throw runtime_error_f("%s/%s is found in unsorted cache", bindingKey.binding.c_str(), bindingKey.key.c_str());
}
if(!bindingsKeys[p].enabled) {
if (!bindingsKeys[p].enabled) {
throw runtime_error_f("Disabled cache %s/%s is requested", bindingKey.binding.c_str(), bindingKey.key.c_str());
}

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

Expand Down