commit bf9c592fca909d4a365a51f12f86a52b4c31366d
author Ed Tanous <etanous@nvidia.com> Wed Mar 26 11:56:44 2025 -0700
committer Ed Tanous <etanous@nvidia.com> Thu Apr 03 15:26:31 2025 +0000
tree 01607f3e99630f10eadcb2f32211881dcf44771c
parent 0f09ed32b1428ea954a655da67206ad21efd7381

Make trie a template

This trie class would be useful to use with any arbitrary type, not just
those inheriting from BaseRule.

Change-Id: I325474a100e083ea36407530c6e4e8f6412718ac
Signed-off-by: Ed Tanous <etanous@nvidia.com>

http/routing.hpp

diff --git a/http/routing.hpp b/http/routing.hpp
index 6c39939..7d1432a 100644
--- a/http/routing.hpp
+++ b/http/routing.hpp
@@ -36,6 +36,7 @@
 namespace crow
 {
 
+template <typename ContainedType>
 class Trie
 {
   public:
@@ -80,13 +81,13 @@
         while (true)
         {
             bool didMerge = false;
-            Node::ChildMap merged;
-            for (const Node::ChildMap::value_type& kv : node.children)
+            typename Node::ChildMap merged;
+            for (const typename Node::ChildMap::value_type& kv : node.children)
             {
                 Node& child = nodes[kv.second];
                 if (child.isSimpleNode())
                 {
-                    for (const Node::ChildMap::value_type& childKv :
+                    for (const typename Node::ChildMap::value_type& childKv :
                          child.children)
                     {
                         merged[kv.first + childKv.first] = childKv.second;
@@ -105,7 +106,7 @@
             }
         }
 
-        for (const Node::ChildMap::value_type& kv : node.children)
+        for (const typename Node::ChildMap::value_type& kv : node.children)
         {
             optimizeNode(nodes[kv.second]);
         }
@@ -126,7 +127,7 @@
                                 std::vector<unsigned>& routeIndexes,
                                 const Node& node) const
     {
-        for (const Node::ChildMap::value_type& kv : node.children)
+        for (const typename Node::ChildMap::value_type& kv : node.children)
         {
             const std::string& fragment = kv.first;
             const Node& child = nodes[kv.second];
@@ -157,7 +158,7 @@
 
     struct FindResult
     {
-        unsigned ruleIndex;
+        unsigned ruleIndex = 0;
         std::vector<std::string> params;
     };
 
@@ -205,7 +206,7 @@
             params.pop_back();
         }
 
-        for (const Node::ChildMap::value_type& kv : node.children)
+        for (const typename Node::ChildMap::value_type& kv : node.children)
         {
             const std::string& fragment = kv.first;
             const Node& child = nodes[kv.second];
@@ -307,7 +308,7 @@
             BMCWEB_LOG_DEBUG("{} <path>", spaces);
             debugNodePrint(nodes[n.pathParamChild], level + 6);
         }
-        for (const Node::ChildMap::value_type& kv : n.children)
+        for (const typename Node::ChildMap::value_type& kv : n.children)
         {
             BMCWEB_LOG_DEBUG("{}{}", spaces, kv.first);
             debugNodePrint(nodes[kv.second], level + kv.first.size());
@@ -414,7 +415,7 @@
     struct PerMethod
     {
         std::vector<BaseRule*> rules;
-        Trie trie;
+        Trie<BaseRule> trie;
         // rule index 0 has special meaning; preallocate it to avoid
         // duplication.
         PerMethod() : rules(1) {}
@@ -502,7 +503,7 @@
     {
         FindRoute route;
 
-        Trie::FindResult found = perMethod.trie.find(url);
+        Trie<BaseRule>::FindResult found = perMethod.trie.find(url);
         if (found.ruleIndex >= perMethod.rules.size())
         {
             throw std::runtime_error("Trie internal structure corrupted!");
@@ -568,10 +569,10 @@
                        Adaptor&& adaptor)
     {
         PerMethod& perMethod = upgradeRoutes;
-        Trie& trie = perMethod.trie;
+        Trie<BaseRule>& trie = perMethod.trie;
         std::vector<BaseRule*>& rules = perMethod.rules;
 
-        Trie::FindResult found = trie.find(req->url().encoded_path());
+        Trie<BaseRule>::FindResult found = trie.find(req->url().encoded_path());
         unsigned ruleIndex = found.ruleIndex;
         if (ruleIndex == 0U)
         {