Actually using the new product_query (Part 1) (#344)

* This handles the API change, and ports the existing creator name check to work with the new product_query.
* Make algorithm_name use identifiers
* type_id now has an std::hash
* Fix product_specification creation from product_query
* Fix FORM test
* Make default constructed identifiers valid

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Kyle Knoepfel <knoepfel@fnal.gov>

Author: 3 people

.github/workflows/codeql-analysis.yaml

@@ -218,7 +218,13 @@ jobs:
           fi
 
   determine-languages:
-    needs: [pre-check, detect-changes-cpp, detect-changes-python, detect-changes-actions]
+    needs:
+      [
+        pre-check,
+        detect-changes-cpp,
+        detect-changes-python,
+        detect-changes-actions,
+      ]
     if: always() && needs.pre-check.result == 'success'
     runs-on: ubuntu-latest
     outputs:

form/form_module.cpp

@@ -63,7 +63,7 @@ namespace {
       auto segment_id = store.index()->to_string();
 
       std::cout << "\n=== FormOutputModule::save_data_products ===\n";
-      std::cout << "Creator: " << creator << "\n";
+      std::cout << "Creator: " << creator.full() << "\n";
       std::cout << "Segment ID: " << segment_id << "\n";
       std::cout << "Number of products: " << store.size() << "\n";
 
@@ -81,10 +81,10 @@ namespace {
         // product_ptr: pointer to the actual product data
         assert(product_ptr && "store should not contain null product_ptr");
 
-        std::cout << "  Product: " << product_name << "\n";
+        std::cout << "  Product: " << product_name.full() << "\n";
 
         // Create FORM product with metadata
-        products.emplace_back(product_name,           // label, from map key
+        products.emplace_back(product_name.name().trans_get_string(), // label, from map key
                               product_ptr->address(), // data,  from phlex product_base
                               &product_ptr->type()    // type, from phlex product_base
         );
@@ -95,7 +95,7 @@ namespace {
       // Write all products to FORM
       // Pass segment_id once for entire collection (not duplicated in each product)
       // No need to check if products is empty - already checked store.empty() above
-      m_form_interface->write(creator, segment_id, products);
+      m_form_interface->write(creator.full(), segment_id, products);
       std::cout << "Wrote " << products.size() << " products to FORM\n";
     }
 

phlex/core/consumer.cpp

@@ -8,8 +8,8 @@ namespace phlex::experimental {
 
   std::string consumer::full_name() const { return name_.full(); }
 
-  std::string const& consumer::plugin() const noexcept { return name_.plugin(); }
-  std::string const& consumer::algorithm() const noexcept { return name_.algorithm(); }
+  identifier const& consumer::plugin() const noexcept { return name_.plugin(); }
+  identifier const& consumer::algorithm() const noexcept { return name_.algorithm(); }
 
   std::vector<std::string> const& consumer::when() const noexcept { return predicates_; }
 }

phlex/core/consumer.hpp

@@ -12,8 +12,8 @@ namespace phlex::experimental {
     consumer(algorithm_name name, std::vector<std::string> predicates);
 
     std::string full_name() const;
-    std::string const& plugin() const noexcept;
-    std::string const& algorithm() const noexcept;
+    identifier const& plugin() const noexcept;
+    identifier const& algorithm() const noexcept;
     std::vector<std::string> const& when() const noexcept;
 
   private:

phlex/core/declared_fold.hpp

@@ -186,9 +186,9 @@ namespace phlex::experimental {
     {
       auto& result = results_.at(store->index()->hash());
       if constexpr (requires { send(*result); }) {
-        store->add_product(output()[0].name(), send(*result));
+        store->add_product(output()[0], send(*result));
       } else {
-        store->add_product(output()[0].name(), std::move(result));
+        store->add_product(output()[0], std::move(result));
       }
       // Reclaim some memory; it would be better to erase the entire entry from the map,
       // but that is not thread-safe.
@@ -198,7 +198,7 @@ namespace phlex::experimental {
     InitTuple initializer_;
     input_retriever_types<input_parameter_types> input_{input_arguments<input_parameter_types>()};
     product_specifications output_;
-    std::string partition_;
+    identifier partition_;
     tbb::flow::function_node<flush_message> flush_receiver_;
     join_or_none_t<num_inputs> join_;
     tbb::flow::multifunction_node<messages_t<num_inputs>, message_tuple<1>> fold_;

phlex/core/declared_provider.hpp

@@ -56,7 +56,9 @@ namespace phlex::experimental {
                   AlgorithmBits alg,
                   product_query output) :
       declared_provider{std::move(name), output},
-      output_{output.spec()},
+      output_{algorithm_name::create(std::string_view(identifier(output.creator))),
+              output.suffix.value_or(identifier("")),
+              output.type},
       provider_{g,
                 concurrency,
                 [this, ft = alg.release_algorithm()](index_message const& index_msg, auto& output) {
@@ -66,7 +68,7 @@ namespace phlex::experimental {
                   ++calls_;
 
                   products new_products;
-                  new_products.add(output_.name(), std::move(result));
+                  new_products.add(output_, std::move(result));
                   auto store = std::make_shared<product_store>(
                     index, this->full_name(), std::move(new_products));
 

phlex/core/declared_unfold.cpp

@@ -8,7 +8,7 @@
 namespace phlex::experimental {
 
   generator::generator(product_store_const_ptr const& parent,
-                       std::string node_name,
+                       algorithm_name node_name,
                        std::string const& child_layer_name) :
     parent_{std::const_pointer_cast<product_store>(parent)},
     node_name_{std::move(node_name)},

phlex/core/declared_unfold.hpp

@@ -10,6 +10,7 @@
 #include "phlex/model/algorithm_name.hpp"
 #include "phlex/model/data_cell_index.hpp"
 #include "phlex/model/handle.hpp"
+#include "phlex/model/identifier.hpp"
 #include "phlex/model/product_specification.hpp"
 #include "phlex/model/product_store.hpp"
 #include "phlex/utilities/simple_ptr_map.hpp"
@@ -34,7 +35,7 @@ namespace phlex::experimental {
   class generator {
   public:
     explicit generator(product_store_const_ptr const& parent,
-                       std::string node_name,
+                       algorithm_name node_name,
                        std::string const& child_layer_name);
     flush_counts_ptr flush_result() const;
 
@@ -47,7 +48,7 @@ namespace phlex::experimental {
   private:
     product_store_const_ptr make_child(std::size_t i, products new_products);
     product_store_ptr parent_;
-    std::string node_name_;
+    algorithm_name node_name_;
     std::string const& child_layer_name_;
     std::map<data_cell_index::hash_type, std::size_t> child_counts_;
   };

phlex/core/detail/filter_impl.cpp

@@ -76,7 +76,7 @@ namespace phlex::experimental {
 
     // Fill slots in the order of the input arguments to the downstream node.
     for (std::size_t i = 0; i != nargs_; ++i) {
-      if (elem[i] or not store->contains_product((*product_names_)[i].spec().full()))
+      if (elem[i] or not store->contains_product((*product_names_)[i].spec()))
         continue;
       elem[i] = store;
     }

phlex/core/detail/make_algorithm_name.cpp

@@ -1,10 +1,12 @@
 #include "phlex/core/detail/make_algorithm_name.hpp"
 #include "phlex/configuration.hpp"
 #include "phlex/model/algorithm_name.hpp"
+#include "phlex/model/identifier.hpp"
 
 namespace phlex::experimental::detail {
-  algorithm_name make_algorithm_name(configuration const* config, std::string name)
+  algorithm_name make_algorithm_name(configuration const* config, std::string_view name)
   {
-    return {config ? config->get<std::string>("module_label") : "", std::move(name)};
+    return {config ? identifier(config->get<std::string_view>("module_label")) : ""_id,
+            identifier(name)};
   }
 }