grpc 1.75.0 → 1.78.0

data/src/core/util/trie_lookup.h

@@ -0,0 +1,170 @@
+//
+// Copyright 2025 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#ifndef GRPC_SRC_CORE_UTIL_TRIE_LOOKUP_H
+#define GRPC_SRC_CORE_UTIL_TRIE_LOOKUP_H
+
+#include <cstdint>
+#include <memory>
+#include <utility>
+
+#include "absl/container/flat_hash_map.h"
+#include "absl/types/optional.h"
+
+namespace grpc_core {
+
+template <typename Value>
+class TrieLookupTree {
+ public:
+  TrieLookupTree() : root_(std::make_unique<TrieNode>()) {}
+
+  // Takes value by r-value reference to consume it.
+  bool AddNode(absl::string_view key, Value value) {
+    auto* node = root_.get();
+    for (auto c : key) {
+      auto& child = node->child[c];
+      if (child == nullptr) {
+        child = std::make_unique<TrieNode>();
+      }
+      node = child.get();
+    }
+    node->value = std::move(value);
+    return true;
+  }
+
+  // Returns a const pointer to the value.
+  const Value* Lookup(absl::string_view key) const {
+    const auto* node = root_.get();
+    for (auto c : key) {
+      auto it = node->child.find(c);
+      if (it == node->child.end()) {
+        return nullptr;
+      }
+      node = it->second.get();
+    }
+    if (node->value.has_value()) {
+      return &*node->value;
+    }
+    return nullptr;
+  }
+
+  // Return longest matching prefix
+  const Value* LookupLongestPrefix(absl::string_view key) const {
+    const auto* node = root_.get();
+    const Value* matched_value = nullptr;
+    if (node->value.has_value()) {
+      matched_value = &*node->value;
+    }
+    for (auto c : key) {
+      auto it = node->child.find(c);
+      if (it == node->child.end()) {
+        return matched_value;
+      }
+      node = it->second.get();
+      if (node->value.has_value()) {
+        matched_value = &*node->value;
+      }
+    }
+    return matched_value;
+  }
+
+  // Invokes cb for least to most matching prefix
+  void ForEachPrefixMatch(absl::string_view key,
+                          absl::FunctionRef<void(const Value&)> cb) const {
+    const auto* node = root_.get();
+    for (auto c : key) {
+      auto it = node->child.find(c);
+      if (it == node->child.end()) {
+        return;
+      }
+      node = it->second.get();
+      if (node->value.has_value()) {
+        cb(*node->value);
+      }
+    }
+  }
+
+  // invokes cb for every value present in trie
+  // Useful for ToString Method to dump Trie
+  // Format of cb "void(key, value)"
+  void ForEach(
+      absl::FunctionRef<void(absl::string_view, const Value&)> cb) const {
+    if (root_ == nullptr) return;
+    std::string key;
+    ForEachRecursive(root_.get(), key, cb);
+  }
+
+  // Check for equality
+  bool operator==(const TrieLookupTree& other) const {
+    if (this == &other) return true;
+    if (root_ == nullptr || other.root_ == nullptr) {
+      return root_ == other.root_;
+    }
+    std::vector<std::pair<const TrieNode*, const TrieNode*>> nodes_to_compare;
+    nodes_to_compare.emplace_back(root_.get(), other.root_.get());
+    while (!nodes_to_compare.empty()) {
+      auto [node1, node2] = nodes_to_compare.back();
+      nodes_to_compare.pop_back();
+      if (node1->value.has_value() != node2->value.has_value()) {
+        return false;
+      }
+      if (node1->value.has_value()) {
+        if (!(*node1->value == *node2->value)) return false;
+      }
+      if (node1->child.size() != node2->child.size()) {
+        return false;
+      }
+      for (const auto& [key, child1_ptr] : node1->child) {
+        auto it = node2->child.find(key);
+        if (it == node2->child.end()) {
+          return false;
+        }
+        nodes_to_compare.emplace_back(child1_ptr.get(), it->second.get());
+      }
+    }
+    return true;
+  }
+  bool operator!=(const TrieLookupTree& other) const {
+    return !(*this == other);
+  }
+
+ private:
+  struct TrieNode {
+    absl::flat_hash_map<uint8_t, std::unique_ptr<TrieNode>> child;
+    std::optional<Value> value;
+  };
+
+  void ForEachRecursive(
+      const TrieNode* node, std::string& current_key,
+      absl::FunctionRef<void(absl::string_view, const Value&)> cb) const {
+    // check for value and invoke cb
+    if (node->value.has_value()) {
+      cb(current_key, *node->value);
+    }
+    // Recurse on childeren
+    for (const auto& [character, child_node] : node->child) {
+      current_key.push_back(character);
+      ForEachRecursive(child_node.get(), current_key, cb);
+      current_key.pop_back();
+    }
+  }
+
+  std::unique_ptr<TrieNode> root_;
+};
+
+}  // namespace grpc_core
+
+#endif  // GRPC_SRC_CORE_UTIL_TRIE_LOOKUP_H

