Merge github.com:grpc/grpc into qps_driver

changes/16/217516/1
Craig Tiller 10 years ago
commit 47445219b3
  1. 3
      examples/pubsub/publisher_test.cc
  2. 3
      examples/pubsub/subscriber_test.cc
  3. 6
      include/grpc++/create_channel.h
  4. 4
      src/cpp/client/create_channel.cc
  5. 2
      src/node/examples/route_guide_server.js
  6. 2
      src/python/src/grpc/_adapter/rear.py
  7. 2
      test/cpp/end2end/async_end2end_test.cc
  8. 4
      test/cpp/end2end/end2end_test.cc
  9. 2
      test/cpp/util/create_test_channel.cc

@ -110,7 +110,8 @@ class PublisherTest : public ::testing::Test {
builder.RegisterService(&service_);
server_ = builder.BuildAndStart();
channel_ = CreateChannel(server_address_.str(), ChannelArguments());
channel_ =
CreateChannelDeprecated(server_address_.str(), ChannelArguments());
publisher_.reset(new grpc::examples::pubsub::Publisher(channel_));
}

@ -109,7 +109,8 @@ class SubscriberTest : public ::testing::Test {
builder.RegisterService(&service_);
server_ = builder.BuildAndStart();
channel_ = CreateChannel(server_address_.str(), ChannelArguments());
channel_ =
CreateChannelDeprecated(server_address_.str(), ChannelArguments());
subscriber_.reset(new grpc::examples::pubsub::Subscriber(channel_));
}

@ -43,8 +43,10 @@ namespace grpc {
class ChannelArguments;
class ChannelInterface;
std::shared_ptr<ChannelInterface> CreateChannel(const grpc::string& target,
const ChannelArguments& args);
// Deprecation warning: This function will soon be deleted
// (See pull request #711)
std::shared_ptr<ChannelInterface> CreateChannelDeprecated(
const grpc::string& target, const ChannelArguments& args);
// If creds does not hold an object or is invalid, a lame channel is returned.
std::shared_ptr<ChannelInterface> CreateChannel(

@ -40,8 +40,8 @@
namespace grpc {
class ChannelArguments;
std::shared_ptr<ChannelInterface> CreateChannel(const grpc::string &target,
const ChannelArguments &args) {
std::shared_ptr<ChannelInterface> CreateChannelDeprecated(
const grpc::string &target, const ChannelArguments &args) {
return std::shared_ptr<ChannelInterface>(new Channel(target, args));
}

@ -51,7 +51,7 @@ var COORD_FACTOR = 1e7;
var feature_list = [];
/**
* Get a feature object at the given point, or creates one if it does not exist.
* Get a feature object at the given point.
* @param {point} point The point to check
* @return {feature} The feature object at the point. Note that an empty name
* indicates no feature

@ -382,6 +382,8 @@ class _ActivatedRearLink(ticket_interfaces.RearLink, activated.Activated):
def join_fore_link(self, fore_link):
with self._lock:
self._fore_link = null.NULL_FORE_LINK if fore_link is None else fore_link
if self._rear_link is not None:
self._rear_link.join_fore_link(self._fore_link)
def _start(self):
with self._lock:

@ -105,7 +105,7 @@ class AsyncEnd2endTest : public ::testing::Test {
void ResetStub() {
std::shared_ptr<ChannelInterface> channel =
CreateChannel(server_address_.str(), ChannelArguments());
CreateChannelDeprecated(server_address_.str(), ChannelArguments());
stub_ = std::move(grpc::cpp::test::util::TestService::NewStub(channel));
}

@ -161,7 +161,7 @@ class End2endTest : public ::testing::Test {
void ResetStub() {
std::shared_ptr<ChannelInterface> channel =
CreateChannel(server_address_.str(), ChannelArguments());
CreateChannelDeprecated(server_address_.str(), ChannelArguments());
stub_ = std::move(grpc::cpp::test::util::TestService::NewStub(channel));
}
@ -372,7 +372,7 @@ TEST_F(End2endTest, BidiStream) {
// The two stubs are created on the same channel.
TEST_F(End2endTest, DiffPackageServices) {
std::shared_ptr<ChannelInterface> channel =
CreateChannel(server_address_.str(), ChannelArguments());
CreateChannelDeprecated(server_address_.str(), ChannelArguments());
EchoRequest request;
EchoResponse response;

@ -79,7 +79,7 @@ std::shared_ptr<ChannelInterface> CreateTestChannel(
}
return CreateChannel(connect_to, channel_creds, channel_args);
} else {
return CreateChannel(server, channel_args);
return CreateChannelDeprecated(server, channel_args);
}
}

Loading…
Cancel
Save