Skip to content
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.

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

DPL: move TableConsumer support out of line in general #13861

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions Framework/Core/include/Framework/AnalysisTask.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#ifndef FRAMEWORK_ANALYSIS_TASK_H_
#define FRAMEWORK_ANALYSIS_TASK_H_

#include "Framework/TableConsumer.h"
#include "Framework/AnalysisManagers.h"
#include "Framework/AlgorithmSpec.h"
#include "Framework/CallbackService.h"
Expand Down
22 changes: 13 additions & 9 deletions Framework/Core/include/Framework/InputRecord.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#include "Framework/DataRefUtils.h"
#include "Framework/InputRoute.h"
#include "Framework/TypeTraits.h"
#include "Framework/TableConsumer.h"
#include "Framework/Traits.h"
#include "Framework/RuntimeError.h"
#include "Framework/Logger.h"
Expand All @@ -40,6 +39,9 @@
namespace o2::framework
{

template <typename A>
concept TableConsumerLike = requires (A a) { a. asArrowTable(); };

// Wrapper class to get CCDB metadata
struct CCDBMetadataExtractor {
};
Expand Down Expand Up @@ -233,6 +235,16 @@ class InputRecord
return ref;
}

template <TableConsumerLike T, typename R>
decltype(auto) get(R binding, int part = 0) const
{
DataRef ref = getRef(binding, part);
// substitution for TableConsumer
// For the moment this is dummy, as it requires proper support to
// create the RDataSource from the arrow buffer.
auto data = reinterpret_cast<uint8_t const*>(ref.payload);
return std::make_unique<T>(data, DataRefUtils::getPayloadSize(ref));
}
/// Get the object of specified type T for the binding R.
/// If R is a string like object, we look up by name the InputSpec and
/// return the data associated to the given label.
Expand Down Expand Up @@ -272,14 +284,6 @@ class InputRecord
return reinterpret_cast<char const*>(ref.payload);

// implementation (d)
} else if constexpr (std::is_same<T, TableConsumer>::value) {
// substitution for TableConsumer
// For the moment this is dummy, as it requires proper support to
// create the RDataSource from the arrow buffer.
auto data = reinterpret_cast<uint8_t const*>(ref.payload);
return std::make_unique<TableConsumer>(data, DataRefUtils::getPayloadSize(ref));

// implementation (f)
} else if constexpr (is_span<T>::value) {
// substitution for span of messageable objects
// FIXME: there will be std::span in C++20
Expand Down
1 change: 1 addition & 0 deletions Framework/Core/src/AODReaderHelpers.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include "Framework/RawDeviceService.h"
#include "Framework/DataSpecUtils.h"
#include "Framework/SourceInfoHeader.h"
#include "Framework/TableConsumer.h"
#include "Framework/ChannelInfo.h"
#include "Framework/Logger.h"

Expand Down
1 change: 1 addition & 0 deletions Framework/Core/src/ArrowSupport.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include "Framework/DevicesManager.h"
#include "Framework/DeviceConfig.h"
#include "Framework/ServiceMetricsInfo.h"
#include "Framework/TableConsumer.h"
#include "WorkflowHelpers.h"
#include "Framework/WorkflowSpecNode.h"
#include "Framework/AnalysisSupportHelpers.h"
Expand Down
1 change: 1 addition & 0 deletions Framework/GUISupport/test/test_SimpleTracksED.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include "Framework/DataProcessorSpec.h"
#include "Framework/ParallelContext.h"
#include "Framework/runDataProcessing.h"
#include "Framework/TableConsumer.h"
#include "Framework/InputRecord.h"
#include "Framework/Logger.h"
#include "Framework/AnalysisDataModel.h"
Expand Down
Loading