fix grpc: support ubuntu 20.04, minor fixes for old version

Tests: протестировано CI Pull Request resolved: #725 Co-authored-by: TTPO100AJIEX <[email protected]> commit_hash:a3b41a809bc74c3eb035429206e1c8508839b1c9
userver-framework · Oct 25, 2024 · 420fede · 420fede
1 parent 1ef0bd8
commit 420fede
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -156,6 +156,12 @@ jobs:
                   sudo apt install --allow-downgrades -y g++-8
                 fi
 
+                if [ "${{matrix.os}}" = "ubuntu-20.04" ]; then
+                  git clone --recursive -b v1.60.0 https://github.com/grpc/grpc new_grpc
+                  cmake -S./new_grpc -B./new_grpc/build
+                  cmake --build new_grpc/build -- -j4
+                  sudo cmake --install new_grpc/build
+                fi
 
           - name: Install RabbitMQ packages
             run: |

diff --git a/grpc/include/userver/ugrpc/field_mask.hpp b/grpc/include/userver/ugrpc/field_mask.hpp
@@ -116,7 +116,7 @@ class FieldMask {
 private:
     void ToGoogleMaskImpl(std::vector<std::string>& stack, google::protobuf::FieldMask& out) const;
 
-    utils::FastPimpl<utils::impl::TransparentMap<std::string, FieldMask, utils::StrCaseHash>, 88, 8> children_;
+    utils::FastPimpl<utils::impl::TransparentMap<std::string, FieldMask, utils::StrCaseHash>, 96, 8> children_;
     bool is_leaf_{false};
 };
 

diff --git a/grpc/src/ugrpc/impl/protobuf_utils.cpp b/grpc/src/ugrpc/impl/protobuf_utils.cpp
@@ -13,6 +13,8 @@
 #include <userver/utils/assert.hpp>
 #include <userver/utils/log.hpp>
 
+#include <userver/field_options.pb.h>
+
 USERVER_NAMESPACE_BEGIN
 
 namespace ugrpc::impl {
@@ -28,7 +30,7 @@ compiler::ThreadLocal kSecretVisitor = [] {
 
 }  // namespace
 
-userver::FieldOptions GetFieldOptions(const google::protobuf::FieldDescriptor& field) {
+const userver::FieldOptions& GetFieldOptions(const google::protobuf::FieldDescriptor& field) {
     return field.options().GetExtension(userver::field);
 }
 

diff --git a/grpc/src/ugrpc/impl/protobuf_utils.hpp b/grpc/src/ugrpc/impl/protobuf_utils.hpp
@@ -3,13 +3,24 @@
 #include <cstddef>
 #include <string>
 
-#include <userver/field_options.pb.h>
+namespace google::protobuf {
+
+class Message;
+class FieldDescriptor;
+
+}  // namespace google::protobuf
+
+namespace userver {
+
+class FieldOptions;
+
+}  // namespace userver
 
 USERVER_NAMESPACE_BEGIN
 
 namespace ugrpc::impl {
 
-userver::FieldOptions GetFieldOptions(const google::protobuf::FieldDescriptor& field);
+const userver::FieldOptions& GetFieldOptions(const google::protobuf::FieldDescriptor& field);
 
 bool IsMessage(const google::protobuf::FieldDescriptor& field);