DPL: do not create unneeded statics (#14261)

ktf · web-flow · commit ea6e536b4805 · 2025-05-12T20:49:42.000+02:00
diff --git a/Framework/Core/include/Framework/TableBuilder.h b/Framework/Core/include/Framework/TableBuilder.h
@@ -855,7 +855,7 @@ auto makeEmptyTable(const char* name, framework::pack<Cs...> p)
 }
 
 std::shared_ptr<arrow::Table> spawnerHelper(std::shared_ptr<arrow::Table> const& fullTable, std::shared_ptr<arrow::Schema> newSchema, size_t nColumns,
-                                            expressions::Projector* projectors, std::vector<std::shared_ptr<arrow::Field>> const& fields, const char* name, std::shared_ptr<gandiva::Projector>& projector);
+                                            expressions::Projector* projectors, const char* name, std::shared_ptr<gandiva::Projector>& projector);
 
 /// Expression-based column generator to materialize columns
 template <aod::is_aod_hash D>
@@ -867,10 +867,9 @@ auto spawner(std::vector<std::shared_ptr<arrow::Table>>&& tables, const char* na
   if (fullTable->num_rows() == 0) {
     return makeEmptyTable(name, placeholders_pack_t{});
   }
-  static auto fields = o2::soa::createFieldsFromColumns(placeholders_pack_t{});
-  static auto new_schema = std::make_shared<arrow::Schema>(fields);
+  static auto new_schema = std::make_shared<arrow::Schema>(o2::soa::createFieldsFromColumns(placeholders_pack_t{}));
 
-  return spawnerHelper(fullTable, new_schema, framework::pack_size(placeholders_pack_t{}), projectors, fields, name, projector);
+  return spawnerHelper(fullTable, new_schema, framework::pack_size(placeholders_pack_t{}), projectors, name, projector);
 }
 
 template <aod::is_aod_hash D>
@@ -881,10 +880,9 @@ auto spawner(std::shared_ptr<arrow::Table> const& fullTable, const char* name, o
   if (fullTable->num_rows() == 0) {
     return makeEmptyTable(name, placeholders_pack_t{});
   }
-  static auto fields = o2::soa::createFieldsFromColumns(placeholders_pack_t{});
-  static auto new_schema = std::make_shared<arrow::Schema>(fields);
+  static auto new_schema = std::make_shared<arrow::Schema>(o2::soa::createFieldsFromColumns(placeholders_pack_t{}));
 
-  return spawnerHelper(fullTable, new_schema, framework::pack_size(placeholders_pack_t{}), projectors, fields, name, projector);
+  return spawnerHelper(fullTable, new_schema, framework::pack_size(placeholders_pack_t{}), projectors, name, projector);
 }
 
 template <aod::is_aod_hash D>
@@ -896,15 +894,15 @@ auto spawner(std::vector<std::shared_ptr<arrow::Table>>&& tables, const char* na
   if (fullTable->num_rows() == 0) {
     return makeEmptyTable(name, expression_pack_t{});
   }
-  static auto fields = o2::soa::createFieldsFromColumns(expression_pack_t{});
-  static auto new_schema = std::make_shared<arrow::Schema>(fields);
+  static auto new_schema = std::make_shared<arrow::Schema>(o2::soa::createFieldsFromColumns(expression_pack_t{}));
+
   auto projectors = []<typename... C>(framework::pack<C...>) -> std::array<expressions::Projector, sizeof...(C)>
   {
     return {{std::move(C::Projector())...}};
   }
   (expression_pack_t{});
 
-  return spawnerHelper(fullTable, new_schema, framework::pack_size(expression_pack_t{}), projectors.data(), fields, name, projector);
+  return spawnerHelper(fullTable, new_schema, framework::pack_size(expression_pack_t{}), projectors.data(), name, projector);
 }
 
 template <aod::is_aod_hash D>
@@ -915,15 +913,14 @@ auto spawner(std::shared_ptr<arrow::Table> const& fullTable, const char* name, s
   if (fullTable->num_rows() == 0) {
     return makeEmptyTable(name, expression_pack_t{});
   }
-  static auto fields = o2::soa::createFieldsFromColumns(expression_pack_t{});
-  static auto new_schema = std::make_shared<arrow::Schema>(fields);
+  static auto new_schema = std::make_shared<arrow::Schema>(o2::soa::createFieldsFromColumns(expression_pack_t{}));
   auto projectors = []<typename... C>(framework::pack<C...>) -> std::array<expressions::Projector, sizeof...(C)>
   {
     return {{std::move(C::Projector())...}};
   }
   (expression_pack_t{});
 
-  return spawnerHelper(fullTable, new_schema, framework::pack_size(expression_pack_t{}), projectors.data(), fields, name, projector);
+  return spawnerHelper(fullTable, new_schema, framework::pack_size(expression_pack_t{}), projectors.data(), name, projector);
 }
 
 template <typename... C>
