grpc 1.17.1 → 1.18.0.pre1

data/src/ruby/lib/grpc/generic/service.rb

@@ -95,7 +95,7 @@ module GRPC
         rpc_descs[name] = RpcDesc.new(name, input, output,
                                       marshal_class_method,
                                       unmarshal_class_method)
-        define_method(GenericService.underscore(name.to_s).to_sym) do |_, _|
+        define_method(GenericService.underscore(name.to_s).to_sym) do |*|
           fail GRPC::BadStatus.new_status_exception(
             GRPC::Core::StatusCodes::UNIMPLEMENTED)
         end

data/src/ruby/lib/grpc/version.rb

@@ -14,5 +14,5 @@
 
 # GRPC contains the General RPC module.
 module GRPC
-  VERSION = '1.17.1'
+  VERSION = '1.18.0.pre1'
 end

data/src/ruby/pb/grpc/health/checker.rb

@@ -14,7 +14,6 @@
 
 require 'grpc'
 require 'grpc/health/v1/health_services_pb'
-require 'thread'
 
 module Grpc
   # Health contains classes and modules that support providing a health check
@@ -37,9 +36,9 @@ module Grpc
         @status_mutex.synchronize do
           status = @statuses["#{req.service}"]
         end
-	if status.nil?
+        if status.nil?
           fail GRPC::BadStatus.new_status_exception(StatusCodes::NOT_FOUND)
-	end
+        end
         HealthCheckResponse.new(status: status)
       end
 

data/src/ruby/spec/generic/rpc_server_spec.rb

@@ -342,6 +342,28 @@ describe GRPC::RpcServer do
         t.join
       end
 
+      it 'should return UNIMPLEMENTED on unimplemented ' \
+         'methods for client_streamer', server: true do
+        @srv.handle(EchoService)
+        t = Thread.new { @srv.run }
+        @srv.wait_till_running
+        blk = proc do
+          stub = EchoStub.new(@host, :this_channel_is_insecure, **client_opts)
+          requests = [EchoMsg.new, EchoMsg.new]
+          stub.a_client_streaming_rpc_unimplemented(requests)
+        end
+
+        begin
+          expect(&blk).to raise_error do |error|
+            expect(error).to be_a(GRPC::BadStatus)
+            expect(error.code).to eq(GRPC::Core::StatusCodes::UNIMPLEMENTED)
+          end
+        ensure
+          @srv.stop # should be call not to crash
+          t.join
+        end
+      end
+
       it 'should handle multiple sequential requests', server: true do
         @srv.handle(EchoService)
         t = Thread.new { @srv.run }

data/src/ruby/spec/support/services.rb

@@ -33,6 +33,7 @@ class EchoService
   rpc :a_client_streaming_rpc, stream(EchoMsg), EchoMsg
   rpc :a_server_streaming_rpc, EchoMsg, stream(EchoMsg)
   rpc :a_bidi_rpc, stream(EchoMsg), stream(EchoMsg)
+  rpc :a_client_streaming_rpc_unimplemented, stream(EchoMsg), EchoMsg
   attr_reader :received_md
 
   def initialize(**kw)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grpc
 version: !ruby/object:Gem::Version
-  version: 1.17.1
+  version: 1.18.0.pre1
 platform: ruby
 authors:
 - gRPC Authors
 autorequire: 
 bindir: src/ruby/bin
 cert_chain: []
-date: 2018-12-13 00:00:00.000000000 Z
+date: 2019-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -314,7 +314,6 @@ files:
 - src/core/ext/filters/client_channel/lb_policy/xds/xds_client_stats.h
 - src/core/ext/filters/client_channel/lb_policy/xds/xds_load_balancer_api.cc
 - src/core/ext/filters/client_channel/lb_policy/xds/xds_load_balancer_api.h
-- src/core/ext/filters/client_channel/lb_policy_factory.cc
 - src/core/ext/filters/client_channel/lb_policy_factory.h
 - src/core/ext/filters/client_channel/lb_policy_registry.cc
 - src/core/ext/filters/client_channel/lb_policy_registry.h
@@ -324,6 +323,8 @@ files:
 - src/core/ext/filters/client_channel/proxy_mapper.h
 - src/core/ext/filters/client_channel/proxy_mapper_registry.cc
 - src/core/ext/filters/client_channel/proxy_mapper_registry.h
