Add TranscoderInputStreamImpl

bazel/repositories.bzl

@@ -84,7 +84,7 @@ def cc_grpc_httpjson_transcoding_dep():
     native.git_repository(
         name = "grpc_httpjson_transcoding",
         remote = "https://github.com/grpc-ecosystem/grpc-httpjson-transcoding.git",
-        commit = "193aa283914ba701c12cfdfa5967c1c4210468e3",
+        commit = "3a90dfd2e7300e8dd60b74f0f4085f2a0bfc499e",
     )
 
 # Bazel native C++ dependencies. For the depedencies that doesn't provide autoconf/automake builds.

source/common/buffer/BUILD

@@ -17,3 +17,13 @@ envoy_cc_library(
         "//source/common/event:libevent_lib",
     ],
 )
+
+envoy_cc_library(
+    name = "zero_copy_input_stream_lib",
+    srcs = ["zero_copy_input_stream_impl.cc"],
+    hdrs = ["zero_copy_input_stream_impl.h"],
+    external_deps = ["protobuf"],
+    deps = [
+        ":buffer_lib",
+    ],
+)

source/common/buffer/zero_copy_input_stream_impl.cc

@@ -0,0 +1,54 @@
+#include "common/buffer/zero_copy_input_stream_impl.h"
+
+#include "common/common/assert.h"
+
+namespace Envoy {
+namespace Buffer {
+
+ZeroCopyInputStreamImpl::ZeroCopyInputStreamImpl(Buffer::Instance& buffer) {
+  move(buffer);
+  finish();
+}
+
+void ZeroCopyInputStreamImpl::move(Buffer::Instance& instance) {
+  ASSERT(!finished_);
+
+  buffer_.move(instance);
+}
+
+bool ZeroCopyInputStreamImpl::Next(const void** data, int* size) {
+  if (position_ != 0) {
+    buffer_.drain(position_);
+    position_ = 0;
+  }
+
+  Buffer::RawSlice slice;
+  const uint64_t num_slices = buffer_.getRawSlices(&slice, 1);
+
+  if (num_slices > 0) {
+    *data = slice.mem_;
+    *size = slice.len_;
+    position_ = slice.len_;
+    byte_count_ += slice.len_;
+    return true;
+  }
+
+  if (!finished_) {
+    *data = nullptr;
+    *size = 0;
+    return true;
+  }
+  return false;
+}
+
+bool ZeroCopyInputStreamImpl::Skip(int) { NOT_IMPLEMENTED; }
+
+void ZeroCopyInputStreamImpl::BackUp(int count) {
+  ASSERT(count > 0);
+  ASSERT(uint64_t(count) < position_);
+
+  position_ -= count;
+  byte_count_ -= count;
+}
+}
+}

source/common/buffer/zero_copy_input_stream_impl.h

@@ -0,0 +1,47 @@
+#pragma once
+
+#include <cstdint>
+#include <string>
+
+#include "common/buffer/buffer_impl.h"
+
+#include "google/protobuf/io/zero_copy_stream.h"
+
+namespace Envoy {
+
+namespace Buffer {
+
+class ZeroCopyInputStreamImpl : public virtual google::protobuf::io::ZeroCopyInputStream {
+public:
+  // Create input stream with one buffer, and finish immediately
+  ZeroCopyInputStreamImpl(Buffer::Instance& buffer);
+
+  // Create input stream with empty buffer
+  ZeroCopyInputStreamImpl() {}
+
+  virtual ~ZeroCopyInputStreamImpl() {}
+
+  // Add a buffer to input stream, will consume all buffer from parameter
+  // if the stream is not finished
+  void move(Buffer::Instance& instance);
+
+  // Mark the buffer is finished
+  void finish() { finished_ = true; }
+
+  // google::protobuf::io::ZeroCopyInputStream
+  virtual bool Next(const void** data, int* size) override;
+  virtual void BackUp(int count) override;
+  virtual bool Skip(int count) override; // Not implemented
+  virtual google::protobuf::int64 ByteCount() const override { return byte_count_; }
+
+protected:
+  Buffer::OwnedImpl buffer_;
+  uint64_t position_{0};
+
+private:
+  bool finished_{false};
+  int64_t byte_count_{0};
+};
+
+} // namespace Buffer
+} // namespace Envoy

source/common/grpc/BUILD

@@ -15,6 +15,7 @@ envoy_cc_library(
         ":codec_lib",
         ":common_lib",
         "//include/envoy/grpc:async_client_interface",
+        "//source/common/buffer:zero_copy_input_stream_lib",
         "//source/common/http:async_client_lib",
     ],
 )