@@ -933,10 +930,9 @@ auto spawner(framework::pack<C...> columns, std::vector<std::shared_ptr<arrow::T
   if (fullTable->num_rows() == 0) {
     return makeEmptyTable(name, framework::pack<C...>{});
   }
-  static auto fields = o2::soa::createFieldsFromColumns(columns);
-  static auto new_schema = std::make_shared<arrow::Schema>(fields);
+  static auto new_schema = std::make_shared<arrow::Schema>(o2::soa::createFieldsFromColumns(columns));
   std::array<expressions::Projector, sizeof...(C)> projectors{{std::move(C::Projector())...}};
-  return spawnerHelper(fullTable, new_schema, sizeof...(C), projectors.data(), fields, name, projector);
+  return spawnerHelper(fullTable, new_schema, sizeof...(C), projectors.data(), name, projector);
 }
 
 template <typename... T>
diff --git a/Framework/Core/src/TableBuilder.cxx b/Framework/Core/src/TableBuilder.cxx
@@ -85,11 +85,11 @@ void TableBuilder::setLabel(const char* label)
 }
 
 std::shared_ptr<arrow::Table> spawnerHelper(std::shared_ptr<arrow::Table> const& fullTable, std::shared_ptr<arrow::Schema> newSchema, size_t nColumns,
-                                            expressions::Projector* projectors, std::vector<std::shared_ptr<arrow::Field>> const& fields, const char* name,
+                                            expressions::Projector* projectors, const char* name,
                                             std::shared_ptr<gandiva::Projector>& projector)
 {
   if (projector == nullptr) {
-    projector = framework::expressions::createProjectorHelper(nColumns, projectors, fullTable->schema(), fields);
+    projector = framework::expressions::createProjectorHelper(nColumns, projectors, fullTable->schema(), newSchema->fields());
   }
 
   arrow::TableBatchReader reader(*fullTable);

Original file line number	Diff line number	Diff line change
`@@ -855,7 +855,7 @@ auto makeEmptyTable(const char* name, framework::pack<Cs...> p)`
`855`	`855`	`}`
`856`	`856`
`857`	`857`	`std::shared_ptr<arrow::Table> spawnerHelper(std::shared_ptr<arrow::Table> const& fullTable, std::shared_ptr<arrow::Schema> newSchema, size_t nColumns,`
`858`		`- expressions::Projector* projectors, std::vector<std::shared_ptr<arrow::Field>> const& fields, const char* name, std::shared_ptr<gandiva::Projector>& projector);`
	`858`	`+ expressions::Projector* projectors, const char* name, std::shared_ptr<gandiva::Projector>& projector);`
`859`	`859`
`860`	`860`	`/// Expression-based column generator to materialize columns`
`861`	`861`	`template <aod::is_aod_hash D>`
`@@ -867,10 +867,9 @@ auto spawner(std::vector<std::shared_ptr<arrow::Table>>&& tables, const char* na`
`867`	`867`	`if (fullTable->num_rows() == 0) {`
`868`	`868`	`return makeEmptyTable(name, placeholders_pack_t{});`
`869`	`869`	`}`
`870`		`- static auto fields = o2::soa::createFieldsFromColumns(placeholders_pack_t{});`
`871`		`- static auto new_schema = std::make_shared<arrow::Schema>(fields);`
	`870`	`+ static auto new_schema = std::make_shared<arrow::Schema>(o2::soa::createFieldsFromColumns(placeholders_pack_t{}));`
`872`	`871`
`873`		`- return spawnerHelper(fullTable, new_schema, framework::pack_size(placeholders_pack_t{}), projectors, fields, name, projector);`
	`872`	`+ return spawnerHelper(fullTable, new_schema, framework::pack_size(placeholders_pack_t{}), projectors, name, projector);`
`874`	`873`	`}`
`875`	`874`
`876`	`875`	`template <aod::is_aod_hash D>`
`@@ -881,10 +880,9 @@ auto spawner(std::shared_ptr<arrow::Table> const& fullTable, const char* name, o`
`881`	`880`	`if (fullTable->num_rows() == 0) {`
`882`	`881`	`return makeEmptyTable(name, placeholders_pack_t{});`
`883`	`882`	`}`
`884`		`- static auto fields = o2::soa::createFieldsFromColumns(placeholders_pack_t{});`
`885`		`- static auto new_schema = std::make_shared<arrow::Schema>(fields);`
	`883`	`+ static auto new_schema = std::make_shared<arrow::Schema>(o2::soa::createFieldsFromColumns(placeholders_pack_t{}));`
`886`	`884`
`887`		`- return spawnerHelper(fullTable, new_schema, framework::pack_size(placeholders_pack_t{}), projectors, fields, name, projector);`
	`885`	`+ return spawnerHelper(fullTable, new_schema, framework::pack_size(placeholders_pack_t{}), projectors, name, projector);`
`888`	`886`	`}`
`889`	`887`
`890`	`888`	`template <aod::is_aod_hash D>`
`@@ -896,15 +894,15 @@ auto spawner(std::vector<std::shared_ptr<arrow::Table>>&& tables, const char* na`
`896`	`894`	`if (fullTable->num_rows() == 0) {`
`897`	`895`	`return makeEmptyTable(name, expression_pack_t{});`
`898`	`896`	`}`
`899`		`- static auto fields = o2::soa::createFieldsFromColumns(expression_pack_t{});`
`900`		`- static auto new_schema = std::make_shared<arrow::Schema>(fields);`
	`897`	`+ static auto new_schema = std::make_shared<arrow::Schema>(o2::soa::createFieldsFromColumns(expression_pack_t{}));`
	`898`	`+`
`901`	`899`	`auto projectors = []<typename... C>(framework::pack<C...>) -> std::array<expressions::Projector, sizeof...(C)>`
`902`	`900`	`{`
`903`	`901`	`return {{std::move(C::Projector())...}};`
`904`	`902`	`}`
`905`	`903`	`(expression_pack_t{});`
`906`	`904`
`907`		`- return spawnerHelper(fullTable, new_schema, framework::pack_size(expression_pack_t{}), projectors.data(), fields, name, projector);`
	`905`	`+ return spawnerHelper(fullTable, new_schema, framework::pack_size(expression_pack_t{}), projectors.data(), name, projector);`
`908`	`906`	`}`
`909`	`907`
`910`	`908`	`template <aod::is_aod_hash D>`
`@@ -915,15 +913,14 @@ auto spawner(std::shared_ptr<arrow::Table> const& fullTable, const char* name, s`
`915`	`913`	`if (fullTable->num_rows() == 0) {`
`916`	`914`	`return makeEmptyTable(name, expression_pack_t{});`
`917`	`915`	`}`
`918`		`- static auto fields = o2::soa::createFieldsFromColumns(expression_pack_t{});`
`919`		`- static auto new_schema = std::make_shared<arrow::Schema>(fields);`
	`916`	`+ static auto new_schema = std::make_shared<arrow::Schema>(o2::soa::createFieldsFromColumns(expression_pack_t{}));`
`920`	`917`	`auto projectors = []<typename... C>(framework::pack<C...>) -> std::array<expressions::Projector, sizeof...(C)>`
`921`	`918`	`{`
`922`	`919`	`return {{std::move(C::Projector())...}};`
`923`	`920`	`}`
`924`	`921`	`(expression_pack_t{});`
`925`	`922`
`926`		`- return spawnerHelper(fullTable, new_schema, framework::pack_size(expression_pack_t{}), projectors.data(), fields, name, projector);`
	`923`	`+ return spawnerHelper(fullTable, new_schema, framework::pack_size(expression_pack_t{}), projectors.data(), name, projector);`
`927`	`924`	`}`
`928`	`925`
`929`	`926`	`template <typename... C>`
`@@ -933,10 +930,9 @@ auto spawner(framework::pack<C...> columns, std::vector<std::shared_ptr<arrow::T`
`933`	`930`	`if (fullTable->num_rows() == 0) {`
`934`	`931`	`return makeEmptyTable(name, framework::pack<C...>{});`
`935`	`932`	`}`
`936`		`- static auto fields = o2::soa::createFieldsFromColumns(columns);`
`937`		`- static auto new_schema = std::make_shared<arrow::Schema>(fields);`
	`933`	`+ static auto new_schema = std::make_shared<arrow::Schema>(o2::soa::createFieldsFromColumns(columns));`
`938`	`934`	`std::array<expressions::Projector, sizeof...(C)> projectors{{std::move(C::Projector())...}};`
`939`		`- return spawnerHelper(fullTable, new_schema, sizeof...(C), projectors.data(), fields, name, projector);`
	`935`	`+ return spawnerHelper(fullTable, new_schema, sizeof...(C), projectors.data(), name, projector);`
`940`	`936`	`}`
`941`	`937`
`942`	`938`	`template <typename... T>`
Original file line number	Diff line number	Diff line change
`@@ -85,11 +85,11 @@ void TableBuilder::setLabel(const char* label)`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`std::shared_ptr<arrow::Table> spawnerHelper(std::shared_ptr<arrow::Table> const& fullTable, std::shared_ptr<arrow::Schema> newSchema, size_t nColumns,`
`88`		`- expressions::Projector* projectors, std::vector<std::shared_ptr<arrow::Field>> const& fields, const char* name,`
	`88`	`+ expressions::Projector* projectors, const char* name,`
`89`	`89`	`std::shared_ptr<gandiva::Projector>& projector)`
`90`	`90`	`{`
`91`	`91`	`if (projector == nullptr) {`
`92`		`- projector = framework::expressions::createProjectorHelper(nColumns, projectors, fullTable->schema(), fields);`
	`92`	`+ projector = framework::expressions::createProjectorHelper(nColumns, projectors, fullTable->schema(), newSchema->fields());`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`arrow::TableBatchReader reader(*fullTable);`