Skip to content

Commit 7e7c221

Browse files
committed
[ntuple] Extract RNTupleComposer from RNTupleProcessor
The composition of RNTuples can also serve as the backend for other data loading interfaces, most notably `RDataSource`, which is fully separate from the processing interface offered by `RNTupleProcessor`. It therefore makes sense to split both components into their own class.
1 parent 40ae624 commit 7e7c221

12 files changed

Lines changed: 1939 additions & 1835 deletions

tree/ntuple/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ HEADERS
2727
ROOT/RNTupleAttrUtils.hxx
2828
ROOT/RNTupleAttrWriting.hxx
2929
ROOT/RNTupleDescriptor.hxx
30+
ROOT/RNTupleComposer.hxx
3031
ROOT/RNTupleFillContext.hxx
3132
ROOT/RNTupleFillStatus.hxx
3233
ROOT/RNTupleImtTaskScheduler.hxx
@@ -71,6 +72,7 @@ SOURCES
7172
src/RNTuple.cxx
7273
src/RNTupleAttrReading.cxx
7374
src/RNTupleAttrWriting.cxx
75+
src/RNTupleComposer.cxx
7476
src/RNTupleDescriptor.cxx
7577
src/RNTupleDescriptorFmt.cxx
7678
src/RNTupleFillContext.cxx
@@ -79,7 +81,6 @@ SOURCES
7981
src/RNTupleMetrics.cxx
8082
src/RNTupleModel.cxx
8183
src/RNTupleParallelWriter.cxx
82-
src/RNTupleProcessor.cxx
8384
src/RNTupleProcessorEntry.cxx
8485
src/RNTupleReader.cxx
8586
src/RNTupleSerialize.cxx

tree/ntuple/inc/ROOT/RNTupleComposer.hxx

Lines changed: 802 additions & 0 deletions
Large diffs are not rendered by default.

tree/ntuple/inc/ROOT/RNTupleProcessor.hxx

Lines changed: 21 additions & 783 deletions
Large diffs are not rendered by default.
Lines changed: 70 additions & 74 deletions
Large diffs are not rendered by default.

tree/ntuple/test/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ ROOT_ADD_GTEST(ntuple_multi_stream ntuple_multi_stream.cxx LIBRARIES ROOTNTuple)
5656
ROOT_ADD_GTEST(ntuple_packing ntuple_packing.cxx LIBRARIES ROOTNTuple)
5757
ROOT_ADD_GTEST(ntuple_pages ntuple_pages.cxx LIBRARIES ROOTNTuple)
5858
ROOT_ADD_GTEST(ntuple_print ntuple_print.cxx LIBRARIES ROOTNTuple CustomStruct)
59-
ROOT_ADD_GTEST(ntuple_processor ntuple_processor.cxx LIBRARIES ROOTNTuple)
60-
ROOT_ADD_GTEST(ntuple_processor_chain ntuple_processor_chain.cxx LIBRARIES ROOTNTuple)
61-
ROOT_ADD_GTEST(ntuple_processor_join ntuple_processor_join.cxx LIBRARIES ROOTNTuple)
59+
ROOT_ADD_GTEST(ntuple_composer ntuple_composer.cxx LIBRARIES ROOTNTuple)
60+
ROOT_ADD_GTEST(ntuple_composer_chain ntuple_composer_chain.cxx LIBRARIES ROOTNTuple)
61+
ROOT_ADD_GTEST(ntuple_composer_join ntuple_composer_join.cxx LIBRARIES ROOTNTuple)
6262
ROOT_ADD_GTEST(ntuple_project ntuple_project.cxx LIBRARIES ROOTNTuple)
6363
ROOT_ADD_GTEST(ntuple_modelext ntuple_modelext.cxx LIBRARIES ROOTNTuple MathCore CustomStruct)
6464
ROOT_ADD_GTEST(ntuple_serialize ntuple_serialize.cxx LIBRARIES ROOTNTuple)

0 commit comments

Comments
 (0)