diff options
| author | thegeorg <thegeorg@yandex-team.com> | 2022-11-09 12:13:47 +0300 |
|---|---|---|
| committer | thegeorg <thegeorg@yandex-team.com> | 2022-11-09 12:13:47 +0300 |
| commit | 80f5c1d76c74f49e72bece723f9c1b7a25852e70 (patch) | |
| tree | d00038bca499594f3b058936272dea3b69bf822e /contrib/libs/grpc/src/cpp | |
| parent | 41fc4a8aaa393fbb516c9e0edb6ffe98ab7097e5 (diff) | |
| download | ydb-80f5c1d76c74f49e72bece723f9c1b7a25852e70.tar.gz | |
Update contrib/libs/grpc to 1.44.0
Diffstat (limited to 'contrib/libs/grpc/src/cpp')
4 files changed, 12 insertions, 13 deletions
diff --git a/contrib/libs/grpc/src/cpp/common/channel_filter.cc b/contrib/libs/grpc/src/cpp/common/channel_filter.cc index 373aebf61b7..739e2da74bc 100644 --- a/contrib/libs/grpc/src/cpp/common/channel_filter.cc +++ b/contrib/libs/grpc/src/cpp/common/channel_filter.cc @@ -30,13 +30,14 @@ namespace grpc { // MetadataBatch -grpc_linked_mdelem* MetadataBatch::AddMetadata(const string& key, - const string& value) { - grpc_linked_mdelem* storage = new grpc_linked_mdelem; - storage->md = grpc_mdelem_from_slices(SliceFromCopiedString(key), - SliceFromCopiedString(value)); - GRPC_LOG_IF_ERROR("MetadataBatch::AddMetadata", batch_->LinkHead(storage)); - return storage; +void MetadataBatch::AddMetadata(const string& key, const string& value) { + batch_->Append(key, grpc_core::Slice::FromCopiedString(value), + [&](y_absl::string_view error, const grpc_core::Slice&) { + gpr_log(GPR_INFO, "%s", + y_absl::StrCat("MetadataBatch::AddMetadata error:", + error, " key=", key, " value=", value) + .c_str()); + }); } // ChannelData diff --git a/contrib/libs/grpc/src/cpp/common/channel_filter.h b/contrib/libs/grpc/src/cpp/common/channel_filter.h index 5364895e844..6e0830f977b 100644 --- a/contrib/libs/grpc/src/cpp/common/channel_filter.h +++ b/contrib/libs/grpc/src/cpp/common/channel_filter.h @@ -51,10 +51,8 @@ class MetadataBatch { grpc_metadata_batch* batch() const { return batch_; } - /// Adds metadata and returns the newly allocated storage. - /// The caller takes ownership of the result, which must exist for the - /// lifetime of the gRPC call. - grpc_linked_mdelem* AddMetadata(const string& key, const string& value); + /// Adds metadata. + void AddMetadata(const string& key, const string& value); private: grpc_metadata_batch* batch_; // Not owned. diff --git a/contrib/libs/grpc/src/cpp/common/validate_service_config.cc b/contrib/libs/grpc/src/cpp/common/validate_service_config.cc index fa0c3937924..e680d2c9822 100644 --- a/contrib/libs/grpc/src/cpp/common/validate_service_config.cc +++ b/contrib/libs/grpc/src/cpp/common/validate_service_config.cc @@ -19,7 +19,7 @@ #include <grpc/grpc.h> #include <grpcpp/support/validate_service_config.h> -#include "src/core/ext/service_config/service_config.h" +#include "src/core/lib/service_config/service_config.h" namespace grpc { namespace experimental { diff --git a/contrib/libs/grpc/src/cpp/common/version_cc.cc b/contrib/libs/grpc/src/cpp/common/version_cc.cc index 8054bda78bc..24bf9866c3d 100644 --- a/contrib/libs/grpc/src/cpp/common/version_cc.cc +++ b/contrib/libs/grpc/src/cpp/common/version_cc.cc @@ -22,5 +22,5 @@ #include <grpcpp/grpcpp.h> namespace grpc { -TString Version() { return "1.43.2"; } +TString Version() { return "1.44.0"; } } // namespace grpc |