Temporary Revert "Using Radix tree instead of Trie (#40160)" (#40341)

This reverts commit 49a2a87.

We want to wait until after the release to give this more testing time
before it is included in a release.

Signed-off-by: Ryan Northey <[email protected]>

Author: phlax

changelogs/current.yaml

@@ -387,9 +387,6 @@ new_features:
 - area: alts
   change: |
     Added environment variable-protected gRPC keepalive params to the ALTS handshaker client.
-- area: dns_filter, redis_proxy and prefix_matcher_map
-  change: |
-    Using Radix Tree instead of Trie for performance improvements.
 - area: wasm
   change: |
     Added support for returning ``StopIteration`` from plugin ``onRequestHeader`` and ``onResponseHeader`` callbacks. See

source/common/common/BUILD

@@ -483,16 +483,6 @@ envoy_cc_library(
     hdrs = ["trie_lookup_table.h"],
 )
 
-envoy_cc_library(
-    name = "radix_tree_lib",
-    hdrs = ["radix_tree.h"],
-    deps = [
-        ":assert_lib",
-        "@com_google_absl//absl/container:flat_hash_map",
-        "@com_google_absl//absl/strings",
-    ],
-)
-
 envoy_cc_library(
     name = "utility_lib",
     srcs = ["utility.cc"],

source/common/common/radix_tree.h

@@ -29,7 +29,7 @@ envoy_cc_library(
     hdrs = ["prefix_map_matcher.h"],
     deps = [
         ":map_matcher_lib",
-        "//source/common/common:radix_tree_lib",
+        "//source/common/common:trie_lookup_table_lib",
         "//source/common/runtime:runtime_features_lib",
     ],
 )

source/common/matcher/BUILD

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "source/common/common/radix_tree.h"
+#include "source/common/common/trie_lookup_table.h"
 #include "source/common/matcher/map_matcher.h"
 #include "source/common/runtime/runtime_features.h"
 
@@ -52,7 +52,7 @@ template <class DataType> class PrefixMapMatcher : public MapMatcher<DataType> {
   }
 
 private:
-  RadixTree<std::shared_ptr<OnMatch<DataType>>> children_;
+  TrieLookupTable<std::shared_ptr<OnMatch<DataType>>> children_;
 };
 
 } // namespace Matcher

source/common/matcher/prefix_map_matcher.h

@@ -9,7 +9,7 @@
 #include "envoy/stats/timespan.h"
 
 #include "source/common/common/logger.h"
-#include "source/common/common/radix_tree.h"
+#include "source/common/common/trie_lookup_table.h"
 #include "source/common/stats/timespan_impl.h"
 #include "source/extensions/filters/network/common/redis/client_impl.h"
 #include "source/extensions/filters/network/common/redis/fault_impl.h"
@@ -501,7 +501,7 @@ class InstanceImpl : public Instance, Logger::Loggable<Logger::Id::redis> {
   CommandHandlerFactory<RoleRequest> role_handler_;
   CommandHandlerFactory<SplitKeysSumResultRequest> split_keys_sum_result_handler_;
   CommandHandlerFactory<TransactionRequest> transaction_handler_;
-  RadixTree<HandlerDataPtr> handler_lookup_table_;
+  TrieLookupTable<HandlerDataPtr> handler_lookup_table_;
   InstanceStats stats_;
   TimeSource& time_source_;
   Common::Redis::FaultManagerPtr fault_manager_;

source/extensions/filters/network/redis_proxy/command_splitter_impl.h

@@ -13,7 +13,7 @@
 #include "envoy/type/v3/percent.pb.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#include "source/common/common/radix_tree.h"
+#include "source/common/common/trie_lookup_table.h"
 #include "source/common/http/header_map_impl.h"
 #include "source/common/stream_info/stream_info_impl.h"
 #include "source/extensions/filters/network/common/redis/supported_commands.h"
@@ -86,7 +86,7 @@ class PrefixRoutes : public Router, public Logger::Loggable<Logger::Id::redis> {
                  const StreamInfo::StreamInfo& stream_info);
 
 private:
-  RadixTree<PrefixSharedPtr> prefix_lookup_table_;
+  TrieLookupTable<PrefixSharedPtr> prefix_lookup_table_;
   const bool case_insensitive_;
   Upstreams upstreams_;
   PrefixSharedPtr catch_all_route_;