You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@bookkeeper.apache.org by GitBox <gi...@apache.org> on 2018/03/22 16:19:14 UTC
[GitHub] eolivelli closed pull request #1277: WIP - Use ByteBufOutputStream to serialize ProtoBuf messages
eolivelli closed pull request #1277: WIP - Use ByteBufOutputStream to serialize ProtoBuf messages
URL: https://github.com/apache/bookkeeper/pull/1277
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieProtoEncoding.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieProtoEncoding.java
index a45f94eaa..02e5402d0 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieProtoEncoding.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieProtoEncoding.java
@@ -20,7 +20,6 @@
*/
package org.apache.bookkeeper.proto;
-import com.google.protobuf.CodedOutputStream;
import com.google.protobuf.ExtensionRegistry;
import com.google.protobuf.InvalidProtocolBufferException;
import com.google.protobuf.MessageLite;
@@ -356,14 +355,12 @@ private static ByteBuf serializeProtobuf(MessageLite msg, ByteBufAllocator alloc
ByteBuf buf = allocator.heapBuffer(size, size);
try {
- msg.writeTo(CodedOutputStream.newInstance(buf.array(), buf.arrayOffset() + buf.writerIndex(), size));
+ msg.writeTo(new ByteBufOutputStream(buf));
} catch (IOException e) {
// This is in-memory serialization, should not fail
throw new RuntimeException(e);
}
- // Advance writer idx
- buf.writerIndex(buf.capacity());
return buf;
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services