data/src/core/util/unique_ptr_with_bitset.h

@@ -18,7 +18,7 @@
 #include <memory>
 #include <utility>
 
-#include "absl/log/check.h"
+#include "src/core/util/grpc_check.h"
 #include "absl/numeric/bits.h"
 
 namespace grpc_core {
@@ -36,7 +36,7 @@ class UniquePtrWithBitset {
   UniquePtrWithBitset(std::unique_ptr<T>&& p)
       : UniquePtrWithBitset(p.release()) {}
   ~UniquePtrWithBitset() {
-    DCHECK_LE(kBits, static_cast<size_t>(absl::countr_zero(alignof(T))));
+    GRPC_DCHECK_LE(kBits, static_cast<size_t>(absl::countr_zero(alignof(T))));
     delete get();
   }
   UniquePtrWithBitset(const UniquePtrWithBitset&) = delete;
@@ -59,15 +59,15 @@ class UniquePtrWithBitset {
   }
 
   void SetBit(size_t bit) {
-    DCHECK_LT(bit, kBits);
+    GRPC_DCHECK_LT(bit, kBits);
     p_ |= 1 << bit;
   }
   void ClearBit(size_t bit) {
-    DCHECK_LT(bit, kBits);
+    GRPC_DCHECK_LT(bit, kBits);
     p_ &= ~(1 << bit);
   }
   bool TestBit(size_t bit) const {
-    DCHECK_LT(bit, kBits);
+    GRPC_DCHECK_LT(bit, kBits);
     return p_ & (1 << bit);
   }
 

data/src/core/util/unique_type_name.h

@@ -21,8 +21,8 @@
 
 #include <string>
 
-#include "absl/strings/string_view.h"
 #include "src/core/util/useful.h"
+#include "absl/strings/string_view.h"
 
 // Provides a type name that is unique by instance rather than by
 // string content.  This is useful in cases where there are different

data/src/core/util/upb_utils.h

@@ -21,11 +21,11 @@
 
 #include <string>
 
-#include "absl/strings/string_view.h"
 #include "google/protobuf/duration.upb.h"
 #include "google/protobuf/timestamp.upb.h"
 #include "upb/base/string_view.h"
 #include "upb/mem/arena.h"
+#include "absl/strings/string_view.h"
 
 namespace grpc_core {
 
@@ -46,6 +46,11 @@ inline upb_StringView CopyStdStringToUpbString(const T& str, upb_Arena* arena) {
   return upb_StringView_FromDataAndSize(copy, str.size());
 }
 
+inline upb_StringView CopyStdStringToUpbString(const char* str,
+                                               upb_Arena* arena) {
+  return CopyStdStringToUpbString(absl::string_view(str), arena);
+}
+
 inline absl::string_view UpbStringToAbsl(const upb_StringView& str) {
   return absl::string_view(str.data, str.size);
 }

data/src/core/util/validation_errors.cc

@@ -42,7 +42,7 @@ void ValidationErrors::AddError(absl::string_view error) {
             << max_error_count_ << ")";
     return;
   }
-  field_errors_[key].emplace_back(error);
+  field_errors_[key].emplace(error);
 }
 
 bool ValidationErrors::FieldHasErrors() const {
@@ -64,7 +64,7 @@ std::string ValidationErrors::message(absl::string_view prefix) const {
                                        absl::StrJoin(field_errors, "; "), "]"));
     } else {
       errors.emplace_back(
-          absl::StrCat("field:", field, " error:", field_errors[0]));
+          absl::StrCat("field:", field, " error:", *field_errors.begin()));
     }
   }
   return absl::StrCat(prefix, ": [", absl::StrJoin(errors, "; "), "]");

