This is an automated email from the ASF dual-hosted git repository.
dlmarion pushed a commit to branch 2.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/2.1 by this push:
new e88583f681 Regenerated protobuf files with protoc 25.6 (#5467)
e88583f681 is described below
commit e88583f681f6ef1d9f1999c44d06feba509c1d4c
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Thu Apr 10 15:09:22 2025 -0400
Regenerated protobuf files with protoc 25.6 (#5467)
https://github.com/protocolbuffers/protobuf/pull/20084 introduced
an exception when a recent protobuf-java library processed a
protobuf generated object that was created with an older version
of protoc. Regenerated the protobuf files so that users that are
using replication don't run into this error.
Closes #5462
---
.../server/replication/proto/Replication.java | 197 ++++++++++-----------
server/base/src/main/scripts/generate-protobuf.sh | 2 +-
2 files changed, 91 insertions(+), 108 deletions(-)
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/replication/proto/Replication.java
b/server/base/src/main/java/org/apache/accumulo/server/replication/proto/Replication.java
index 3a5c9ebbed..65d38895b6 100644
---
a/server/base/src/main/java/org/apache/accumulo/server/replication/proto/Replication.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/replication/proto/Replication.java
@@ -19,6 +19,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: src/main/protobuf/replication.proto
+// Protobuf Java Version: 3.25.6
package org.apache.accumulo.server.replication.proto;
@SuppressWarnings("unused") public final class Replication {
@@ -153,74 +154,6 @@ package org.apache.accumulo.server.replication.proto;
return new Status();
}
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet
- getUnknownFields() {
- return this.unknownFields;
- }
- private Status(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
- this();
- if (extensionRegistry == null) {
- throw new java.lang.NullPointerException();
- }
- int mutable_bitField0_ = 0;
- com.google.protobuf.UnknownFieldSet.Builder unknownFields =
- com.google.protobuf.UnknownFieldSet.newBuilder();
- try {
- boolean done = false;
- while (!done) {
- int tag = input.readTag();
- switch (tag) {
- case 0:
- done = true;
- break;
- case 8: {
- bitField0_ |= 0x00000001;
- begin_ = input.readInt64();
- break;
- }
- case 16: {
- bitField0_ |= 0x00000002;
- end_ = input.readInt64();
- break;
- }
- case 24: {
- bitField0_ |= 0x00000004;
- infiniteEnd_ = input.readBool();
- break;
- }
- case 32: {
- bitField0_ |= 0x00000008;
- closed_ = input.readBool();
- break;
- }
- case 40: {
- bitField0_ |= 0x00000010;
- createdTime_ = input.readInt64();
- break;
- }
- default: {
- if (!parseUnknownField(
- input, unknownFields, extensionRegistry, tag)) {
- done = true;
- }
- break;
- }
- }
- }
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
- throw e.setUnfinishedMessage(this);
- } catch (java.io.IOException e) {
- throw new com.google.protobuf.InvalidProtocolBufferException(
- e).setUnfinishedMessage(this);
- } finally {
- this.unknownFields = unknownFields.build();
- makeExtensionsImmutable();
- }
- }
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return
org.apache.accumulo.server.replication.proto.Replication.internal_static_Status_descriptor;
@@ -236,7 +169,7 @@ package org.apache.accumulo.server.replication.proto;
private int bitField0_;
public static final int BEGIN_FIELD_NUMBER = 1;
- private long begin_;
+ private long begin_ = 0L;
/**
* <pre>
* offset where replication should start
@@ -263,7 +196,7 @@ package org.apache.accumulo.server.replication.proto;
}
public static final int END_FIELD_NUMBER = 2;
- private long end_;
+ private long end_ = 0L;
/**
* <pre>
* offset where data is ready for replication
@@ -290,7 +223,7 @@ package org.apache.accumulo.server.replication.proto;
}
public static final int INFINITEEND_FIELD_NUMBER = 3;
- private boolean infiniteEnd_;
+ private boolean infiniteEnd_ = false;
/**
* <pre>
* do we have a discrete 'end'
@@ -317,7 +250,7 @@ package org.apache.accumulo.server.replication.proto;
}
public static final int CLOSED_FIELD_NUMBER = 4;
- private boolean closed_;
+ private boolean closed_ = false;
/**
* <pre>
* will more data be appended to the file
@@ -344,7 +277,7 @@ package org.apache.accumulo.server.replication.proto;
}
public static final int CREATEDTIME_FIELD_NUMBER = 5;
- private long createdTime_;
+ private long createdTime_ = 0L;
/**
* <pre>
* when, in ms, was the file created?
@@ -399,7 +332,7 @@ package org.apache.accumulo.server.replication.proto;
if (((bitField0_ & 0x00000010) != 0)) {
output.writeInt64(5, createdTime_);
}
- unknownFields.writeTo(output);
+ getUnknownFields().writeTo(output);
}
@java.lang.Override
@@ -428,7 +361,7 @@ package org.apache.accumulo.server.replication.proto;
size += com.google.protobuf.CodedOutputStream
.computeInt64Size(5, createdTime_);
}
- size += unknownFields.getSerializedSize();
+ size += getUnknownFields().getSerializedSize();
memoizedSize = size;
return size;
}
@@ -468,11 +401,10 @@ package org.apache.accumulo.server.replication.proto;
if (getCreatedTime()
!= other.getCreatedTime()) return false;
}
- if (!unknownFields.equals(other.unknownFields)) return false;
+ if (!getUnknownFields().equals(other.getUnknownFields())) return false;
return true;
}
- @SuppressWarnings("unchecked")
@java.lang.Override
public int hashCode() {
if (memoizedHashCode != 0) {
@@ -505,7 +437,7 @@ package org.apache.accumulo.server.replication.proto;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getCreatedTime());
}
- hash = (29 * hash) + unknownFields.hashCode();
+ hash = (29 * hash) + getUnknownFields().hashCode();
memoizedHashCode = hash;
return hash;
}
@@ -554,11 +486,13 @@ package org.apache.accumulo.server.replication.proto;
return com.google.protobuf.GeneratedMessageV3
.parseWithIOException(PARSER, input, extensionRegistry);
}
+
public static
org.apache.accumulo.server.replication.proto.Replication.Status
parseDelimitedFrom(java.io.InputStream input)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageV3
.parseDelimitedWithIOException(PARSER, input);
}
+
public static
org.apache.accumulo.server.replication.proto.Replication.Status
parseDelimitedFrom(
java.io.InputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -622,32 +556,23 @@ package org.apache.accumulo.server.replication.proto;
// Construct using
org.apache.accumulo.server.replication.proto.Replication.Status.newBuilder()
private Builder() {
- maybeForceBuilderInitialization();
+
}
private Builder(
com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
super(parent);
- maybeForceBuilderInitialization();
- }
- private void maybeForceBuilderInitialization() {
- if (com.google.protobuf.GeneratedMessageV3
- .alwaysUseFieldBuilders) {
- }
+
}
@java.lang.Override
public Builder clear() {
super.clear();
+ bitField0_ = 0;
begin_ = 0L;
- bitField0_ = (bitField0_ & ~0x00000001);
end_ = 0L;
- bitField0_ = (bitField0_ & ~0x00000002);
infiniteEnd_ = false;
- bitField0_ = (bitField0_ & ~0x00000004);
closed_ = false;
- bitField0_ = (bitField0_ & ~0x00000008);
createdTime_ = 0L;
- bitField0_ = (bitField0_ & ~0x00000010);
return this;
}
@@ -674,6 +599,12 @@ package org.apache.accumulo.server.replication.proto;
@java.lang.Override
public org.apache.accumulo.server.replication.proto.Replication.Status
buildPartial() {
org.apache.accumulo.server.replication.proto.Replication.Status result
= new org.apache.accumulo.server.replication.proto.Replication.Status(this);
+ if (bitField0_ != 0) { buildPartial0(result); }
+ onBuilt();
+ return result;
+ }
+
+ private void
buildPartial0(org.apache.accumulo.server.replication.proto.Replication.Status
result) {
int from_bitField0_ = bitField0_;
int to_bitField0_ = 0;
if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -696,9 +627,7 @@ package org.apache.accumulo.server.replication.proto;
result.createdTime_ = createdTime_;
to_bitField0_ |= 0x00000010;
}
- result.bitField0_ = to_bitField0_;
- onBuilt();
- return result;
+ result.bitField0_ |= to_bitField0_;
}
@java.lang.Override
@@ -760,7 +689,7 @@ package org.apache.accumulo.server.replication.proto;
if (other.hasCreatedTime()) {
setCreatedTime(other.getCreatedTime());
}
- this.mergeUnknownFields(other.unknownFields);
+ this.mergeUnknownFields(other.getUnknownFields());
onChanged();
return this;
}
@@ -775,17 +704,55 @@ package org.apache.accumulo.server.replication.proto;
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
- org.apache.accumulo.server.replication.proto.Replication.Status
parsedMessage = null;
+ if (extensionRegistry == null) {
+ throw new java.lang.NullPointerException();
+ }
try {
- parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+ boolean done = false;
+ while (!done) {
+ int tag = input.readTag();
+ switch (tag) {
+ case 0:
+ done = true;
+ break;
+ case 8: {
+ begin_ = input.readInt64();
+ bitField0_ |= 0x00000001;
+ break;
+ } // case 8
+ case 16: {
+ end_ = input.readInt64();
+ bitField0_ |= 0x00000002;
+ break;
+ } // case 16
+ case 24: {
+ infiniteEnd_ = input.readBool();
+ bitField0_ |= 0x00000004;
+ break;
+ } // case 24
+ case 32: {
+ closed_ = input.readBool();
+ bitField0_ |= 0x00000008;
+ break;
+ } // case 32
+ case 40: {
+ createdTime_ = input.readInt64();
+ bitField0_ |= 0x00000010;
+ break;
+ } // case 40
+ default: {
+ if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+ done = true; // was an endgroup tag
+ }
+ break;
+ } // default:
+ } // switch (tag)
+ } // while (!done)
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
- parsedMessage =
(org.apache.accumulo.server.replication.proto.Replication.Status)
e.getUnfinishedMessage();
throw e.unwrapIOException();
} finally {
- if (parsedMessage != null) {
- mergeFrom(parsedMessage);
- }
- }
+ onChanged();
+ } // finally
return this;
}
private int bitField0_;
@@ -825,8 +792,9 @@ package org.apache.accumulo.server.replication.proto;
* @return This builder for chaining.
*/
public Builder setBegin(long value) {
- bitField0_ |= 0x00000001;
+
begin_ = value;
+ bitField0_ |= 0x00000001;
onChanged();
return this;
}
@@ -880,8 +848,9 @@ package org.apache.accumulo.server.replication.proto;
* @return This builder for chaining.
*/
public Builder setEnd(long value) {
- bitField0_ |= 0x00000002;
+
end_ = value;
+ bitField0_ |= 0x00000002;
onChanged();
return this;
}
@@ -935,8 +904,9 @@ package org.apache.accumulo.server.replication.proto;
* @return This builder for chaining.
*/
public Builder setInfiniteEnd(boolean value) {
- bitField0_ |= 0x00000004;
+
infiniteEnd_ = value;
+ bitField0_ |= 0x00000004;
onChanged();
return this;
}
@@ -990,8 +960,9 @@ package org.apache.accumulo.server.replication.proto;
* @return This builder for chaining.
*/
public Builder setClosed(boolean value) {
- bitField0_ |= 0x00000008;
+
closed_ = value;
+ bitField0_ |= 0x00000008;
onChanged();
return this;
}
@@ -1045,8 +1016,9 @@ package org.apache.accumulo.server.replication.proto;
* @return This builder for chaining.
*/
public Builder setCreatedTime(long value) {
- bitField0_ |= 0x00000010;
+
createdTime_ = value;
+ bitField0_ |= 0x00000010;
onChanged();
return this;
}
@@ -1097,7 +1069,18 @@ package org.apache.accumulo.server.replication.proto;
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
- return new Status(input, extensionRegistry);
+ Builder builder = newBuilder();
+ try {
+ builder.mergeFrom(input, extensionRegistry);
+ } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ throw e.setUnfinishedMessage(builder.buildPartial());
+ } catch (com.google.protobuf.UninitializedMessageException e) {
+ throw
e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+ } catch (java.io.IOException e) {
+ throw new com.google.protobuf.InvalidProtocolBufferException(e)
+ .setUnfinishedMessage(builder.buildPartial());
+ }
+ return builder.buildPartial();
}
};
diff --git a/server/base/src/main/scripts/generate-protobuf.sh
b/server/base/src/main/scripts/generate-protobuf.sh
index 36884e0f39..7c83d68b95 100755
--- a/server/base/src/main/scripts/generate-protobuf.sh
+++ b/server/base/src/main/scripts/generate-protobuf.sh
@@ -25,7 +25,7 @@
# In other scripts, set the variables that diverge from the defaults below,
then call this script.
# Leave the BUILD_DIR and FINAL_DIR alone for Maven builds.
#
========================================================================================================================
-[[ -z $REQUIRED_PROTOC_VERSION ]] && REQUIRED_PROTOC_VERSION='libprotoc 3.19.2'
+[[ -z $REQUIRED_PROTOC_VERSION ]] && REQUIRED_PROTOC_VERSION='libprotoc 25.6'
[[ -z $BUILD_DIR ]] && BUILD_DIR='target/proto'
[[ -z $FINAL_DIR ]] && FINAL_DIR='src/main'
#
========================================================================================================================
