Resolve conflicts in ServerReaderWriterInterface Remove file server_streamed_unary.h and merge with sync_stream.hpull/7018/head
Vijay Pai
9 years ago
commit
de2aec8106
92 changed files with 441 additions and 574 deletions
@ -0,0 +1,8 @@ |
||||
Each version of gRPC gets a new description of what the 'g' stands for, since |
||||
we've never really been able to figure it out. |
||||
|
||||
Below is a list of already-used definitions (that should not be repeated in the |
||||
future), and the corresponding version numbers that used them: |
||||
|
||||
- 1.0 'g' stands for 'gRPC' |
||||
- 1.1 'g' stands for 'good' |
||||
@ -1,90 +0,0 @@ |
||||
/*
|
||||
* |
||||
* Copyright 2016, Google Inc. |
||||
* All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are |
||||
* met: |
||||
* |
||||
* * Redistributions of source code must retain the above copyright |
||||
* notice, this list of conditions and the following disclaimer. |
||||
* * Redistributions in binary form must reproduce the above |
||||
* copyright notice, this list of conditions and the following disclaimer |
||||
* in the documentation and/or other materials provided with the |
||||
* distribution. |
||||
* * Neither the name of Google Inc. nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* |
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
||||
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
||||
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
||||
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
||||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||
* |
||||
*/ |
||||
|
||||
#ifndef GRPCXX_IMPL_CODEGEN_SERVER_STREAMED_UNARY_H |
||||
#define GRPCXX_IMPL_CODEGEN_SERVER_STREAMED_UNARY_H |
||||
|
||||
#include <grpc++/impl/codegen/call.h> |
||||
#include <grpc++/impl/codegen/completion_queue.h> |
||||
#include <grpc++/impl/codegen/core_codegen_interface.h> |
||||
#include <grpc++/impl/codegen/server_context.h> |
||||
#include <grpc++/impl/codegen/sync_stream.h> |
||||
|
||||
namespace grpc { |
||||
/// A class to represent a flow-controlled unary call. This is something
|
||||
/// of a hybrid between conventional unary and streaming. This is invoked
|
||||
/// through a unary call on the client side, but the server responds to it
|
||||
/// as though it were a single-ping-pong streaming call. The server can use
|
||||
/// the \a NextMessageSize method to determine an upper-bound on the size of
|
||||
/// the message.
|
||||
/// A key difference relative to streaming: ServerUnaryStreamer
|
||||
/// must have exactly 1 Read and exactly 1 Write, in that order, to function
|
||||
/// correctly. Otherwise, the RPC is in error.
|
||||
template <class RequestType, class ResponseType> |
||||
class ServerUnaryStreamer GRPC_FINAL |
||||
: public ServerReaderWriterInterface<ResponseType, RequestType> { |
||||
public: |
||||
ServerUnaryStreamer(Call* call, ServerContext* ctx) |
||||
: ServerReaderWriterInterface<ResponseType, RequestType>(call, ctx), |
||||
read_done_(false), |
||||
write_done_(false) {} |
||||
|
||||
~ServerUnaryStreamer() {} |
||||
|
||||
bool Read(RequestType* request) GRPC_OVERRIDE { |
||||
if (read_done_) { |
||||
return false; |
||||
} |
||||
read_done_ = true; |
||||
return ServerReaderWriterInterface<ResponseType, RequestType>::Read( |
||||
request); |
||||
} |
||||
|
||||
using WriterInterface<ResponseType>::Write; |
||||
bool Write(const ResponseType& response, |
||||
const WriteOptions& options) GRPC_OVERRIDE { |
||||
if (write_done_ || !read_done_) { |
||||
return false; |
||||
} |
||||
write_done_ = true; |
||||
return ServerReaderWriterInterface<ResponseType, RequestType>::Write( |
||||
response, options); |
||||
} |
||||
|
||||
private: |
||||
bool read_done_; |
||||
bool write_done_; |
||||
}; |
||||
} // namespace grpc
|
||||
|
||||
#endif // GRPCXX_IMPL_CODEGEN_SERVER_STREAMED_UNARY_H
|
||||
@ -1,39 +0,0 @@ |
||||
/*
|
||||
* |
||||
* Copyright 2016, Google Inc. |
||||
* All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are |
||||
* met: |
||||
* |
||||
* * Redistributions of source code must retain the above copyright |
||||
* notice, this list of conditions and the following disclaimer. |
||||
* * Redistributions in binary form must reproduce the above |
||||
* copyright notice, this list of conditions and the following disclaimer |
||||
* in the documentation and/or other materials provided with the |
||||
* distribution. |
||||
* * Neither the name of Google Inc. nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* |
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
||||
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
||||
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
||||
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
||||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||
* |
||||
*/ |
||||
|
||||
#ifndef GRPCXX_SUPPORT_SERVER_STREAMED_UNARY_H |
||||
#define GRPCXX_SUPPORT_SERVER_STREAMED_UNARY_H |
||||
|
||||
#include <grpc++/impl/codegen/server_streamed_unary.h> |
||||
|
||||
#endif // GRPCXX_SUPPORT_SERVER_STREAMED_UNARY_H
|
||||
@ -1,135 +0,0 @@ |
||||
<?php |
||||
/* |
||||
* |
||||
* Copyright 2015, Google Inc. |
||||
* All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are |
||||
* met: |
||||
* |
||||
* * Redistributions of source code must retain the above copyright |
||||
* notice, this list of conditions and the following disclaimer. |
||||
* * Redistributions in binary form must reproduce the above |
||||
* copyright notice, this list of conditions and the following disclaimer |
||||
* in the documentation and/or other materials provided with the |
||||
* distribution. |
||||
* * Neither the name of Google Inc. nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* |
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
||||
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
||||
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
||||
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
||||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||
* |
||||
*/ |
||||
|
||||
class CallCredentials3Test extends PHPUnit_Framework_TestCase |
||||
{ |
||||
public function setUp() |
||||
{ |
||||
$this->credentials = Grpc\ChannelCredentials::createSsl( |
||||
file_get_contents(dirname(__FILE__).'/../data/ca.pem')); |
||||
$server_credentials = Grpc\ServerCredentials::createSsl( |
||||
null, |
||||
file_get_contents(dirname(__FILE__).'/../data/server1.key'), |
||||
file_get_contents(dirname(__FILE__).'/../data/server1.pem')); |
||||
$this->server = new Grpc\Server(); |
||||
$this->port = $this->server->addSecureHttp2Port('0.0.0.0:0', |
||||
$server_credentials); |
||||
$this->server->start(); |
||||
$this->host_override = 'foo.test.google.fr'; |
||||
$this->channel = new Grpc\Channel( |
||||
'localhost:'.$this->port, |
||||
[ |
||||
'grpc.ssl_target_name_override' => $this->host_override, |
||||
'grpc.default_authority' => $this->host_override, |
||||
'credentials' => $this->credentials, |
||||
] |
||||
); |
||||
} |
||||
|
||||
public function tearDown() |
||||
{ |
||||
unset($this->channel); |
||||
unset($this->server); |
||||
} |
||||
|
||||
public function callbackFunc($context) |
||||
{ |
||||
$this->assertTrue(is_string($context->service_url)); |
||||
$this->assertTrue(is_string($context->method_name)); |
||||
|
||||
return ['k1' => ['v1'], 'k2' => ['v2']]; |
||||
} |
||||
|
||||
public function testCreateFromPlugin() |
||||
{ |
||||
$deadline = Grpc\Timeval::infFuture(); |
||||
$status_text = 'xyz'; |
||||
$call = new Grpc\Call($this->channel, |
||||
'/abc/dummy_method', |
||||
$deadline, |
||||
$this->host_override); |
||||
|
||||
$call_credentials = Grpc\CallCredentials::createFromPlugin( |
||||
[$this, 'callbackFunc']); |
||||
$call->setCredentials($call_credentials); |
||||
|
||||
$event = $call->startBatch([ |
||||
Grpc\OP_SEND_INITIAL_METADATA => [], |
||||
Grpc\OP_SEND_CLOSE_FROM_CLIENT => true, |
||||
]); |
||||
|
||||
$this->assertTrue($event->send_metadata); |
||||
$this->assertTrue($event->send_close); |
||||
|
||||
$event = $this->server->requestCall(); |
||||
|
||||
$this->assertTrue(is_array($event->metadata)); |
||||
$metadata = $event->metadata; |
||||
$this->assertTrue(array_key_exists('k1', $metadata)); |
||||
$this->assertTrue(array_key_exists('k2', $metadata)); |
||||
$this->assertSame($metadata['k1'], ['v1']); |
||||
$this->assertSame($metadata['k2'], ['v2']); |
||||
|
||||
$this->assertSame('/abc/dummy_method', $event->method); |
||||
$server_call = $event->call; |
||||
|
||||
$event = $server_call->startBatch([ |
||||
Grpc\OP_SEND_INITIAL_METADATA => [], |
||||
Grpc\OP_SEND_STATUS_FROM_SERVER => [ |
||||
'metadata' => [], |
||||
'code' => Grpc\STATUS_OK, |
||||
'details' => $status_text, |
||||
], |
||||
Grpc\OP_RECV_CLOSE_ON_SERVER => true, |
||||
]); |
||||
|
||||
$this->assertTrue($event->send_metadata); |
||||
$this->assertTrue($event->send_status); |
||||
$this->assertFalse($event->cancelled); |
||||
|
||||
$event = $call->startBatch([ |
||||
Grpc\OP_RECV_INITIAL_METADATA => true, |
||||
Grpc\OP_RECV_STATUS_ON_CLIENT => true, |
||||
]); |
||||
|
||||
$this->assertSame([], $event->metadata); |
||||
$status = $event->status; |
||||
$this->assertSame([], $status->metadata); |
||||
$this->assertSame(Grpc\STATUS_OK, $status->code); |
||||
$this->assertSame($status_text, $status->details); |
||||
|
||||
unset($call); |
||||
unset($server_call); |
||||
} |
||||
} |
||||
Loading…
Reference in new issue