You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cn...@apache.org on 2026/03/24 16:26:42 UTC
(hadoop) branch branch-3.5 updated: HADOOP-19843. Regenerate tracked proto2 source code
This is an automated email from the ASF dual-hosted git repository.
cnauroth pushed a commit to branch branch-3.5
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.5 by this push:
new d3e624908e2 HADOOP-19843. Regenerate tracked proto2 source code
d3e624908e2 is described below
commit d3e624908e234d96795b7d43711f8c5e4031bc8c
Author: Cheng Pan <ch...@apache.org>
AuthorDate: Tue Mar 24 16:18:51 2026 +0000
HADOOP-19843. Regenerate tracked proto2 source code
Closes #8350
Signed-off-by: Steve Loughran <st...@cloudera.com>
Signed-off-by: Chris Nauroth <cn...@apache.org>
---
.../src/main/resources/checkstyle/suppressions.xml | 1 +
hadoop-common-project/hadoop-common/pom.xml | 12 +-
.../ipc/protobuf/ProtobufRpcEngineProtos.java | 250 +++++++++++----------
.../org/apache/hadoop/ipc/protobuf/README.txt | 2 +
.../org/apache/hadoop/ipc/protobuf/README.txt | 2 +
.../hadoop/ipc/protobuf/TestProtosLegacy.java | 56 ++---
.../ipc/protobuf/TestRpcServiceProtosLegacy.java | 3 +-
7 files changed, 175 insertions(+), 151 deletions(-)
diff --git a/hadoop-build-tools/src/main/resources/checkstyle/suppressions.xml b/hadoop-build-tools/src/main/resources/checkstyle/suppressions.xml
index 7bc94797df8..80d86891c3e 100644
--- a/hadoop-build-tools/src/main/resources/checkstyle/suppressions.xml
+++ b/hadoop-build-tools/src/main/resources/checkstyle/suppressions.xml
@@ -18,4 +18,5 @@
<suppressions>
<suppress checks="JavadocPackage" files="[\\/]src[\\/]test[\\/].*"/>
+ <suppress checks="JavadocPackage" files="[\\/]src[\\/][\w\-]*generated[\\/].*"/>
</suppressions>
diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml
index 2cc96f2f1ce..ed3eb67e0e7 100644
--- a/hadoop-common-project/hadoop-common/pom.xml
+++ b/hadoop-common-project/hadoop-common/pom.xml
@@ -1152,13 +1152,13 @@
</plugins>
</build>
</profile>
- <!-- profile to use already generated protobuf code using 2.5.0 for aarch64-->
+ <!-- profile to use already generated protobuf code using 2.5.0 for non-x86_64-->
<profile>
- <id>aarch64</id>
+ <id>non-x86_64</id>
<activation>
<activeByDefault>false</activeByDefault>
<os>
- <arch>aarch64</arch>
+ <arch>!x86_64</arch>
</os>
</activation>
<build>
@@ -1175,7 +1175,7 @@
</goals>
<configuration>
<sources>
- <source>${basedir}/src/main/arm-java</source>
+ <source>${basedir}/src/main/proto2-generated</source>
</sources>
</configuration>
</execution>
@@ -1187,7 +1187,7 @@
</goals>
<configuration>
<sources>
- <source>${basedir}/src/test/arm-java</source>
+ <source>${basedir}/src/test/proto2-generated</source>
</sources>
</configuration>
</execution>
@@ -1202,7 +1202,7 @@
<activation>
<activeByDefault>false</activeByDefault>
<os>
- <arch>!aarch64</arch>
+ <arch>x86_64</arch>
</os>
</activation>
<build>
diff --git a/hadoop-common-project/hadoop-common/src/main/arm-java/org/apache/hadoop/ipc/protobuf/ProtobufRpcEngineProtos.java b/hadoop-common-project/hadoop-common/src/main/proto2-generated/org/apache/hadoop/ipc/protobuf/ProtobufRpcEngineProtos.java
similarity index 87%
rename from hadoop-common-project/hadoop-common/src/main/arm-java/org/apache/hadoop/ipc/protobuf/ProtobufRpcEngineProtos.java
rename to hadoop-common-project/hadoop-common/src/main/proto2-generated/org/apache/hadoop/ipc/protobuf/ProtobufRpcEngineProtos.java
index 28e28bf6337..8034d3f7fc3 100644
--- a/hadoop-common-project/hadoop-common/src/main/arm-java/org/apache/hadoop/ipc/protobuf/ProtobufRpcEngineProtos.java
+++ b/hadoop-common-project/hadoop-common/src/main/proto2-generated/org/apache/hadoop/ipc/protobuf/ProtobufRpcEngineProtos.java
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-// This is class is added to source because for arm protoc 2.5.0 executable
-// is not available to generate the same code.
+
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: ProtobufRpcEngine.proto
+
package org.apache.hadoop.ipc.protobuf;
public final class ProtobufRpcEngineProtos {
@@ -26,15 +26,16 @@ private ProtobufRpcEngineProtos() {}
public static void registerAllExtensions(
com.google.protobuf.ExtensionRegistry registry) {
}
- public interface RequestHeaderProtoOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ public interface RequestHeaderProtoOrBuilder extends
+ com.google.protobuf.GeneratedMessage.
+ ExtendableMessageOrBuilder<RequestHeaderProto> {
// required string methodName = 1;
/**
* <code>required string methodName = 1;</code>
*
* <pre>
- ** Name of the RPC method
+ ** Name of the RPC method
* </pre>
*/
boolean hasMethodName();
@@ -42,7 +43,7 @@ public interface RequestHeaderProtoOrBuilder
* <code>required string methodName = 1;</code>
*
* <pre>
- ** Name of the RPC method
+ ** Name of the RPC method
* </pre>
*/
java.lang.String getMethodName();
@@ -50,7 +51,7 @@ public interface RequestHeaderProtoOrBuilder
* <code>required string methodName = 1;</code>
*
* <pre>
- ** Name of the RPC method
+ ** Name of the RPC method
* </pre>
*/
com.google.protobuf.ByteString
@@ -61,15 +62,15 @@ public interface RequestHeaderProtoOrBuilder
* <code>required string declaringClassProtocolName = 2;</code>
*
* <pre>
- **
+ **
* RPCs for a particular interface (ie protocol) are done using a
* IPC connection that is setup using rpcProxy.
- * The rpcProxy's has a declared protocol name that is
- * sent form client to server at connection time.
- *
- * Each Rpc call also sends a protocol name
+ * The rpcProxy's has a declared protocol name that is
+ * sent form client to server at connection time.
+ *
+ * Each Rpc call also sends a protocol name
* (called declaringClassprotocolName). This name is usually the same
- * as the connection protocol name except in some cases.
+ * as the connection protocol name except in some cases.
* For example metaProtocols such ProtocolInfoProto which get metainfo
* about the protocol reuse the connection but need to indicate that
* the actual protocol is different (i.e. the protocol is
@@ -82,15 +83,15 @@ public interface RequestHeaderProtoOrBuilder
* <code>required string declaringClassProtocolName = 2;</code>
*
* <pre>
- **
+ **
* RPCs for a particular interface (ie protocol) are done using a
* IPC connection that is setup using rpcProxy.
- * The rpcProxy's has a declared protocol name that is
- * sent form client to server at connection time.
- *
- * Each Rpc call also sends a protocol name
+ * The rpcProxy's has a declared protocol name that is
+ * sent form client to server at connection time.
+ *
+ * Each Rpc call also sends a protocol name
* (called declaringClassprotocolName). This name is usually the same
- * as the connection protocol name except in some cases.
+ * as the connection protocol name except in some cases.
* For example metaProtocols such ProtocolInfoProto which get metainfo
* about the protocol reuse the connection but need to indicate that
* the actual protocol is different (i.e. the protocol is
@@ -103,15 +104,15 @@ public interface RequestHeaderProtoOrBuilder
* <code>required string declaringClassProtocolName = 2;</code>
*
* <pre>
- **
+ **
* RPCs for a particular interface (ie protocol) are done using a
* IPC connection that is setup using rpcProxy.
- * The rpcProxy's has a declared protocol name that is
- * sent form client to server at connection time.
- *
- * Each Rpc call also sends a protocol name
+ * The rpcProxy's has a declared protocol name that is
+ * sent form client to server at connection time.
+ *
+ * Each Rpc call also sends a protocol name
* (called declaringClassprotocolName). This name is usually the same
- * as the connection protocol name except in some cases.
+ * as the connection protocol name except in some cases.
* For example metaProtocols such ProtocolInfoProto which get metainfo
* about the protocol reuse the connection but need to indicate that
* the actual protocol is different (i.e. the protocol is
@@ -127,7 +128,7 @@ public interface RequestHeaderProtoOrBuilder
* <code>required uint64 clientProtocolVersion = 3;</code>
*
* <pre>
- ** protocol version of class declaring the called method
+ ** protocol version of class declaring the called method
* </pre>
*/
boolean hasClientProtocolVersion();
@@ -135,7 +136,7 @@ public interface RequestHeaderProtoOrBuilder
* <code>required uint64 clientProtocolVersion = 3;</code>
*
* <pre>
- ** protocol version of class declaring the called method
+ ** protocol version of class declaring the called method
* </pre>
*/
long getClientProtocolVersion();
@@ -150,14 +151,14 @@ public interface RequestHeaderProtoOrBuilder
* The actual request (serialized as protobuf) follows this request.
*
* No special header is needed for the Rpc Response for Protobuf Rpc Engine.
- * The normal RPC response header (see RpcHeader.proto) are sufficient.
+ * The normal RPC response header (see RpcHeader.proto) are sufficient.
* </pre>
*/
public static final class RequestHeaderProto extends
- com.google.protobuf.GeneratedMessage
- implements RequestHeaderProtoOrBuilder {
+ com.google.protobuf.GeneratedMessage.ExtendableMessage<
+ RequestHeaderProto> implements RequestHeaderProtoOrBuilder {
// Use RequestHeaderProto.newBuilder() to construct.
- private RequestHeaderProto(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+ private RequestHeaderProto(com.google.protobuf.GeneratedMessage.ExtendableBuilder<org.apache.hadoop.ipc.protobuf.ProtobufRpcEngineProtos.RequestHeaderProto, ?> builder) {
super(builder);
this.unknownFields = builder.getUnknownFields();
}
@@ -263,7 +264,7 @@ public com.google.protobuf.Parser<RequestHeaderProto> getParserForType() {
* <code>required string methodName = 1;</code>
*
* <pre>
- ** Name of the RPC method
+ ** Name of the RPC method
* </pre>
*/
public boolean hasMethodName() {
@@ -273,7 +274,7 @@ public boolean hasMethodName() {
* <code>required string methodName = 1;</code>
*
* <pre>
- ** Name of the RPC method
+ ** Name of the RPC method
* </pre>
*/
public java.lang.String getMethodName() {
@@ -281,7 +282,7 @@ public java.lang.String getMethodName() {
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
} else {
- com.google.protobuf.ByteString bs =
+ com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) {
@@ -294,14 +295,14 @@ public java.lang.String getMethodName() {
* <code>required string methodName = 1;</code>
*
* <pre>
- ** Name of the RPC method
+ ** Name of the RPC method
* </pre>
*/
public com.google.protobuf.ByteString
getMethodNameBytes() {
java.lang.Object ref = methodName_;
if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
methodName_ = b;
@@ -318,15 +319,15 @@ public java.lang.String getMethodName() {
* <code>required string declaringClassProtocolName = 2;</code>
*
* <pre>
- **
+ **
* RPCs for a particular interface (ie protocol) are done using a
* IPC connection that is setup using rpcProxy.
- * The rpcProxy's has a declared protocol name that is
- * sent form client to server at connection time.
- *
- * Each Rpc call also sends a protocol name
+ * The rpcProxy's has a declared protocol name that is
+ * sent form client to server at connection time.
+ *
+ * Each Rpc call also sends a protocol name
* (called declaringClassprotocolName). This name is usually the same
- * as the connection protocol name except in some cases.
+ * as the connection protocol name except in some cases.
* For example metaProtocols such ProtocolInfoProto which get metainfo
* about the protocol reuse the connection but need to indicate that
* the actual protocol is different (i.e. the protocol is
@@ -341,15 +342,15 @@ public boolean hasDeclaringClassProtocolName() {
* <code>required string declaringClassProtocolName = 2;</code>
*
* <pre>
- **
+ **
* RPCs for a particular interface (ie protocol) are done using a
* IPC connection that is setup using rpcProxy.
- * The rpcProxy's has a declared protocol name that is
- * sent form client to server at connection time.
- *
- * Each Rpc call also sends a protocol name
+ * The rpcProxy's has a declared protocol name that is
+ * sent form client to server at connection time.
+ *
+ * Each Rpc call also sends a protocol name
* (called declaringClassprotocolName). This name is usually the same
- * as the connection protocol name except in some cases.
+ * as the connection protocol name except in some cases.
* For example metaProtocols such ProtocolInfoProto which get metainfo
* about the protocol reuse the connection but need to indicate that
* the actual protocol is different (i.e. the protocol is
@@ -362,7 +363,7 @@ public java.lang.String getDeclaringClassProtocolName() {
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
} else {
- com.google.protobuf.ByteString bs =
+ com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) {
@@ -375,15 +376,15 @@ public java.lang.String getDeclaringClassProtocolName() {
* <code>required string declaringClassProtocolName = 2;</code>
*
* <pre>
- **
+ **
* RPCs for a particular interface (ie protocol) are done using a
* IPC connection that is setup using rpcProxy.
- * The rpcProxy's has a declared protocol name that is
- * sent form client to server at connection time.
- *
- * Each Rpc call also sends a protocol name
+ * The rpcProxy's has a declared protocol name that is
+ * sent form client to server at connection time.
+ *
+ * Each Rpc call also sends a protocol name
* (called declaringClassprotocolName). This name is usually the same
- * as the connection protocol name except in some cases.
+ * as the connection protocol name except in some cases.
* For example metaProtocols such ProtocolInfoProto which get metainfo
* about the protocol reuse the connection but need to indicate that
* the actual protocol is different (i.e. the protocol is
@@ -395,7 +396,7 @@ public java.lang.String getDeclaringClassProtocolName() {
getDeclaringClassProtocolNameBytes() {
java.lang.Object ref = declaringClassProtocolName_;
if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
declaringClassProtocolName_ = b;
@@ -412,7 +413,7 @@ public java.lang.String getDeclaringClassProtocolName() {
* <code>required uint64 clientProtocolVersion = 3;</code>
*
* <pre>
- ** protocol version of class declaring the called method
+ ** protocol version of class declaring the called method
* </pre>
*/
public boolean hasClientProtocolVersion() {
@@ -422,7 +423,7 @@ public boolean hasClientProtocolVersion() {
* <code>required uint64 clientProtocolVersion = 3;</code>
*
* <pre>
- ** protocol version of class declaring the called method
+ ** protocol version of class declaring the called method
* </pre>
*/
public long getClientProtocolVersion() {
@@ -451,6 +452,10 @@ public final boolean isInitialized() {
memoizedIsInitialized = 0;
return false;
}
+ if (!extensionsAreInitialized()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
memoizedIsInitialized = 1;
return true;
}
@@ -458,6 +463,9 @@ public final boolean isInitialized() {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
+ com.google.protobuf.GeneratedMessage
+ .ExtendableMessage<org.apache.hadoop.ipc.protobuf.ProtobufRpcEngineProtos.RequestHeaderProto>.ExtensionWriter extensionWriter =
+ newExtensionWriter();
if (((bitField0_ & 0x00000001) == 0x00000001)) {
output.writeBytes(1, getMethodNameBytes());
}
@@ -467,6 +475,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeUInt64(3, clientProtocolVersion_);
}
+ extensionWriter.writeUntil(536870912, output);
getUnknownFields().writeTo(output);
}
@@ -488,6 +497,7 @@ public int getSerializedSize() {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(3, clientProtocolVersion_);
}
+ size += extensionsSerializedSize();
size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size;
return size;
@@ -528,6 +538,8 @@ public boolean equals(final java.lang.Object obj) {
}
result = result &&
getUnknownFields().equals(other.getUnknownFields());
+ result = result &&
+ getExtensionFields().equals(other.getExtensionFields());
return result;
}
@@ -551,6 +563,7 @@ public int hashCode() {
hash = (37 * hash) + CLIENTPROTOCOLVERSION_FIELD_NUMBER;
hash = (53 * hash) + hashLong(getClientProtocolVersion());
}
+ hash = hashFields(hash, getExtensionFields());
hash = (29 * hash) + getUnknownFields().hashCode();
memoizedHashCode = hash;
return hash;
@@ -632,12 +645,12 @@ protected Builder newBuilderForType(
* The actual request (serialized as protobuf) follows this request.
*
* No special header is needed for the Rpc Response for Protobuf Rpc Engine.
- * The normal RPC response header (see RpcHeader.proto) are sufficient.
+ * The normal RPC response header (see RpcHeader.proto) are sufficient.
* </pre>
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
- implements org.apache.hadoop.ipc.protobuf.ProtobufRpcEngineProtos.RequestHeaderProtoOrBuilder {
+ com.google.protobuf.GeneratedMessage.ExtendableBuilder<
+ org.apache.hadoop.ipc.protobuf.ProtobufRpcEngineProtos.RequestHeaderProto, Builder> implements org.apache.hadoop.ipc.protobuf.ProtobufRpcEngineProtos.RequestHeaderProtoOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return org.apache.hadoop.ipc.protobuf.ProtobufRpcEngineProtos.internal_static_hadoop_common_RequestHeaderProto_descriptor;
@@ -745,21 +758,26 @@ public Builder mergeFrom(org.apache.hadoop.ipc.protobuf.ProtobufRpcEngineProtos.
if (other.hasClientProtocolVersion()) {
setClientProtocolVersion(other.getClientProtocolVersion());
}
+ this.mergeExtensionFields(other);
this.mergeUnknownFields(other.getUnknownFields());
return this;
}
public final boolean isInitialized() {
if (!hasMethodName()) {
-
+
return false;
}
if (!hasDeclaringClassProtocolName()) {
-
+
return false;
}
if (!hasClientProtocolVersion()) {
-
+
+ return false;
+ }
+ if (!extensionsAreInitialized()) {
+
return false;
}
return true;
@@ -790,7 +808,7 @@ public Builder mergeFrom(
* <code>required string methodName = 1;</code>
*
* <pre>
- ** Name of the RPC method
+ ** Name of the RPC method
* </pre>
*/
public boolean hasMethodName() {
@@ -800,7 +818,7 @@ public boolean hasMethodName() {
* <code>required string methodName = 1;</code>
*
* <pre>
- ** Name of the RPC method
+ ** Name of the RPC method
* </pre>
*/
public java.lang.String getMethodName() {
@@ -818,14 +836,14 @@ public java.lang.String getMethodName() {
* <code>required string methodName = 1;</code>
*
* <pre>
- ** Name of the RPC method
+ ** Name of the RPC method
* </pre>
*/
public com.google.protobuf.ByteString
getMethodNameBytes() {
java.lang.Object ref = methodName_;
if (ref instanceof String) {
- com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
methodName_ = b;
@@ -838,7 +856,7 @@ public java.lang.String getMethodName() {
* <code>required string methodName = 1;</code>
*
* <pre>
- ** Name of the RPC method
+ ** Name of the RPC method
* </pre>
*/
public Builder setMethodName(
@@ -855,7 +873,7 @@ public Builder setMethodName(
* <code>required string methodName = 1;</code>
*
* <pre>
- ** Name of the RPC method
+ ** Name of the RPC method
* </pre>
*/
public Builder clearMethodName() {
@@ -868,7 +886,7 @@ public Builder clearMethodName() {
* <code>required string methodName = 1;</code>
*
* <pre>
- ** Name of the RPC method
+ ** Name of the RPC method
* </pre>
*/
public Builder setMethodNameBytes(
@@ -888,15 +906,15 @@ public Builder setMethodNameBytes(
* <code>required string declaringClassProtocolName = 2;</code>
*
* <pre>
- **
+ **
* RPCs for a particular interface (ie protocol) are done using a
* IPC connection that is setup using rpcProxy.
- * The rpcProxy's has a declared protocol name that is
- * sent form client to server at connection time.
- *
- * Each Rpc call also sends a protocol name
+ * The rpcProxy's has a declared protocol name that is
+ * sent form client to server at connection time.
+ *
+ * Each Rpc call also sends a protocol name
* (called declaringClassprotocolName). This name is usually the same
- * as the connection protocol name except in some cases.
+ * as the connection protocol name except in some cases.
* For example metaProtocols such ProtocolInfoProto which get metainfo
* about the protocol reuse the connection but need to indicate that
* the actual protocol is different (i.e. the protocol is
@@ -911,15 +929,15 @@ public boolean hasDeclaringClassProtocolName() {
* <code>required string declaringClassProtocolName = 2;</code>
*
* <pre>
- **
+ **
* RPCs for a particular interface (ie protocol) are done using a
* IPC connection that is setup using rpcProxy.
- * The rpcProxy's has a declared protocol name that is
- * sent form client to server at connection time.
- *
- * Each Rpc call also sends a protocol name
+ * The rpcProxy's has a declared protocol name that is
+ * sent form client to server at connection time.
+ *
+ * Each Rpc call also sends a protocol name
* (called declaringClassprotocolName). This name is usually the same
- * as the connection protocol name except in some cases.
+ * as the connection protocol name except in some cases.
* For example metaProtocols such ProtocolInfoProto which get metainfo
* about the protocol reuse the connection but need to indicate that
* the actual protocol is different (i.e. the protocol is
@@ -942,15 +960,15 @@ public java.lang.String getDeclaringClassProtocolName() {
* <code>required string declaringClassProtocolName = 2;</code>
*
* <pre>
- **
+ **
* RPCs for a particular interface (ie protocol) are done using a
* IPC connection that is setup using rpcProxy.
- * The rpcProxy's has a declared protocol name that is
- * sent form client to server at connection time.
- *
- * Each Rpc call also sends a protocol name
+ * The rpcProxy's has a declared protocol name that is
+ * sent form client to server at connection time.
+ *
+ * Each Rpc call also sends a protocol name
* (called declaringClassprotocolName). This name is usually the same
- * as the connection protocol name except in some cases.
+ * as the connection protocol name except in some cases.
* For example metaProtocols such ProtocolInfoProto which get metainfo
* about the protocol reuse the connection but need to indicate that
* the actual protocol is different (i.e. the protocol is
@@ -962,7 +980,7 @@ public java.lang.String getDeclaringClassProtocolName() {
getDeclaringClassProtocolNameBytes() {
java.lang.Object ref = declaringClassProtocolName_;
if (ref instanceof String) {
- com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
declaringClassProtocolName_ = b;
@@ -975,15 +993,15 @@ public java.lang.String getDeclaringClassProtocolName() {
* <code>required string declaringClassProtocolName = 2;</code>
*
* <pre>
- **
+ **
* RPCs for a particular interface (ie protocol) are done using a
* IPC connection that is setup using rpcProxy.
- * The rpcProxy's has a declared protocol name that is
- * sent form client to server at connection time.
- *
- * Each Rpc call also sends a protocol name
+ * The rpcProxy's has a declared protocol name that is
+ * sent form client to server at connection time.
+ *
+ * Each Rpc call also sends a protocol name
* (called declaringClassprotocolName). This name is usually the same
- * as the connection protocol name except in some cases.
+ * as the connection protocol name except in some cases.
* For example metaProtocols such ProtocolInfoProto which get metainfo
* about the protocol reuse the connection but need to indicate that
* the actual protocol is different (i.e. the protocol is
@@ -1005,15 +1023,15 @@ public Builder setDeclaringClassProtocolName(
* <code>required string declaringClassProtocolName = 2;</code>
*
* <pre>
- **
+ **
* RPCs for a particular interface (ie protocol) are done using a
* IPC connection that is setup using rpcProxy.
- * The rpcProxy's has a declared protocol name that is
- * sent form client to server at connection time.
- *
- * Each Rpc call also sends a protocol name
+ * The rpcProxy's has a declared protocol name that is
+ * sent form client to server at connection time.
+ *
+ * Each Rpc call also sends a protocol name
* (called declaringClassprotocolName). This name is usually the same
- * as the connection protocol name except in some cases.
+ * as the connection protocol name except in some cases.
* For example metaProtocols such ProtocolInfoProto which get metainfo
* about the protocol reuse the connection but need to indicate that
* the actual protocol is different (i.e. the protocol is
@@ -1031,15 +1049,15 @@ public Builder clearDeclaringClassProtocolName() {
* <code>required string declaringClassProtocolName = 2;</code>
*
* <pre>
- **
+ **
* RPCs for a particular interface (ie protocol) are done using a
* IPC connection that is setup using rpcProxy.
- * The rpcProxy's has a declared protocol name that is
- * sent form client to server at connection time.
- *
- * Each Rpc call also sends a protocol name
+ * The rpcProxy's has a declared protocol name that is
+ * sent form client to server at connection time.
+ *
+ * Each Rpc call also sends a protocol name
* (called declaringClassprotocolName). This name is usually the same
- * as the connection protocol name except in some cases.
+ * as the connection protocol name except in some cases.
* For example metaProtocols such ProtocolInfoProto which get metainfo
* about the protocol reuse the connection but need to indicate that
* the actual protocol is different (i.e. the protocol is
@@ -1064,7 +1082,7 @@ public Builder setDeclaringClassProtocolNameBytes(
* <code>required uint64 clientProtocolVersion = 3;</code>
*
* <pre>
- ** protocol version of class declaring the called method
+ ** protocol version of class declaring the called method
* </pre>
*/
public boolean hasClientProtocolVersion() {
@@ -1074,7 +1092,7 @@ public boolean hasClientProtocolVersion() {
* <code>required uint64 clientProtocolVersion = 3;</code>
*
* <pre>
- ** protocol version of class declaring the called method
+ ** protocol version of class declaring the called method
* </pre>
*/
public long getClientProtocolVersion() {
@@ -1084,7 +1102,7 @@ public long getClientProtocolVersion() {
* <code>required uint64 clientProtocolVersion = 3;</code>
*
* <pre>
- ** protocol version of class declaring the called method
+ ** protocol version of class declaring the called method
* </pre>
*/
public Builder setClientProtocolVersion(long value) {
@@ -1097,7 +1115,7 @@ public Builder setClientProtocolVersion(long value) {
* <code>required uint64 clientProtocolVersion = 3;</code>
*
* <pre>
- ** protocol version of class declaring the called method
+ ** protocol version of class declaring the called method
* </pre>
*/
public Builder clearClientProtocolVersion() {
@@ -1133,11 +1151,11 @@ public Builder clearClientProtocolVersion() {
static {
java.lang.String[] descriptorData = {
"\n\027ProtobufRpcEngine.proto\022\rhadoop.common" +
- "\"k\n\022RequestHeaderProto\022\022\n\nmethodName\030\001 \002" +
+ "\"v\n\022RequestHeaderProto\022\022\n\nmethodName\030\001 \002" +
"(\t\022\"\n\032declaringClassProtocolName\030\002 \002(\t\022\035" +
- "\n\025clientProtocolVersion\030\003 \002(\004B<\n\036org.apa" +
- "che.hadoop.ipc.protobufB\027ProtobufRpcEngi" +
- "neProtos\240\001\001"
+ "\n\025clientProtocolVersion\030\003 \002(\004*\t\010\350\007\020\200\200\200\200\002" +
+ "B<\n\036org.apache.hadoop.ipc.protobufB\027Prot" +
+ "obufRpcEngineProtos\240\001\001"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
diff --git a/hadoop-common-project/hadoop-common/src/main/proto2-generated/org/apache/hadoop/ipc/protobuf/README.txt b/hadoop-common-project/hadoop-common/src/main/proto2-generated/org/apache/hadoop/ipc/protobuf/README.txt
new file mode 100644
index 00000000000..042bf7a725f
--- /dev/null
+++ b/hadoop-common-project/hadoop-common/src/main/proto2-generated/org/apache/hadoop/ipc/protobuf/README.txt
@@ -0,0 +1,2 @@
+Classes under this folder are added to source because for non-x86_64 platforms
+protoc 2.5.0 executable is not available to generate the same code.
diff --git a/hadoop-common-project/hadoop-common/src/test/proto2-generated/org/apache/hadoop/ipc/protobuf/README.txt b/hadoop-common-project/hadoop-common/src/test/proto2-generated/org/apache/hadoop/ipc/protobuf/README.txt
new file mode 100644
index 00000000000..042bf7a725f
--- /dev/null
+++ b/hadoop-common-project/hadoop-common/src/test/proto2-generated/org/apache/hadoop/ipc/protobuf/README.txt
@@ -0,0 +1,2 @@
+Classes under this folder are added to source because for non-x86_64 platforms
+protoc 2.5.0 executable is not available to generate the same code.
diff --git a/hadoop-common-project/hadoop-common/src/test/arm-java/org/apache/hadoop/ipc/protobuf/TestProtosLegacy.java b/hadoop-common-project/hadoop-common/src/test/proto2-generated/org/apache/hadoop/ipc/protobuf/TestProtosLegacy.java
similarity index 99%
rename from hadoop-common-project/hadoop-common/src/test/arm-java/org/apache/hadoop/ipc/protobuf/TestProtosLegacy.java
rename to hadoop-common-project/hadoop-common/src/test/proto2-generated/org/apache/hadoop/ipc/protobuf/TestProtosLegacy.java
index 0a7c1f917ba..370f8916d76 100644
--- a/hadoop-common-project/hadoop-common/src/test/arm-java/org/apache/hadoop/ipc/protobuf/TestProtosLegacy.java
+++ b/hadoop-common-project/hadoop-common/src/test/proto2-generated/org/apache/hadoop/ipc/protobuf/TestProtosLegacy.java
@@ -15,8 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-// This is class is added to source because for arm protoc 2.5.0 executable
-// is not available to generate the same code.
+
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: test_legacy.proto
@@ -834,7 +833,7 @@ public java.lang.String getMessage() {
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
} else {
- com.google.protobuf.ByteString bs =
+ com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) {
@@ -850,7 +849,7 @@ public java.lang.String getMessage() {
getMessageBytes() {
java.lang.Object ref = message_;
if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
message_ = b;
@@ -1110,6 +1109,7 @@ public Builder mergeFrom(org.apache.hadoop.ipc.protobuf.TestProtosLegacy.EchoReq
public final boolean isInitialized() {
if (!hasMessage()) {
+
return false;
}
return true;
@@ -1163,7 +1163,7 @@ public java.lang.String getMessage() {
getMessageBytes() {
java.lang.Object ref = message_;
if (ref instanceof String) {
- com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
message_ = b;
@@ -1350,7 +1350,7 @@ public java.lang.String getMessage() {
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
} else {
- com.google.protobuf.ByteString bs =
+ com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) {
@@ -1366,7 +1366,7 @@ public java.lang.String getMessage() {
getMessageBytes() {
java.lang.Object ref = message_;
if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
message_ = b;
@@ -1626,6 +1626,7 @@ public Builder mergeFrom(org.apache.hadoop.ipc.protobuf.TestProtosLegacy.EchoRes
public final boolean isInitialized() {
if (!hasMessage()) {
+
return false;
}
return true;
@@ -1679,7 +1680,7 @@ public java.lang.String getMessage() {
getMessageBytes() {
java.lang.Object ref = message_;
if (ref instanceof String) {
- com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
message_ = b;
@@ -1866,7 +1867,7 @@ public java.lang.String getMessage() {
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
} else {
- com.google.protobuf.ByteString bs =
+ com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) {
@@ -1882,7 +1883,7 @@ public java.lang.String getMessage() {
getMessageBytes() {
java.lang.Object ref = message_;
if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
message_ = b;
@@ -2188,7 +2189,7 @@ public java.lang.String getMessage() {
getMessageBytes() {
java.lang.Object ref = message_;
if (ref instanceof String) {
- com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
message_ = b;
@@ -2375,7 +2376,7 @@ public java.lang.String getMessage() {
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
} else {
- com.google.protobuf.ByteString bs =
+ com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) {
@@ -2391,7 +2392,7 @@ public java.lang.String getMessage() {
getMessageBytes() {
java.lang.Object ref = message_;
if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
message_ = b;
@@ -2697,7 +2698,7 @@ public java.lang.String getMessage() {
getMessageBytes() {
java.lang.Object ref = message_;
if (ref instanceof String) {
- com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
message_ = b;
@@ -3126,6 +3127,7 @@ public Builder mergeFrom(org.apache.hadoop.ipc.protobuf.TestProtosLegacy.SleepRe
public final boolean isInitialized() {
if (!hasMilliSeconds()) {
+
return false;
}
return true;
@@ -3905,7 +3907,7 @@ public Builder mergeFrom(org.apache.hadoop.ipc.protobuf.TestProtosLegacy.SlowPin
public final boolean isInitialized() {
if (!hasShouldSlow()) {
-
+
return false;
}
return true;
@@ -5472,11 +5474,11 @@ public Builder mergeFrom(org.apache.hadoop.ipc.protobuf.TestProtosLegacy.AddRequ
public final boolean isInitialized() {
if (!hasParam1()) {
-
+
return false;
}
if (!hasParam2()) {
-
+
return false;
}
return true;
@@ -6455,7 +6457,7 @@ public Builder mergeFrom(org.apache.hadoop.ipc.protobuf.TestProtosLegacy.AddResp
public final boolean isInitialized() {
if (!hasResult()) {
-
+
return false;
}
return true;
@@ -7694,7 +7696,7 @@ public java.lang.String getMechanismName() {
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
} else {
- com.google.protobuf.ByteString bs =
+ com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) {
@@ -7710,7 +7712,7 @@ public java.lang.String getMechanismName() {
getMechanismNameBytes() {
java.lang.Object ref = mechanismName_;
if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
mechanismName_ = b;
@@ -8000,11 +8002,11 @@ public Builder mergeFrom(org.apache.hadoop.ipc.protobuf.TestProtosLegacy.AuthMet
public final boolean isInitialized() {
if (!hasCode()) {
-
+
return false;
}
if (!hasMechanismName()) {
-
+
return false;
}
return true;
@@ -8091,7 +8093,7 @@ public java.lang.String getMechanismName() {
getMechanismNameBytes() {
java.lang.Object ref = mechanismName_;
if (ref instanceof String) {
- com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
mechanismName_ = b;
@@ -8278,7 +8280,7 @@ public java.lang.String getUser() {
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
} else {
- com.google.protobuf.ByteString bs =
+ com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) {
@@ -8294,7 +8296,7 @@ public java.lang.String getUser() {
getUserBytes() {
java.lang.Object ref = user_;
if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
user_ = b;
@@ -8554,7 +8556,7 @@ public Builder mergeFrom(org.apache.hadoop.ipc.protobuf.TestProtosLegacy.UserRes
public final boolean isInitialized() {
if (!hasUser()) {
-
+
return false;
}
return true;
@@ -8608,7 +8610,7 @@ public java.lang.String getUser() {
getUserBytes() {
java.lang.Object ref = user_;
if (ref instanceof String) {
- com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
user_ = b;
diff --git a/hadoop-common-project/hadoop-common/src/test/arm-java/org/apache/hadoop/ipc/protobuf/TestRpcServiceProtosLegacy.java b/hadoop-common-project/hadoop-common/src/test/proto2-generated/org/apache/hadoop/ipc/protobuf/TestRpcServiceProtosLegacy.java
similarity index 99%
rename from hadoop-common-project/hadoop-common/src/test/arm-java/org/apache/hadoop/ipc/protobuf/TestRpcServiceProtosLegacy.java
rename to hadoop-common-project/hadoop-common/src/test/proto2-generated/org/apache/hadoop/ipc/protobuf/TestRpcServiceProtosLegacy.java
index 26cef9c7552..0bd89963cdf 100644
--- a/hadoop-common-project/hadoop-common/src/test/arm-java/org/apache/hadoop/ipc/protobuf/TestRpcServiceProtosLegacy.java
+++ b/hadoop-common-project/hadoop-common/src/test/proto2-generated/org/apache/hadoop/ipc/protobuf/TestRpcServiceProtosLegacy.java
@@ -15,8 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-// This is class is added to source because for arm protoc 2.5.0 executable
-// is not available to generate the same code.
+
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: test_rpc_service_legacy.proto
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org