Skip to content

DPL: decouple DataAllocator from TableBuilder #2983

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
ktf merged 1 commit into from
Feb 21, 2020
Merged

DPL: decouple DataAllocator from TableBuilder #2983

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
1 change: 1 addition & 0 deletions Framework/Core/include/Framework/AODReaderHelpers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#ifndef o2_framework_readers_AODReaderHelpers_INCLUDED_H
#define o2_framework_readers_AODReaderHelpers_INCLUDED_H

#include "Framework/TableBuilder.h"
#include "Framework/AlgorithmSpec.h"

namespace o2
Expand Down
13 changes: 8 additions & 5 deletions Framework/Core/include/Framework/DataAllocator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include "Framework/TypeTraits.h"
#include "Framework/Traits.h"
#include "Framework/SerializationMethods.h"
#include "Framework/TableBuilder.h"
#include "Framework/FunctionalHelpers.h"

#include "Headers/DataHeader.h"
#include <TClass.h>
Expand Down Expand Up @@ -130,9 +130,12 @@ class DataAllocator
std::string* s = new std::string(args...);
adopt(spec, s);
return *s;
} else if constexpr (std::is_base_of_v<TableBuilder, T>) {
TableBuilder* tb = new TableBuilder(args...);
adopt(spec, tb);
} else if constexpr (std::is_base_of_v<struct TableBuilder, T>) {
TableBuilder* tb = nullptr;
call_if_defined<struct TableBuilder>([&](auto* p) {
tb = new std::decay_t<decltype(*p)>(args...);
adopt(spec, tb);
});
return *tb;
} else if constexpr (sizeof...(Args) == 0) {
if constexpr (is_messageable<T>::value == true) {
Expand Down Expand Up @@ -189,7 +192,7 @@ class DataAllocator
/// Adopt a TableBuilder in the framework and serialise / send
/// it as an Arrow table to all consumers of @a spec once done
void
adopt(const Output& spec, TableBuilder*);
adopt(const Output& spec, struct TableBuilder*);

/// Adopt a raw buffer in the framework and serialize / send
/// it to the consumers of @a spec once done.
Expand Down
1 change: 1 addition & 0 deletions Framework/Core/include/Framework/TableTreeHelpers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include "TFile.h"
#include "TTreeReader.h"
#include "TTreeReaderValue.h"
#include "TableBuilder.h"

// =============================================================================
namespace o2
Expand Down
1 change: 1 addition & 0 deletions Framework/Core/src/CommonDataProcessors.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include "Framework/DataDescriptorMatcher.h"
#include "Framework/DataProcessorSpec.h"
#include "Framework/DataSpecUtils.h"
#include "Framework/TableBuilder.h"
#include "Framework/EndOfStreamContext.h"
#include "Framework/InitContext.h"
#include "Framework/InputSpec.h"
Expand Down
1 change: 1 addition & 0 deletions Framework/Core/src/DataAllocator.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.
#include "Framework/CompilerBuiltins.h"
#include "Framework/TableBuilder.h"
#include "Framework/DataAllocator.h"
#include "Framework/MessageContext.h"
#include "Framework/ArrowContext.h"
Expand Down
1 change: 1 addition & 0 deletions Framework/TestWorkflows/src/o2AODDummy.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
// In applying this license CERN does not waive the privileges and immunities
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.
#include "Framework/TableBuilder.h"
#include "Framework/runDataProcessing.h"

#include <ROOT/RDataFrame.hxx>
Expand Down