You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by to...@apache.org on 2016/03/10 03:57:38 UTC
[1/2] incubator-kudu git commit: rpc: make generated Proxies subclass
Proxy
Repository: incubator-kudu
Updated Branches:
refs/heads/master 920e8aa84 -> 8b96035f9
rpc: make generated Proxies subclass Proxy
Rather than composition, inheritance actually makes sense, so that we don't
have to generate pass-through methods for everything we want to expose in the
Proxy.
Change-Id: If910b91b1ffcb48641d631ede728b6adbaecf9a9
Reviewed-on: http://gerrit.cloudera.org:8080/2511
Reviewed-by: Adar Dembo <ad...@cloudera.com>
Tested-by: Kudu Jenkins
Project: http://git-wip-us.apache.org/repos/asf/incubator-kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kudu/commit/5b5eff30
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kudu/tree/5b5eff30
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kudu/diff/5b5eff30
Branch: refs/heads/master
Commit: 5b5eff30e3f973b6b0651068031bc30838defede
Parents: 920e8aa
Author: Todd Lipcon <to...@apache.org>
Authored: Wed Mar 9 17:16:04 2016 -0800
Committer: Todd Lipcon <to...@apache.org>
Committed: Thu Mar 10 02:53:50 2016 +0000
----------------------------------------------------------------------
src/kudu/rpc/protoc-gen-krpc.cc | 24 ++++--------------------
1 file changed, 4 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kudu/blob/5b5eff30/src/kudu/rpc/protoc-gen-krpc.cc
----------------------------------------------------------------------
diff --git a/src/kudu/rpc/protoc-gen-krpc.cc b/src/kudu/rpc/protoc-gen-krpc.cc
index 4f3d250..bc6dd93 100644
--- a/src/kudu/rpc/protoc-gen-krpc.cc
+++ b/src/kudu/rpc/protoc-gen-krpc.cc
@@ -569,18 +569,12 @@ class CodeGenerator : public ::google::protobuf::compiler::CodeGenerator {
subs->PushService(service);
Print(printer, *subs,
- "class $service_name$Proxy {\n"
+ "class $service_name$Proxy : public ::kudu::rpc::Proxy {\n"
" public:\n"
" $service_name$Proxy(const std::shared_ptr< ::kudu::rpc::Messenger>\n"
" &messenger, const ::kudu::Sockaddr &sockaddr);\n"
" ~$service_name$Proxy();\n"
"\n"
- " // Set the user information for the connection.\n"
- " void set_user_credentials(const ::kudu::rpc::UserCredentials& user_credentials);\n"
- "\n"
- " // Get the current user information for the connection.\n"
- " const ::kudu::rpc::UserCredentials& user_credentials() const;\n"
- "\n"
);
for (int method_idx = 0; method_idx < service->method_count();
@@ -600,8 +594,6 @@ class CodeGenerator : public ::google::protobuf::compiler::CodeGenerator {
subs->Pop();
}
Print(printer, *subs,
- " private:\n"
- " ::kudu::rpc::Proxy proxy_;\n"
"};\n");
subs->Pop();
}
@@ -636,20 +628,12 @@ class CodeGenerator : public ::google::protobuf::compiler::CodeGenerator {
"$service_name$Proxy::$service_name$Proxy(\n"
" const std::shared_ptr< ::kudu::rpc::Messenger> &messenger,\n"
" const ::kudu::Sockaddr &remote)\n"
- " : proxy_(messenger, remote, \"$full_service_name$\") {\n"
+ " : Proxy(messenger, remote, \"$full_service_name$\") {\n"
"}\n"
"\n"
"$service_name$Proxy::~$service_name$Proxy() {\n"
"}\n"
"\n"
- "void $service_name$Proxy::set_user_credentials(\n"
- " const ::kudu::rpc::UserCredentials& user_credentials) {\n"
- " proxy_.set_user_credentials(user_credentials);\n"
- "}\n"
- "\n"
- "const ::kudu::rpc::UserCredentials& $service_name$Proxy::user_credentials() const {\n"
- " return proxy_.user_credentials();\n"
- "}\n"
"\n");
for (int method_idx = 0; method_idx < service->method_count();
++method_idx) {
@@ -658,13 +642,13 @@ class CodeGenerator : public ::google::protobuf::compiler::CodeGenerator {
Print(printer, *subs,
"::kudu::Status $service_name$Proxy::$rpc_name$(const $request$ &req, $response$ *resp,\n"
" ::kudu::rpc::RpcController *controller) {\n"
- " return proxy_.SyncRequest(\"$rpc_name$\", req, resp, controller);\n"
+ " return SyncRequest(\"$rpc_name$\", req, resp, controller);\n"
"}\n"
"\n"
"void $service_name$Proxy::$rpc_name$Async(const $request$ &req,\n"
" $response$ *resp, ::kudu::rpc::RpcController *controller,\n"
" const ::kudu::rpc::ResponseCallback &callback) {\n"
- " proxy_.AsyncRequest(\"$rpc_name$\", req, resp, controller, callback);\n"
+ " AsyncRequest(\"$rpc_name$\", req, resp, controller, callback);\n"
"}\n"
"\n");
subs->Pop();
[2/2] incubator-kudu git commit: net_util: fix warning for slow
GetFQDN
Posted by to...@apache.org.
net_util: fix warning for slow GetFQDN
Previously we printed the pointer value of the resulting
hostname instead of the actual string.
Change-Id: I4a20ebcca7d8e9ffba0b7b0819c5c929bf0794fe
Reviewed-on: http://gerrit.cloudera.org:8080/2512
Tested-by: Kudu Jenkins
Reviewed-by: Adar Dembo <ad...@cloudera.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kudu/commit/8b96035f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kudu/tree/8b96035f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kudu/diff/8b96035f
Branch: refs/heads/master
Commit: 8b96035f96d47214eeaea7a46baab109f673e51f
Parents: 5b5eff3
Author: Todd Lipcon <to...@apache.org>
Authored: Wed Mar 9 17:55:44 2016 -0800
Committer: Todd Lipcon <to...@apache.org>
Committed: Thu Mar 10 02:54:07 2016 +0000
----------------------------------------------------------------------
src/kudu/util/net/net_util.cc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kudu/blob/8b96035f/src/kudu/util/net/net_util.cc
----------------------------------------------------------------------
diff --git a/src/kudu/util/net/net_util.cc b/src/kudu/util/net/net_util.cc
index 7c7ed31..e1b174c 100644
--- a/src/kudu/util/net/net_util.cc
+++ b/src/kudu/util/net/net_util.cc
@@ -205,7 +205,8 @@ Status GetFQDN(string* hostname) {
struct addrinfo* result;
LOG_SLOW_EXECUTION(WARNING, 200,
- Substitute("looking up canonical hostname for localhost $0", hostname)) {
+ Substitute("looking up canonical hostname for localhost "
+ "(eventual result was $0)", *hostname)) {
TRACE_EVENT0("net", "getaddrinfo");
int rc = getaddrinfo(hostname->c_str(), nullptr, &hints, &result);
if (rc != 0) {