Skip to content

Commit 80ffecd

Browse files
committed
[df] Remove unused RLoopManager::AddTreeColumnReader
Since commit e220255 ("[df] Always process TTree via its RDataSource") earlier this year.
1 parent 147b686 commit 80ffecd

File tree

2 files changed

+0
-18
lines changed

2 files changed

+0
-18
lines changed

tree/dataframe/inc/ROOT/RDF/RLoopManager.hxx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,8 +245,6 @@ public:
245245
bool HasDataSourceColumnReaders(std::string_view col, const std::type_info &ti) const;
246246
void AddDataSourceColumnReaders(std::string_view col, std::vector<std::unique_ptr<RColumnReaderBase>> &&readers,
247247
const std::type_info &ti);
248-
RColumnReaderBase *AddTreeColumnReader(unsigned int slot, std::string_view col,
249-
std::unique_ptr<RColumnReaderBase> &&reader, const std::type_info &ti);
250248
RColumnReaderBase *GetDatasetColumnReader(unsigned int slot, std::string_view col, const std::type_info &ti) const;
251249
RColumnReaderBase *AddDataSourceColumnReader(unsigned int slot, std::string_view col, const std::type_info &ti,
252250
TTreeReader *treeReader);

tree/dataframe/src/RLoopManager.cxx

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1012,22 +1012,6 @@ void RLoopManager::AddDataSourceColumnReaders(std::string_view col,
10121012
}
10131013
}
10141014

1015-
// Differently from AddDataSourceColumnReaders, this can be called from multiple threads concurrently
1016-
/// \brief Register a new RTreeColumnReader with this RLoopManager.
1017-
/// \return A shared pointer to the inserted column reader.
1018-
RColumnReaderBase *RLoopManager::AddTreeColumnReader(unsigned int slot, std::string_view col,
1019-
std::unique_ptr<RColumnReaderBase> &&reader,
1020-
const std::type_info &ti)
1021-
{
1022-
auto &readers = fDatasetColumnReaders[slot];
1023-
const auto key = MakeDatasetColReadersKey(col, ti);
1024-
// if a reader for this column and this slot was already there, we are doing something wrong
1025-
assert(readers.find(key) == readers.end() || readers[key] == nullptr);
1026-
auto *rptr = reader.get();
1027-
readers[key] = std::move(reader);
1028-
return rptr;
1029-
}
1030-
10311015
RColumnReaderBase *RLoopManager::AddDataSourceColumnReader(unsigned int slot, std::string_view col,
10321016
const std::type_info &ti, TTreeReader *treeReader)
10331017
{

0 commit comments

Comments
 (0)