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

Jump to bottom

Lazily resolve features for proto2 and proto3 for compatibility with … #16907

Merged
merged 1 commit into from
May 21, 2024
Merged

Lazily resolve features for proto2 and proto3 for compatibility with … #16907

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
32 changes: 22 additions & 10 deletions java/core/src/main/java/com/google/protobuf/Descriptors.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1298,7 +1298,7 @@ public Type getType() {
// (custom options) into unknown fields.
if (type == Type.MESSAGE
&& this.features != null
&& this.features.getMessageEncoding() == FeatureSet.MessageEncoding.DELIMITED) {
&& getFeatures().getMessageEncoding() == FeatureSet.MessageEncoding.DELIMITED) {
return Type.GROUP;
}
return type;
Expand All @@ -1319,13 +1319,13 @@ public boolean needsUtf8Check() {
// Always enforce strict UTF-8 checking for map fields.
return true;
}
if (this.features
if (getFeatures()
.getExtension(JavaFeaturesProto.java_)
.getUtf8Validation()
.equals(JavaFeatures.Utf8Validation.VERIFY)) {
return true;
}
return this.features.getUtf8Validation().equals(FeatureSet.Utf8Validation.VERIFY);
return getFeatures().getUtf8Validation().equals(FeatureSet.Utf8Validation.VERIFY);
}

public boolean isMapField() {
Expand All @@ -1341,14 +1341,14 @@ && isRepeated()

/** Is this field declared required? */
public boolean isRequired() {
return this.features.getFieldPresence()
return getFeatures().getFieldPresence()
== DescriptorProtos.FeatureSet.FieldPresence.LEGACY_REQUIRED;
}

/** Is this field declared optional? */
public boolean isOptional() {
return proto.getLabel() == FieldDescriptorProto.Label.LABEL_OPTIONAL
&& this.features.getFieldPresence()
&& getFeatures().getFieldPresence()
!= DescriptorProtos.FeatureSet.FieldPresence.LEGACY_REQUIRED;
}

Expand All @@ -1367,7 +1367,7 @@ public boolean isPacked() {
if (!isPackable()) {
return false;
}
return this.features
return getFeatures()
.getRepeatedFieldEncoding()
.equals(FeatureSet.RepeatedFieldEncoding.PACKED);
}
Expand Down Expand Up @@ -1467,7 +1467,7 @@ public boolean hasPresence() {
|| getType() == Type.GROUP
|| isExtension()
|| getContainingOneof() != null
|| this.features.getFieldPresence() != DescriptorProtos.FeatureSet.FieldPresence.IMPLICIT;
|| getFeatures().getFieldPresence() != DescriptorProtos.FeatureSet.FieldPresence.IMPLICIT;
}

/**
Expand All @@ -1476,7 +1476,8 @@ public boolean hasPresence() {
* been upgraded to editions.
*/
boolean isGroupLike() {
if (features.getMessageEncoding() != DescriptorProtos.FeatureSet.MessageEncoding.DELIMITED) {
if (getFeatures().getMessageEncoding()
!= DescriptorProtos.FeatureSet.MessageEncoding.DELIMITED) {
// Groups are always tag-delimited.
return false;
}
Expand Down Expand Up @@ -1577,7 +1578,7 @@ public boolean legacyEnumFieldTreatedAsClosed() {
}

return getType() == Type.ENUM
&& (this.features.getExtension(JavaFeaturesProto.java_).getLegacyClosedEnum()
&& (getFeatures().getExtension(JavaFeaturesProto.java_).getLegacyClosedEnum()
|| enumType.isClosed());
}

Expand Down Expand Up @@ -2115,7 +2116,7 @@ public FileDescriptor getFile() {
* handling quirks.
*/
public boolean isClosed() {
return this.features.getEnumType() == DescriptorProtos.FeatureSet.EnumType.CLOSED;
return getFeatures().getEnumType() == DescriptorProtos.FeatureSet.EnumType.CLOSED;
}

/** If this is a nested type, get the outer descriptor, otherwise null. */
Expand Down Expand Up @@ -2811,6 +2812,17 @@ boolean hasInferredLegacyProtoFeatures() {

void validateFeatures() throws DescriptorValidationException {}

FeatureSet getFeatures() {
// TODO: Remove lazy resolution of unresolved features for legacy syntax for
// compatibility with older <4.26.x gencode in the next breaking release.
if (this.features == null
&& (getFile().getEdition() == Edition.EDITION_PROTO2
|| getFile().getEdition() == Edition.EDITION_PROTO3)) {
getFile().resolveAllFeaturesImmutable();
}
return this.features;
}

GenericDescriptor parent;
volatile FeatureSet features;
}
Expand Down
Loading