data/src/core/util/validation_errors.h

@@ -19,6 +19,7 @@
 #include <stddef.h>
 
 #include <map>
+#include <set>
 #include <string>
 #include <utility>
 #include <vector>
@@ -129,9 +130,7 @@ class ValidationErrors {
   void PopField() GPR_ATTRIBUTE_NOINLINE;
 
   // Errors that we have encountered so far, keyed by field name.
-  // TODO(roth): If we don't actually have any fields for which we
-  // report more than one error, simplify this data structure.
-  std::map<std::string /*field_name*/, std::vector<std::string>> field_errors_;
+  std::map<std::string /*field_name*/, std::set<std::string>> field_errors_;
   // Stack of field names indicating the field that we are currently
   // validating.
   std::vector<std::string> fields_;

data/src/core/util/wait_for_single_owner.h

@@ -17,10 +17,10 @@
 
 #include <memory>
 
-#include "absl/functional/any_invocable.h"
-#include "absl/log/log.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/time.h"
+#include "absl/functional/any_invocable.h"
+#include "absl/log/log.h"
 
 namespace grpc_core {
 

data/src/core/util/windows/directory_reader.cc

@@ -27,10 +27,10 @@
 #include <string>
 #include <vector>
 
+#include "src/core/util/directory_reader.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-#include "src/core/util/directory_reader.h"
 
 namespace grpc_core {
 

data/src/core/util/windows/stat.cc

@@ -22,11 +22,11 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include "absl/log/check.h"
-#include "absl/log/log.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/stat.h"
 #include "src/core/util/strerror.h"
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 
 namespace grpc_core {
 

data/src/core/util/windows/thd.cc

@@ -27,11 +27,11 @@
 #include <grpc/support/time.h>
 #include <string.h>
 
-#include "absl/log/check.h"
-#include "absl/log/log.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/memory.h"
 #include "src/core/util/thd.h"
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 
 namespace {
 class ThreadInternalsWindows;

data/src/core/util/windows/time.cc

@@ -27,8 +27,8 @@
 #include <process.h>
 #include <sys/timeb.h>
 
-#include "absl/log/check.h"
 #include "src/core/util/time_precise.h"
+#include "absl/log/check.h"
 
 static LARGE_INTEGER g_start_time = []() {
   LARGE_INTEGER x;

data/src/core/util/work_serializer.cc

@@ -28,9 +28,6 @@
 #include <thread>
 #include <utility>
 
-#include "absl/container/inlined_vector.h"
-#include "absl/log/check.h"
-#include "absl/log/log.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
@@ -41,6 +38,9 @@
 #include "src/core/util/mpscq.h"
 #include "src/core/util/orphanable.h"
 #include "src/core/util/sync.h"
+#include "absl/container/inlined_vector.h"
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 
 namespace grpc_core {
 

data/src/core/util/work_serializer.h

@@ -23,10 +23,10 @@
 #include <functional>
 #include <memory>
 
-#include "absl/base/thread_annotations.h"
-#include "absl/functional/any_invocable.h"
 #include "src/core/util/debug_location.h"
 #include "src/core/util/orphanable.h"
+#include "absl/base/thread_annotations.h"
+#include "absl/functional/any_invocable.h"
 
 namespace grpc_core {
 

data/src/core/xds/grpc/certificate_provider_store.cc

@@ -21,10 +21,10 @@
 #include <grpc/support/json.h>
 #include <grpc/support/port_platform.h>
 
-#include "absl/log/log.h"
-#include "absl/strings/str_cat.h"
 #include "src/core/config/core_configuration.h"
 #include "src/core/credentials/transport/tls/certificate_provider_registry.h"
+#include "absl/log/log.h"
+#include "absl/strings/str_cat.h"
 
 namespace grpc_core {
 

data/src/core/xds/grpc/certificate_provider_store.h

@@ -26,8 +26,6 @@
 #include <string>
 #include <utility>
 
-#include "absl/base/thread_annotations.h"
-#include "absl/strings/string_view.h"
 #include "src/core/credentials/transport/tls/certificate_provider_factory.h"
 #include "src/core/credentials/transport/tls/grpc_tls_certificate_distributor.h"
 #include "src/core/credentials/transport/tls/grpc_tls_certificate_provider.h"
@@ -40,6 +38,8 @@
 #include "src/core/util/unique_type_name.h"
 #include "src/core/util/useful.h"
 #include "src/core/util/validation_errors.h"
+#include "absl/base/thread_annotations.h"
+#include "absl/strings/string_view.h"
 
 namespace grpc_core {
 

data/src/core/xds/grpc/file_watcher_certificate_provider_factory.cc

@@ -25,13 +25,13 @@
 #include <memory>
 #include <vector>
 
-#include "absl/log/log.h"
-#include "absl/strings/str_format.h"
-#include "absl/strings/str_join.h"
 #include "src/core/config/core_configuration.h"
 #include "src/core/credentials/transport/tls/grpc_tls_certificate_provider.h"
 #include "src/core/util/down_cast.h"
 #include "src/core/util/env.h"
+#include "absl/log/log.h"
+#include "absl/strings/str_format.h"
+#include "absl/strings/str_join.h"
 
 namespace grpc_core {
 

data/src/core/xds/grpc/file_watcher_certificate_provider_factory.h

@@ -24,7 +24,6 @@
 
 #include <string>
 
-#include "absl/strings/string_view.h"
 #include "src/core/credentials/transport/tls/certificate_provider_factory.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_args.h"
@@ -32,6 +31,7 @@
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/time.h"
 #include "src/core/util/validation_errors.h"
+#include "absl/strings/string_view.h"
 
 namespace grpc_core {
 

data/src/core/xds/grpc/xds_audit_logger_registry.cc

@@ -22,9 +22,6 @@
 #include <string>
 #include <utility>
 
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
-#include "absl/strings/string_view.h"
 #include "envoy/config/core/v3/extension.upb.h"
 #include "envoy/config/rbac/v3/rbac.upb.h"
 #include "src/core/lib/security/authorization/audit_logging.h"
@@ -32,6 +29,9 @@
 #include "src/core/util/validation_errors.h"
 #include "src/core/xds/grpc/xds_common_types.h"
 #include "src/core/xds/grpc/xds_common_types_parser.h"
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/string_view.h"
 
 namespace grpc_core {
 

data/src/core/xds/grpc/xds_audit_logger_registry.h

@@ -22,11 +22,11 @@
 #include <map>
 #include <memory>
 
-#include "absl/strings/string_view.h"
 #include "envoy/config/rbac/v3/rbac.upb.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/validation_errors.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
+#include "absl/strings/string_view.h"
 
 namespace grpc_core {
 

data/src/core/xds/grpc/xds_bootstrap_grpc.cc

@@ -24,13 +24,6 @@
 #include <utility>
 #include <vector>
 
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
-#include "absl/strings/match.h"
-#include "absl/strings/str_cat.h"
-#include "absl/strings/str_format.h"
-#include "absl/strings/str_join.h"
-#include "absl/strings/string_view.h"
 #include "src/core/util/down_cast.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_object_loader.h"
@@ -38,6 +31,13 @@
 #include "src/core/util/json/json_writer.h"
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/string.h"
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/match.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/str_format.h"
+#include "absl/strings/str_join.h"
+#include "absl/strings/string_view.h"
 
 namespace grpc_core {
 

data/src/core/xds/grpc/xds_bootstrap_grpc.h

@@ -25,20 +25,20 @@
 #include <string>
 #include <vector>
 
-#include "absl/status/statusor.h"
-#include "absl/strings/string_view.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_args.h"
 #include "src/core/util/json/json_object_loader.h"
-#include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/validation_errors.h"
 #include "src/core/xds/grpc/certificate_provider_store.h"
 #include "src/core/xds/grpc/xds_audit_logger_registry.h"
 #include "src/core/xds/grpc/xds_cluster_specifier_plugin.h"
 #include "src/core/xds/grpc/xds_http_filter_registry.h"
 #include "src/core/xds/grpc/xds_lb_policy_registry.h"
+#include "src/core/xds/grpc/xds_matcher_input.h"
 #include "src/core/xds/grpc/xds_server_grpc.h"
 #include "src/core/xds/xds_client/xds_bootstrap.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/string_view.h"
 
 namespace grpc_core {
 
@@ -148,6 +148,10 @@ class GrpcXdsBootstrap final : public XdsBootstrap {
   const XdsAuditLoggerRegistry& audit_logger_registry() const {
     return audit_logger_registry_;
   }
+  const XdsMatcherInputRegistry<absl::string_view>&
+  matcher_string_input_registry() const {
+    return matcher_string_input_registry_;
+  }
 
   // Exposed for testing purposes only.
   const std::map<std::string, GrpcAuthority>& authorities() const {
@@ -165,6 +169,7 @@ class GrpcXdsBootstrap final : public XdsBootstrap {
   XdsClusterSpecifierPluginRegistry cluster_specifier_plugin_registry_;
   XdsLbPolicyRegistry lb_policy_registry_;
   XdsAuditLoggerRegistry audit_logger_registry_;
+  XdsMatcherInputRegistry<absl::string_view> matcher_string_input_registry_;
 };
 
 }  // namespace grpc_core

data/src/core/xds/grpc/xds_certificate_provider.cc

@@ -23,11 +23,11 @@
 #include <optional>
 #include <utility>
 
-#include "absl/functional/bind_front.h"
-#include "absl/log/check.h"
 #include "src/core/credentials/transport/tls/ssl_utils.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/error.h"
+#include "src/core/util/grpc_check.h"
+#include "absl/functional/bind_front.h"
 
 namespace grpc_core {
 
@@ -185,7 +185,7 @@ void XdsCertificateProvider::WatchStatusCallback(std::string cert_name,
     }
   } else if (!root_being_watched && root_cert_watcher_ != nullptr) {
     // Cancel root cert watch.
-    CHECK(root_cert_provider_ != nullptr);
+    GRPC_CHECK(root_cert_provider_ != nullptr);
     root_cert_provider_->distributor()->CancelTlsCertificatesWatch(
         root_cert_watcher_);
     root_cert_watcher_ = nullptr;
@@ -205,7 +205,7 @@ void XdsCertificateProvider::WatchStatusCallback(std::string cert_name,
           std::move(watcher), std::nullopt, identity_cert_name_);
     }
   } else if (!identity_being_watched && identity_cert_watcher_ != nullptr) {
-    CHECK(identity_cert_provider_ != nullptr);
+    GRPC_CHECK(identity_cert_provider_ != nullptr);
     identity_cert_provider_->distributor()->CancelTlsCertificatesWatch(
         identity_cert_watcher_);
     identity_cert_watcher_ = nullptr;

data/src/core/xds/grpc/xds_certificate_provider.h

@@ -28,8 +28,6 @@
 #include <string>
 #include <vector>
 
-#include "absl/base/thread_annotations.h"
-#include "absl/strings/string_view.h"
 #include "src/core/credentials/transport/tls/grpc_tls_certificate_distributor.h"
 #include "src/core/credentials/transport/tls/grpc_tls_certificate_provider.h"
 #include "src/core/util/matchers.h"
@@ -37,6 +35,8 @@
 #include "src/core/util/sync.h"
 #include "src/core/util/unique_type_name.h"
 #include "src/core/util/useful.h"
+#include "absl/base/thread_annotations.h"
+#include "absl/strings/string_view.h"
 
 namespace grpc_core {