+- src/core/ext/filters/client_channel/request_routing.cc
+- src/core/ext/filters/client_channel/request_routing.h
 - src/core/ext/filters/client_channel/resolver.cc
 - src/core/ext/filters/client_channel/resolver.h
 - src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc
@@ -347,6 +348,8 @@ files:
 - src/core/ext/filters/client_channel/resolver_result_parsing.h
 - src/core/ext/filters/client_channel/retry_throttle.cc
 - src/core/ext/filters/client_channel/retry_throttle.h
+- src/core/ext/filters/client_channel/server_address.cc
+- src/core/ext/filters/client_channel/server_address.h
 - src/core/ext/filters/client_channel/subchannel.cc
 - src/core/ext/filters/client_channel/subchannel.h
 - src/core/ext/filters/client_channel/subchannel_index.cc
@@ -391,6 +394,8 @@ files:
 - src/core/ext/transport/chttp2/transport/chttp2_plugin.cc
 - src/core/ext/transport/chttp2/transport/chttp2_transport.cc
 - src/core/ext/transport/chttp2/transport/chttp2_transport.h
+- src/core/ext/transport/chttp2/transport/context_list.cc
+- src/core/ext/transport/chttp2/transport/context_list.h
 - src/core/ext/transport/chttp2/transport/flow_control.cc
 - src/core/ext/transport/chttp2/transport/flow_control.h
 - src/core/ext/transport/chttp2/transport/frame.h
@@ -556,6 +561,7 @@ files:
 - src/core/lib/iomgr/closure.h
 - src/core/lib/iomgr/combiner.cc
 - src/core/lib/iomgr/combiner.h
+- src/core/lib/iomgr/dynamic_annotations.h
 - src/core/lib/iomgr/endpoint.cc
 - src/core/lib/iomgr/endpoint.h
 - src/core/lib/iomgr/endpoint_pair.h
@@ -1576,48 +1582,47 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: GRPC system in Ruby
 test_files:
-- src/ruby/spec/google_rpc_status_utils_spec.rb
-- src/ruby/spec/channel_spec.rb
-- src/ruby/spec/compression_options_spec.rb
-- src/ruby/spec/time_consts_spec.rb
-- src/ruby/spec/spec_helper.rb
-- src/ruby/spec/client_server_spec.rb
-- src/ruby/spec/generic/rpc_server_pool_spec.rb
-- src/ruby/spec/generic/interceptor_registry_spec.rb
-- src/ruby/spec/generic/rpc_desc_spec.rb
-- src/ruby/spec/generic/active_call_spec.rb
-- src/ruby/spec/generic/client_interceptors_spec.rb
-- src/ruby/spec/generic/server_interceptors_spec.rb
-- src/ruby/spec/generic/rpc_server_spec.rb
-- src/ruby/spec/generic/client_stub_spec.rb
-- src/ruby/spec/generic/service_spec.rb
-- src/ruby/spec/support/services.rb
-- src/ruby/spec/support/helpers.rb
-- src/ruby/spec/server_spec.rb
 - src/ruby/spec/client_auth_spec.rb
-- src/ruby/spec/server_credentials_spec.rb
-- src/ruby/spec/channel_credentials_spec.rb
+- src/ruby/spec/support/helpers.rb
+- src/ruby/spec/support/services.rb
+- src/ruby/spec/call_spec.rb
 - src/ruby/spec/channel_connection_spec.rb
-- src/ruby/spec/pb/codegen/grpc/testing/package_options.proto
-- src/ruby/spec/pb/codegen/package_option_spec.rb
+- src/ruby/spec/time_consts_spec.rb
+- src/ruby/spec/server_credentials_spec.rb
+- src/ruby/spec/google_rpc_status_utils_spec.rb
 - src/ruby/spec/pb/duplicate/codegen_spec.rb
+- src/ruby/spec/pb/codegen/package_option_spec.rb
+- src/ruby/spec/pb/codegen/grpc/testing/package_options.proto
 - src/ruby/spec/pb/health/checker_spec.rb
 - src/ruby/spec/error_sanity_spec.rb
 - src/ruby/spec/call_credentials_spec.rb
