Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare for upgrade to Protobuf 4 by removing deprecated or removed calls #3260

Merged
merged 1 commit into from
Mar 20, 2025
Merged

Prepare for upgrade to Protobuf 4 by removing deprecated or removed calls #3260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions ...core/src/main/java/com/apple/foundationdb/record/metadata/MetaDataEvolutionValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,10 +251,9 @@ private void validateMessage(@Nonnull Descriptor oldDescriptor, @Nonnull Descrip
}
}

@SuppressWarnings("deprecation") // checks the deprecated syntax field
private void validateProtoSyntax(@Nonnull Descriptors.Descriptor oldDescriptor, @Nonnull Descriptors.Descriptor newDescriptor) {
if (!oldDescriptor.getFile().getSyntax().equals(newDescriptor.getFile().getSyntax())
|| !oldDescriptor.getFile().getEdition().equals(newDescriptor.getFile().getEdition())) {
if (!oldDescriptor.getFile().toProto().getSyntax().equals(newDescriptor.getFile().toProto().getSyntax())
|| !oldDescriptor.getFile().toProto().getEdition().equals(newDescriptor.getFile().toProto().getEdition())) {
throw new MetaDataException("message descriptor proto syntax changed",
LogMessageKeys.RECORD_TYPE, oldDescriptor.getName());
}
Expand Down
2 changes: 1 addition & 1 deletion ...rc/test/java/com/apple/foundationdb/record/metadata/MetaDataEvolutionValidatorTestV3.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ public void nestedProto2ToProto3() {
@SuppressWarnings("deprecation") // test focuses on checking the (deprecated) syntax field
@Test
public void onlyFileProto2ToProto3() throws InvalidProtocolBufferException {
assertNotEquals(TestRecords1Proto.getDescriptor().getSyntax(), TestRecords1ImportedProto.getDescriptor().getSyntax());
assertNotEquals(TestRecords1Proto.getDescriptor().toProto().getSyntax(), TestRecords1ImportedProto.getDescriptor().toProto().getSyntax());
MetaDataEvolutionValidator.getDefaultInstance().validateUnion(
TestRecords1Proto.RecordTypeUnion.getDescriptor(),
TestRecords1ImportedProto.RecordTypeUnion.getDescriptor()
Expand Down
4 changes: 3 additions & 1 deletion ...l-server/src/test/java/com/apple/foundationdb/relational/server/RelationalServerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,9 @@ static void simpleJDBCServiceClientOperation(ManagedChannel managedChannel) {
} catch (Throwable t) {
com.google.rpc.Status status = StatusProto.fromThrowable(t);
if (status != null) {
logger.fatal(t + ", " + TextFormat.shortDebugString(status));
// V3: printer().shortDebugString(status)
// V4: printer().emittingSingleLine(true).printToString(status)
logger.fatal(t + ", " + TextFormat.printer().printToString(status).replace("\n", " "));
}
throw t;
} finally {
Expand Down
1 change: 1 addition & 0 deletions yaml-tests/yaml-tests.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ dependencies {
implementation(libs.junit.api)
implementation(libs.junit.params)
implementation(libs.log4j.api)
implementation(libs.guava)
implementation(libs.protobuf)
implementation(libs.protobuf.util)
implementation(libs.snakeyaml)
Expand Down
Loading