[kudu] branch master updated: [rpc] add kudu namespace to DnsResolver in generated code

[alexey]

This is an automated email from the ASF dual-hosted git repository.

alexey pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kudu.git


The following commit(s) were added to refs/heads/master by this push:
     new 50cc6f9  [rpc] add kudu namespace to DnsResolver in generated code
50cc6f9 is described below

commit 50cc6f99e2ed272208d01d663bc54e872e46e68b
Author: Andrew Wong <aw...@cloudera.com>
AuthorDate: Tue Oct 5 13:28:34 2021 -0700

    [rpc] add kudu namespace to DnsResolver in generated code
    
    When building service proxies in non-Kudu projects like Impala, the lack
    of the namespace could result in a build failure.
    
    Change-Id: Ia9a8c8a95256192267c2de7e61d7489f7af6e282
    Reviewed-on: http://gerrit.cloudera.org:8080/17968
    Reviewed-by: Alexey Serbin <aser...@cloudera.com>
    Tested-by: Alexey Serbin <aser...@cloudera.com>
---
 src/kudu/rpc/protoc-gen-krpc.cc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/kudu/rpc/protoc-gen-krpc.cc b/src/kudu/rpc/protoc-gen-krpc.cc
index e8d8e55..bdf11f7 100644
--- a/src/kudu/rpc/protoc-gen-krpc.cc
+++ b/src/kudu/rpc/protoc-gen-krpc.cc
@@ -422,6 +422,7 @@ class CodeGenerator : public 
::google::protobuf::compiler::CodeGenerator {
         "#include \"kudu/rpc/result_tracker.h\"\n"
         "#include \"kudu/rpc/service_if.h\"\n"
         "#include \"kudu/util/metrics.h\"\n"
+        "#include \"kudu/util/net/dns_resolver.h\"\n"
         "\n");
 
     // Define metric prototypes for each method in the service.
@@ -578,7 +579,7 @@ class CodeGenerator : public 
::google::protobuf::compiler::CodeGenerator {
           "  $service_name$Proxy(\n"
           "      std::shared_ptr<::kudu::rpc::Messenger> messenger,\n"
           "      const ::kudu::HostPort& hp,\n"
-          "      DnsResolver* dns_resolver);\n"
+          "      ::kudu::DnsResolver* dns_resolver);\n"
           "  ~$service_name$Proxy();\n");
 
       for (int method_idx = 0; method_idx < service->method_count();
@@ -620,6 +621,7 @@ class CodeGenerator : public 
::google::protobuf::compiler::CodeGenerator {
         "#include \"$path_no_extension$.proxy.h\"\n"
         "\n"
         "namespace kudu {\n"
+        "class DnsResolver;\n"
         "namespace rpc {\n"
         "class Messenger;\n"
         "class RpcController;\n"
@@ -646,7 +648,7 @@ class CodeGenerator : public 
::google::protobuf::compiler::CodeGenerator {
           "$service_name$Proxy::$service_name$Proxy(\n"
           "    std::shared_ptr<::kudu::rpc::Messenger> messenger,\n"
           "    const ::kudu::HostPort& hp,\n"
-          "    DnsResolver* dns_resolver)\n"
+          "    ::kudu::DnsResolver* dns_resolver)\n"
           "    : Proxy(std::move(messenger),\n"
           "            hp,\n"
           "            dns_resolver,\n"