@@ -94,6 +95,7 @@ envoy_cc_library(
         ":common_lib",
         "//include/envoy/grpc:rpc_channel_interface",
         "//include/envoy/upstream:cluster_manager_interface",
+        "//source/common/buffer:zero_copy_input_stream_lib",
         "//source/common/common:assert_lib",
         "//source/common/common:enum_to_int",
         "//source/common/common:utility_lib",
@@ -102,3 +104,13 @@ envoy_cc_library(
         "//source/common/http:utility_lib",
     ],
 )
+
+envoy_cc_library(
+    name = "transcoder_input_stream_lib",
+    srcs = ["transcoder_input_stream_impl.cc"],
+    hdrs = ["transcoder_input_stream_impl.h"],
+    external_deps = ["grpc_transcoding"],
+    deps = [
+        "//source/common/buffer:zero_copy_input_stream_lib",
+    ],
+)

source/common/grpc/async_client_impl.h

@@ -2,6 +2,7 @@
 
 #include "envoy/grpc/async_client.h"
 
+#include "common/buffer/zero_copy_input_stream_impl.h"
 #include "common/common/enum_to_int.h"
 #include "common/common/linked_object.h"
 #include "common/grpc/codec.h"
@@ -108,12 +109,10 @@ class AsyncClientStreamImpl : public AsyncClientStream<RequestType>,
 
     for (const auto& frame : decoded_frames_) {
       std::unique_ptr<ResponseType> response(new ResponseType());
-      // TODO(htuch): We can avoid linearizing the buffer here when Buffer::Instance implements
-      // protobuf ZeroCopyInputStream.
       // TODO(htuch): Need to add support for compressed responses as well here.
-      if (frame.flags_ != GRPC_FH_DEFAULT ||
-          !response->ParseFromArray(frame.data_->linearize(frame.data_->length()),
-                                    frame.data_->length())) {
+      Buffer::ZeroCopyInputStreamImpl stream(*frame.data_);
+
+      if (frame.flags_ != GRPC_FH_DEFAULT || !response->ParseFromZeroCopyStream(&stream)) {
         streamError(Status::GrpcStatus::Internal);
         return;
       }

source/common/grpc/rpc_channel_impl.cc

@@ -3,6 +3,7 @@
 #include <cstdint>
 #include <string>
 
+#include "common/buffer/zero_copy_input_stream_impl.h"
 #include "common/common/enum_to_int.h"
 #include "common/common/utility.h"
 #include "common/grpc/common.h"
@@ -59,7 +60,8 @@ void RpcChannelImpl::onSuccess(Http::MessagePtr&& http_response) {
     }
 
     http_response->body()->drain(5);
-    if (!grpc_response_->ParseFromString(http_response->bodyAsString())) {
+    Buffer::ZeroCopyInputStreamImpl stream(*http_response->body());
+    if (!grpc_response_->ParseFromZeroCopyStream(&stream)) {
       throw Exception(Optional<uint64_t>(), "bad serialized body");
     }
 

source/common/grpc/transcoder_input_stream_impl.cc

@@ -0,0 +1,9 @@
+#include "common/grpc/transcoder_input_stream_impl.h"
+
+namespace Envoy {
+namespace Grpc {
+
+int64_t TranscoderInputStreamImpl::BytesAvailable() const { return buffer_.length() - position_; }
+
+} // namespace Grpc
+} // namespace Envoy

source/common/grpc/transcoder_input_stream_impl.h

@@ -0,0 +1,18 @@
+#pragma once
+
+#include "common/buffer/zero_copy_input_stream_impl.h"
+
+#include "grpc_transcoding/transcoder_input_stream.h"
+
+namespace Envoy {
+namespace Grpc {
+
+class TranscoderInputStreamImpl : public Buffer::ZeroCopyInputStreamImpl,
+                                  public google::grpc::transcoding::TranscoderInputStream {
+public:
+  // TranscoderInputStream
+  virtual int64_t BytesAvailable() const override;
+};
+
+} // namespace Grpc
+} // namespace Envoy

test/common/buffer/BUILD

@@ -0,0 +1,17 @@
+licenses(["notice"])  # Apache 2
+
+load(
+    "//bazel:envoy_build_system.bzl",
+    "envoy_cc_test",
+    "envoy_package",
+)
+
+envoy_package()
+
+envoy_cc_test(
+    name = "zero_copy_input_stream_test",
+    srcs = ["zero_copy_input_stream_test.cc"],
+    deps = [
+        "//source/common/buffer:zero_copy_input_stream_lib",
+    ],
+)

test/common/buffer/zero_copy_input_stream_test.cc

@@ -0,0 +1,78 @@
+#include "common/buffer/zero_copy_input_stream_impl.h"
+
+#include "gtest/gtest.h"
+
+namespace Envoy {
+namespace Buffer {
+namespace {
+
+class ZeroCopyInputStreamTest : public testing::Test {
+public:
+  ZeroCopyInputStreamTest() {
+    Buffer::OwnedImpl buffer{"abcd"};
+    stream_.move(buffer);
+  }
+
+  std::string slice_data_{"abcd"};
+  ZeroCopyInputStreamImpl stream_;
+
+  const void* data_;
+  int size_;
+};
+
+TEST_F(ZeroCopyInputStreamTest, Move) {
+  Buffer::OwnedImpl buffer{"abcd"};
+  stream_.move(buffer);
+
+  EXPECT_EQ(0, buffer.length());
+}
+
+TEST_F(ZeroCopyInputStreamTest, Next) {
+  EXPECT_TRUE(stream_.Next(&data_, &size_));
+  EXPECT_EQ(4, size_);
+  EXPECT_EQ(0, memcmp(slice_data_.data(), data_, size_));
+}
+
+TEST_F(ZeroCopyInputStreamTest, TwoSlices) {
+  Buffer::OwnedImpl buffer("efgh");
+
+  stream_.move(buffer);
+
+  EXPECT_TRUE(stream_.Next(&data_, &size_));
+  EXPECT_EQ(4, size_);
+  EXPECT_EQ(0, memcmp(slice_data_.data(), data_, size_));
+  EXPECT_TRUE(stream_.Next(&data_, &size_));
+  EXPECT_EQ(4, size_);
+  EXPECT_EQ(0, memcmp("efgh", data_, size_));
+}
+
+TEST_F(ZeroCopyInputStreamTest, BackUp) {
+  EXPECT_TRUE(stream_.Next(&data_, &size_));
+  EXPECT_EQ(4, size_);
+
+  stream_.BackUp(3);
+  EXPECT_EQ(1, stream_.ByteCount());
+
+  EXPECT_TRUE(stream_.Next(&data_, &size_));
+  EXPECT_EQ(3, size_);
+  EXPECT_EQ(0, memcmp("bcd", data_, size_));
+  EXPECT_EQ(4, stream_.ByteCount());
+}
+
+TEST_F(ZeroCopyInputStreamTest, ByteCount) {
+  EXPECT_EQ(0, stream_.ByteCount());
+  EXPECT_TRUE(stream_.Next(&data_, &size_));
+  EXPECT_EQ(4, stream_.ByteCount());
+}
+
+TEST_F(ZeroCopyInputStreamTest, Finish) {
+  EXPECT_TRUE(stream_.Next(&data_, &size_));
+  EXPECT_TRUE(stream_.Next(&data_, &size_));
+  EXPECT_EQ(0, size_);
+  stream_.finish();
+  EXPECT_FALSE(stream_.Next(&data_, &size_));
+}
+
+} // namespace
+} // namespace Buffer
+} // namespace Envoy

test/common/grpc/BUILD

@@ -81,3 +81,12 @@ envoy_cc_test(
         "//test/test_common:utility_lib",
     ],
 )
+
+envoy_cc_test(
+    name = "transcoder_input_stream_test",
+    srcs = ["transcoder_input_stream_test.cc"],
+    deps = [
+        "//source/common/buffer:buffer_lib",
+        "//source/common/grpc:transcoder_input_stream_lib",
+    ],
+)

test/common/grpc/transcoder_input_stream_test.cc

@@ -0,0 +1,47 @@
+#include "common/grpc/transcoder_input_stream_impl.h"
+
+#include "gtest/gtest.h"
+
+namespace Envoy {
+namespace Grpc {
+namespace {
+
+class TranscoderInputStreamTest : public testing::Test {
+public:
+  TranscoderInputStreamTest() {
+    Buffer::OwnedImpl buffer{"abcd"};
+    stream_.move(buffer);
+  }
+
+  std::string slice_data_{"abcd"};
+  TranscoderInputStreamImpl stream_;
+
+  const void* data_;
+  int size_;
+};
+
+TEST_F(TranscoderInputStreamTest, BytesAvailable) {
+  Buffer::OwnedImpl buffer{"abcd"};
+
+  stream_.move(buffer);
+  EXPECT_EQ(8, stream_.BytesAvailable());
+}
+
+TEST_F(TranscoderInputStreamTest, TwoSlices) {
+  Buffer::OwnedImpl buffer("efghi");
+
+  stream_.move(buffer);
+  EXPECT_EQ(9, stream_.BytesAvailable());
+}
+
+TEST_F(TranscoderInputStreamTest, BackUp) {
+  EXPECT_TRUE(stream_.Next(&data_, &size_));
+  EXPECT_EQ(4, size_);
+
+  stream_.BackUp(3);
+  EXPECT_EQ(3, stream_.BytesAvailable());
+}
+
+} // namespace
+} // namespace Grpc
+} // namespace Envoy