-- src/ruby/spec/call_spec.rb
+- src/ruby/spec/compression_options_spec.rb
+- src/ruby/spec/channel_credentials_spec.rb
+- src/ruby/spec/channel_spec.rb
+- src/ruby/spec/client_server_spec.rb
 - src/ruby/spec/testdata/README
-- src/ruby/spec/testdata/ca.pem
 - src/ruby/spec/testdata/server1.key
-- src/ruby/spec/testdata/client.pem
 - src/ruby/spec/testdata/client.key
 - src/ruby/spec/testdata/server1.pem
+- src/ruby/spec/testdata/ca.pem
+- src/ruby/spec/testdata/client.pem
+- src/ruby/spec/server_spec.rb
+- src/ruby/spec/spec_helper.rb
+- src/ruby/spec/generic/service_spec.rb
+- src/ruby/spec/generic/client_interceptors_spec.rb
+- src/ruby/spec/generic/active_call_spec.rb
+- src/ruby/spec/generic/rpc_desc_spec.rb
+- src/ruby/spec/generic/client_stub_spec.rb
+- src/ruby/spec/generic/server_interceptors_spec.rb
+- src/ruby/spec/generic/interceptor_registry_spec.rb
+- src/ruby/spec/generic/rpc_server_spec.rb
+- src/ruby/spec/generic/rpc_server_pool_spec.rb

data/src/core/ext/filters/client_channel/lb_policy_factory.cc

