Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

DPL: avoid copying shared pointers while reading #4462

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
Sep 29, 2020
Merged

DPL: avoid copying shared pointers while reading #4462

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
2 changes: 1 addition & 1 deletion 2 Framework/Core/include/Framework/TableTreeHelpers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ class TreeToTable
TTreeReader* mTreeReader;

// a list of ColumnIterator*
std::vector<std::shared_ptr<ColumnIterator>> mColumnIterators;
std::vector<std::unique_ptr<ColumnIterator>> mColumnIterators;

// Append next set of branch values to the
// corresponding table columns
Expand Down
10 changes: 5 additions & 5 deletions 10 Framework/Core/src/TableTreeHelpers.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -738,7 +738,7 @@ TreeToTable::~TreeToTable()

bool TreeToTable::addColumn(const char* colname)
{
auto colit = std::make_shared<ColumnIterator>(mTreeReader, colname);
auto colit = std::make_unique<ColumnIterator>(mTreeReader, colname);
auto stat = colit->getStatus();
if (stat) {
mColumnIterators.push_back(std::move(colit));
Expand All @@ -763,7 +763,7 @@ bool TreeToTable::addAllColumns()
auto br = (TBranch*)branchList->At(ii);

// IMPROVE: make sure that a column is not added more than one time
auto colit = std::make_shared<ColumnIterator>(mTreeReader, br->GetName());
auto colit = std::make_unique<ColumnIterator>(mTreeReader, br->GetName());
if (colit->getStatus()) {
mColumnIterators.push_back(std::move(colit));
} else {
Expand All @@ -776,14 +776,14 @@ bool TreeToTable::addAllColumns()

void TreeToTable::push()
{
for (auto colit : mColumnIterators) {
for (auto&& colit : mColumnIterators) {
colit->push();
}
}

void TreeToTable::reserve(size_t s)
{
for (auto column : mColumnIterators) {
for (auto&& column : mColumnIterators) {
column->reserve(s);
}
}
Expand All @@ -805,7 +805,7 @@ std::shared_ptr<arrow::Table> TreeToTable::finalize()
// prepare the elements needed to create the final table
std::vector<std::shared_ptr<arrow::Array>> array_vector;
std::vector<std::shared_ptr<arrow::Field>> schema_vector;
for (auto colit : mColumnIterators) {
for (auto&& colit : mColumnIterators) {
colit->finish();
array_vector.push_back(colit->getArray());
schema_vector.push_back(colit->getSchema());
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.