Skip to content

Optimize attribute qualification process and empty message creation #1002

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

Merged
copybara-service merged 1 commit into from
Apr 1, 2026
+17 −11
Merged

Optimize attribute qualification process and empty message creation #1002

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
2 changes: 1 addition & 1 deletion common/src/main/java/dev/cel/common/internal/DefaultMessageFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public Optional<Message.Builder> newBuilder(String messageName) {
DefaultInstanceMessageFactory.getInstance().getPrototype(descriptor.get());

if (message.isPresent()) {
return message.map(Message::toBuilder);
return message.map(Message::newBuilderForType);
}

return Optional.of(DynamicMessage.newBuilder(descriptor.get()));
Expand Down
13 changes: 8 additions & 5 deletions runtime/src/main/java/dev/cel/runtime/CelAttribute.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import com.google.auto.value.AutoOneOf;
import com.google.auto.value.AutoValue;
import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
import com.google.common.collect.ImmutableList;
import com.google.common.primitives.UnsignedLong;
import com.google.errorprone.annotations.Immutable;
Expand Down Expand Up @@ -184,9 +183,13 @@ public static CelAttribute create(String rootIdentifier) {
*/
public static CelAttribute fromQualifiedIdentifier(String qualifiedIdentifier) {
ImmutableList.Builder<Qualifier> qualifiers = ImmutableList.builder();
Splitter.on(".")
.split(qualifiedIdentifier)
.forEach((element) -> qualifiers.add(Qualifier.ofString(element)));
int start = 0;
int next;
while ((next = qualifiedIdentifier.indexOf('.', start)) != -1) {
qualifiers.add(Qualifier.ofString(qualifiedIdentifier.substring(start, next)));
start = next + 1;
}
qualifiers.add(Qualifier.ofString(qualifiedIdentifier.substring(start)));
return new AutoValue_CelAttribute(qualifiers.build());
}

Expand All @@ -206,7 +209,7 @@ public CelAttribute qualify(Qualifier qualifier) {
return EMPTY;
}
return new AutoValue_CelAttribute(
ImmutableList.<Qualifier>builder().addAll(qualifiers()).add(qualifier).build());
ImmutableList.<Qualifier>builderWithExpectedSize(qualifiers().size() + 1).addAll(qualifiers()).add(qualifier).build());
}

@Override
Expand Down
13 changes: 8 additions & 5 deletions runtime/src/main/java/dev/cel/runtime/CelAttributePattern.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

import com.google.auto.value.AutoValue;
import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
import com.google.common.collect.ImmutableList;
import com.google.errorprone.annotations.Immutable;

Expand Down Expand Up @@ -62,9 +61,13 @@ public static CelAttributePattern create(String rootIdentifier) {
*/
public static CelAttributePattern fromQualifiedIdentifier(String qualifiedIdentifier) {
ImmutableList.Builder<CelAttribute.Qualifier> qualifiers = ImmutableList.builder();
Splitter.on(".")
.split(qualifiedIdentifier)
.forEach((String element) -> qualifiers.add(CelAttribute.Qualifier.ofString(element)));
int start = 0;
int next;
while ((next = qualifiedIdentifier.indexOf('.', start)) != -1) {
qualifiers.add(CelAttribute.Qualifier.ofString(qualifiedIdentifier.substring(start, next)));
start = next + 1;
}
qualifiers.add(CelAttribute.Qualifier.ofString(qualifiedIdentifier.substring(start)));
return new AutoValue_CelAttributePattern(qualifiers.build());
}

Expand All @@ -74,7 +77,7 @@ public static CelAttributePattern fromQualifiedIdentifier(String qualifiedIdenti
/** Create a new attribute pattern that specifies a subfield of this pattern. */
public CelAttributePattern qualify(CelAttribute.Qualifier qualifier) {
return new AutoValue_CelAttributePattern(
ImmutableList.<CelAttribute.Qualifier>builder()
ImmutableList.<CelAttribute.Qualifier>builderWithExpectedSize(qualifiers().size() + 1)
.addAll(qualifiers())
.add(qualifier)
.build());
Expand Down
Loading