DPL: avoid copying shared pointers while reading

ktf · ktf · commit 9cd86cde6203 · 2020-09-29T13:37:50.000+02:00
diff --git a/Framework/Core/include/Framework/TableTreeHelpers.h b/Framework/Core/include/Framework/TableTreeHelpers.h
@@ -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
diff --git a/Framework/Core/src/TableTreeHelpers.cxx b/Framework/Core/src/TableTreeHelpers.cxx
@@ -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));
@@ -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 {
@@ -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);
   }
 }
@@ -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());

Original file line number	Diff line number	Diff line change
`@@ -738,7 +738,7 @@ TreeToTable::~TreeToTable()`
`738`	`738`
`739`	`739`	`bool TreeToTable::addColumn(const char* colname)`
`740`	`740`	`{`
`741`		`- auto colit = std::make_shared<ColumnIterator>(mTreeReader, colname);`
	`741`	`+ auto colit = std::make_unique<ColumnIterator>(mTreeReader, colname);`
`742`	`742`	`auto stat = colit->getStatus();`
`743`	`743`	`if (stat) {`
`744`	`744`	`mColumnIterators.push_back(std::move(colit));`
`@@ -763,7 +763,7 @@ bool TreeToTable::addAllColumns()`
`763`	`763`	`auto br = (TBranch*)branchList->At(ii);`
`764`	`764`
`765`	`765`	`// IMPROVE: make sure that a column is not added more than one time`
`766`		`- auto colit = std::make_shared<ColumnIterator>(mTreeReader, br->GetName());`
	`766`	`+ auto colit = std::make_unique<ColumnIterator>(mTreeReader, br->GetName());`
`767`	`767`	`if (colit->getStatus()) {`
`768`	`768`	`mColumnIterators.push_back(std::move(colit));`
`769`	`769`	`} else {`
`@@ -776,14 +776,14 @@ bool TreeToTable::addAllColumns()`
`776`	`776`
`777`	`777`	`void TreeToTable::push()`
`778`	`778`	`{`
`779`		`- for (auto colit : mColumnIterators) {`
	`779`	`+ for (auto&& colit : mColumnIterators) {`
`780`	`780`	`colit->push();`
`781`	`781`	`}`
`782`	`782`	`}`
`783`	`783`
`784`	`784`	`void TreeToTable::reserve(size_t s)`
`785`	`785`	`{`
`786`		`- for (auto column : mColumnIterators) {`
	`786`	`+ for (auto&& column : mColumnIterators) {`
`787`	`787`	`column->reserve(s);`
`788`	`788`	`}`
`789`	`789`	`}`
`@@ -805,7 +805,7 @@ std::shared_ptr<arrow::Table> TreeToTable::finalize()`
`805`	`805`	`// prepare the elements needed to create the final table`
`806`	`806`	`std::vector<std::shared_ptr<arrow::Array>> array_vector;`
`807`	`807`	`std::vector<std::shared_ptr<arrow::Field>> schema_vector;`
`808`		`- for (auto colit : mColumnIterators) {`
	`808`	`+ for (auto&& colit : mColumnIterators) {`
`809`	`809`	`colit->finish();`
`810`	`810`	`array_vector.push_back(colit->getArray());`
`811`	`811`	`schema_vector.push_back(colit->getSchema());`