File hadoop-dont-use-protobuf-internals.patch of Package hadoop

Overview Repositories Revisions Requests Users Attributes Meta

File hadoop-dont-use-protobuf-internals.patch of Package hadoop

diff -r -U3 hadoop-2.7.3-orig/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java hadoop-2.7.3/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java
--- hadoop-2.7.3-orig/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java	2016-08-12 04:29:35.000000000 +0100
+++ hadoop-2.7.3/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java	2017-01-16 10:50:28.379295676 +0000
@@ -56,7 +56,6 @@
 import com.google.protobuf.BlockingService;
 import com.google.protobuf.CodedOutputStream;
 import com.google.protobuf.Descriptors.MethodDescriptor;
-import com.google.protobuf.GeneratedMessage;
 import com.google.protobuf.Message;
 import com.google.protobuf.ServiceException;
 import com.google.protobuf.TextFormat;
@@ -310,7 +309,7 @@
    * Protobuf. Several methods on {@link org.apache.hadoop.ipc.Server and RPC} 
    * use type Writable as a wrapper to work across multiple RpcEngine kinds.
    */
-  private static abstract class RpcMessageWithHeader<T extends GeneratedMessage>
+  private static abstract class RpcMessageWithHeader<T extends Message>
     implements RpcWrapper {
     T requestHeader;
     Message theRequest; // for clientSide, the request is here
diff -r -U3 hadoop-2.7.3-orig/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormatProtobuf.java hadoop-2.7.3/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormatProtobuf.java
--- hadoop-2.7.3-orig/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormatProtobuf.java	2016-08-12 04:29:36.000000000 +0100
+++ hadoop-2.7.3/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormatProtobuf.java	2017-01-16 10:53:57.900316681 +0000
@@ -610,7 +610,7 @@
     }
   }
 
-  private static int getOndiskTrunkSize(com.google.protobuf.GeneratedMessage s) {
+  private static int getOndiskTrunkSize(com.google.protobuf.Message s) {
     return CodedOutputStream.computeRawVarint32Size(s.getSerializedSize())
         + s.getSerializedSize();
   }

Places

File hadoop-dont-use-protobuf-internals.patch of Package hadoop

Places