@@ -1,163 +0,0 @@
-/*
- *
- * Copyright 2015 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.
- *
- */
-
-#include <grpc/support/port_platform.h>
-
-#include <string.h>
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
-
-#include "src/core/lib/channel/channel_args.h"
-
-#include "src/core/ext/filters/client_channel/lb_policy_factory.h"
-#include "src/core/ext/filters/client_channel/parse_address.h"
-
-grpc_lb_addresses* grpc_lb_addresses_create(
-    size_t num_addresses, const grpc_lb_user_data_vtable* user_data_vtable) {
-  grpc_lb_addresses* addresses =
-      static_cast<grpc_lb_addresses*>(gpr_zalloc(sizeof(grpc_lb_addresses)));
-  addresses->num_addresses = num_addresses;
-  addresses->user_data_vtable = user_data_vtable;
-  const size_t addresses_size = sizeof(grpc_lb_address) * num_addresses;
-  addresses->addresses =
-      static_cast<grpc_lb_address*>(gpr_zalloc(addresses_size));
-  return addresses;
-}
-
-grpc_lb_addresses* grpc_lb_addresses_copy(const grpc_lb_addresses* addresses) {
-  grpc_lb_addresses* new_addresses = grpc_lb_addresses_create(
-      addresses->num_addresses, addresses->user_data_vtable);
-  memcpy(new_addresses->addresses, addresses->addresses,
-         sizeof(grpc_lb_address) * addresses->num_addresses);
-  for (size_t i = 0; i < addresses->num_addresses; ++i) {
-    if (new_addresses->addresses[i].balancer_name != nullptr) {
-      new_addresses->addresses[i].balancer_name =
-          gpr_strdup(new_addresses->addresses[i].balancer_name);
-    }
-    if (new_addresses->addresses[i].user_data != nullptr) {
-      new_addresses->addresses[i].user_data = addresses->user_data_vtable->copy(
-          new_addresses->addresses[i].user_data);
-    }
-  }
-  return new_addresses;
-}
-
-void grpc_lb_addresses_set_address(grpc_lb_addresses* addresses, size_t index,
-                                   const void* address, size_t address_len,
-                                   bool is_balancer, const char* balancer_name,
-                                   void* user_data) {
-  GPR_ASSERT(index < addresses->num_addresses);
-  if (user_data != nullptr) GPR_ASSERT(addresses->user_data_vtable != nullptr);
-  grpc_lb_address* target = &addresses->addresses[index];
-  memcpy(target->address.addr, address, address_len);
-  target->address.len = static_cast<socklen_t>(address_len);
-  target->is_balancer = is_balancer;
-  target->balancer_name = gpr_strdup(balancer_name);
-  target->user_data = user_data;
-}
-
-bool grpc_lb_addresses_set_address_from_uri(grpc_lb_addresses* addresses,
-                                            size_t index, const grpc_uri* uri,
-                                            bool is_balancer,
-                                            const char* balancer_name,
-                                            void* user_data) {
-  grpc_resolved_address address;
-  if (!grpc_parse_uri(uri, &address)) return false;
-  grpc_lb_addresses_set_address(addresses, index, address.addr, address.len,
-                                is_balancer, balancer_name, user_data);
-  return true;
-}
-
-int grpc_lb_addresses_cmp(const grpc_lb_addresses* addresses1,
-                          const grpc_lb_addresses* addresses2) {
-  if (addresses1->num_addresses > addresses2->num_addresses) return 1;
-  if (addresses1->num_addresses < addresses2->num_addresses) return -1;
-  if (addresses1->user_data_vtable > addresses2->user_data_vtable) return 1;
-  if (addresses1->user_data_vtable < addresses2->user_data_vtable) return -1;
-  for (size_t i = 0; i < addresses1->num_addresses; ++i) {
-    const grpc_lb_address* target1 = &addresses1->addresses[i];
-    const grpc_lb_address* target2 = &addresses2->addresses[i];
-    if (target1->address.len > target2->address.len) return 1;
-    if (target1->address.len < target2->address.len) return -1;
-    int retval = memcmp(target1->address.addr, target2->address.addr,
-                        target1->address.len);
-    if (retval != 0) return retval;
-    if (target1->is_balancer > target2->is_balancer) return 1;
-    if (target1->is_balancer < target2->is_balancer) return -1;
-    const char* balancer_name1 =
-        target1->balancer_name != nullptr ? target1->balancer_name : "";
-    const char* balancer_name2 =
-        target2->balancer_name != nullptr ? target2->balancer_name : "";
-    retval = strcmp(balancer_name1, balancer_name2);
-    if (retval != 0) return retval;
-    if (addresses1->user_data_vtable != nullptr) {
-      retval = addresses1->user_data_vtable->cmp(target1->user_data,
-                                                 target2->user_data);
-      if (retval != 0) return retval;
-    }
-  }
-  return 0;
-}
-
-void grpc_lb_addresses_destroy(grpc_lb_addresses* addresses) {
-  for (size_t i = 0; i < addresses->num_addresses; ++i) {
-    gpr_free(addresses->addresses[i].balancer_name);
-    if (addresses->addresses[i].user_data != nullptr) {
-      addresses->user_data_vtable->destroy(addresses->addresses[i].user_data);
-    }
-  }
-  gpr_free(addresses->addresses);
-  gpr_free(addresses);
-}
-
-static void* lb_addresses_copy(void* addresses) {
-  return grpc_lb_addresses_copy(static_cast<grpc_lb_addresses*>(addresses));
-}
-static void lb_addresses_destroy(void* addresses) {
-  grpc_lb_addresses_destroy(static_cast<grpc_lb_addresses*>(addresses));
-}
-static int lb_addresses_cmp(void* addresses1, void* addresses2) {
-  return grpc_lb_addresses_cmp(static_cast<grpc_lb_addresses*>(addresses1),
-                               static_cast<grpc_lb_addresses*>(addresses2));
-}
-static const grpc_arg_pointer_vtable lb_addresses_arg_vtable = {
-    lb_addresses_copy, lb_addresses_destroy, lb_addresses_cmp};
-
-grpc_arg grpc_lb_addresses_create_channel_arg(
-    const grpc_lb_addresses* addresses) {
-  return grpc_channel_arg_pointer_create(
-      (char*)GRPC_ARG_LB_ADDRESSES, (void*)addresses, &lb_addresses_arg_vtable);
-}
-
-grpc_lb_addresses* grpc_lb_addresses_find_channel_arg(
-    const grpc_channel_args* channel_args) {
-  const grpc_arg* lb_addresses_arg =
-      grpc_channel_args_find(channel_args, GRPC_ARG_LB_ADDRESSES);
-  if (lb_addresses_arg == nullptr || lb_addresses_arg->type != GRPC_ARG_POINTER)
-    return nullptr;
-  return static_cast<grpc_lb_addresses*>(lb_addresses_arg->value.pointer.p);
-}
-
-bool grpc_lb_addresses_contains_balancer_address(
-    const grpc_lb_addresses& addresses) {
-  for (size_t i = 0; i < addresses.num_addresses; ++i) {
-    if (addresses.addresses[i].is_balancer) return true;
-  }
-  return false;
-}