DPL Analysis: add table name to spawner errors

aalkin · ktf · commit ee233ecc2d8b · 2021-04-27T18:03:30.000+02:00
diff --git a/Framework/Core/include/Framework/TableBuilder.h b/Framework/Core/include/Framework/TableBuilder.h
@@ -770,7 +770,7 @@ auto makeEmptyTable()
 
 /// Expression-based column generator to materialize columns
 template <typename... C>
-auto spawner(framework::pack<C...> columns, arrow::Table* atable)
+auto spawner(framework::pack<C...> columns, arrow::Table* atable, const char* name)
 {
   static auto new_schema = o2::soa::createSchemaFromColumns(columns);
   static auto projectors = framework::expressions::createProjectors(columns, atable->schema());
@@ -788,15 +788,20 @@ auto spawner(framework::pack<C...> columns, arrow::Table* atable)
   while (true) {
     auto s = reader.ReadNext(&batch);
     if (!s.ok()) {
-      throw runtime_error_f("Cannot read batches from table: %s", s.ToString().c_str());
+      throw runtime_error_f("Cannot read batches from table %s: %s", name, s.ToString().c_str());
     }
     if (batch == nullptr) {
       break;
     }
-    s = projectors->Evaluate(*batch, arrow::default_memory_pool(), &v);
-    if (!s.ok()) {
-      throw runtime_error_f("Cannot apply projector: %s", s.ToString().c_str());
+    try {
+      s = projectors->Evaluate(*batch, arrow::default_memory_pool(), &v);
+      if (!s.ok()) {
+        throw runtime_error_f("Cannot apply projector to table %s: %s", name, s.ToString().c_str());
+      }
+    } catch (std::exception& e) {
+      throw runtime_error_f("Cannot apply projector to table %s: exception caught: %s", name, e.what());
     }
+
     for (auto i = 0u; i < sizeof...(C); ++i) {
       chunks[i].emplace_back(v.at(i));
     }
diff --git a/Framework/Core/src/AODReaderHelpers.cxx b/Framework/Core/src/AODReaderHelpers.cxx
@@ -167,7 +167,7 @@ AlgorithmSpec AODReaderHelpers::aodSpawnerCallback(std::vector<InputSpec> reques
           using metadata_t = decltype(metadata);
           using expressions = typename metadata_t::expression_pack_t;
           auto original_table = pc.inputs().get<TableConsumer>(input.binding)->asArrowTable();
-          return o2::framework::spawner(expressions{}, original_table.get());
+          return o2::framework::spawner(expressions{}, original_table.get(), input.binding.c_str());
         };
 
         if (description == header::DataDescription{"TRACK"}) {
