Follow up fixes to RuleCache#458

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
pkwarren merged 1 commit into from
Apr 23, 2026
Merged

Follow up fixes to RuleCache #458

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
8 changes: 8 additions & 0 deletions benchmarks/build.gradle.kts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import com.diffplug.gradle.spotless.SpotlessExtension

plugins {
java
alias(libs.plugins.jmh)
Expand All@@ -10,6 +12,12 @@ java {
targetCompatibility = JavaVersion.VERSION_21
}

configure<SpotlessExtension> {
java {
targetExclude("build/generated/**/*.java")
}
}

val buf: Configuration by configurations.creating

tasks.register("configureBuf") {
Expand Down
32 changes: 12 additions & 20 deletions benchmarks/src/jmh/java/build/buf/protovalidate/benchmarks/ValidationBenchmark.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,10 +19,8 @@
import build.buf.protovalidate.benchmarks.gen.ManyUnruledFieldsMessage;
import build.buf.protovalidate.benchmarks.gen.RepeatedRuleMessage;
import build.buf.protovalidate.benchmarks.gen.SimpleStringMessage;
import build.buf.protovalidate.exceptions.CompilationException;
import build.buf.protovalidate.exceptions.ValidationException;
import com.google.protobuf.Descriptors.Descriptor;
import java.util.Collections;
import com.google.protobuf.Descriptors.FieldDescriptor;
import java.util.concurrent.TimeUnit;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.BenchmarkMode;
Expand All@@ -41,9 +39,7 @@ public class ValidationBenchmark {
private Validator validator;
private SimpleStringMessage simple;
private ManyUnruledFieldsMessage manyUnruled;

// Descriptor captured once; cheap to reference during benchmark.
private static final Descriptor REPEATED_RULE_DESC = RepeatedRuleMessage.getDescriptor();
private RepeatedRuleMessage repeatedRule;

@Setup
public void setup() throws ValidationException {
Expand All@@ -65,13 +61,20 @@ public void setup() throws ValidationException {
.setF9("v9")
.build();

RepeatedRuleMessage.Builder repeatedRuleBuilder = RepeatedRuleMessage.newBuilder();
for (FieldDescriptor fd : RepeatedRuleMessage.getDescriptor().getFields()) {
repeatedRuleBuilder.setField(fd, "v");
}
repeatedRule = repeatedRuleBuilder.build();

// Warm evaluator cache for steady-state benchmarks.
validator.validate(simple);
validator.validate(manyUnruled);
validator.validate(repeatedRule);
}

// Steady-state validate() benchmarks. These exercise the hot path after the
// evaluator cache is warm. PR #451 does not affect this path.
// evaluator cache is warm.

@Benchmark
public void validateSimple(Blackhole bh) throws ValidationException {
Expand All@@ -83,19 +86,8 @@ public void validateManyUnruled(Blackhole bh) throws ValidationException {
bh.consume(validator.validate(manyUnruled));
}

// Compile-path benchmark. Measures building a fresh validator and warming
// its RuleCache for RepeatedRuleMessage (20 string fields, all min_len).
// PR #451 affects exactly this path: without the fix, the AST is rebuilt
// for every field; with the fix, fields 2..20 hit the cache.
//
// Time is dominated by Cel environment construction in newCel(); the #451
// signal is the delta on top of that baseline.
@Benchmark
@OutputTimeUnit(TimeUnit.MILLISECONDS)
public void compileValidatorForRepeated(Blackhole bh) throws CompilationException {
Validator v =
ValidatorFactory.newBuilder()
.buildWithDescriptors(Collections.singletonList(REPEATED_RULE_DESC), false);
bh.consume(v);
public void validateRepeatedRule(Blackhole bh) throws ValidationException {
bh.consume(validator.validate(repeatedRule));
}
}
54 changes: 44 additions & 10 deletions src/main/java/build/buf/protovalidate/RuleCache.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,11 +62,10 @@ private CelRule(
}

/**
* Concurrent map for caching {@link FieldDescriptor} and their associated List of {@link
* AstExpression}.
* Compiled rules keyed by rule field descriptor (e.g. {@code StringRules.min_len}), shared across
* all user fields that reference the same rule. The rule value is bound per call at eval time.
*/
private static final Map<FieldDescriptor, List<CelRule>> descriptorMap =
new ConcurrentHashMap<>();
private final Map<FieldDescriptor, List<CelRule>> descriptorMap = new ConcurrentHashMap<>();

/** The environment to use for evaluation. */
private final Cel cel;
Expand DownExpand Up@@ -123,14 +122,14 @@ List<CompiledProgram> compile(
}
List<CompiledProgram> programs = new ArrayList<>();
for (CelRule rule : completeProgramList) {
Object fieldValue = message.getField(rule.field);
programs.add(
new CompiledProgram(
rule.program,
rule.astExpression.source,
rule.rulePath,
new ObjectValue(rule.field, message.getField(rule.field)),
Variable.newRuleVariable(
message, ProtoAdapter.toCel(rule.field, message.getField(rule.field)))));
new ObjectValue(rule.field, fieldValue),
Variable.newRuleVariable(message, ProtoAdapter.toCel(rule.field, fieldValue))));
}
return Collections.unmodifiableList(programs);
}
Expand All@@ -148,8 +147,31 @@ List<CompiledProgram> compile(
}
build.buf.validate.PredefinedRules rules = getFieldRules(ruleFieldDesc);
if (rules == null) return null;
try {
return descriptorMap.computeIfAbsent(
ruleFieldDesc,
key -> {
try {
return buildCelRules(fieldDescriptor, forItems, setOneof, key, message, rules);
} catch (CompilationException e) {
throw new UncheckedCompilationException(e);
}
});
} catch (UncheckedCompilationException e) {
throw e.getCompilationException();
}
}

private List<CelRule> buildCelRules(
FieldDescriptor fieldDescriptor,
boolean forItems,
FieldDescriptor setOneof,
FieldDescriptor ruleFieldDesc,
Message message,
build.buf.validate.PredefinedRules rules)
throws CompilationException {
List<Expression> expressions = Expression.fromRules(rules.getCelList());
celRules = new ArrayList<>(expressions.size());
List<CelRule> celRules = new ArrayList<>(expressions.size());
Cel ruleCel = getRuleCel(fieldDescriptor, message, ruleFieldDesc, forItems);
for (Expression expression : expressions) {
FieldPath rulePath =
Expand All@@ -167,10 +189,22 @@ List<CompiledProgram> compile(
}
celRules.add(new CelRule(astExpression, program, ruleFieldDesc, rulePath));
}
descriptorMap.put(ruleFieldDesc, celRules);
return celRules;
}

private static final class UncheckedCompilationException extends RuntimeException {
private final CompilationException compilationException;

UncheckedCompilationException(CompilationException cause) {
super(cause);
this.compilationException = cause;
}

CompilationException getCompilationException() {
return compilationException;
}
}

private build.buf.validate.@Nullable PredefinedRules getFieldRules(FieldDescriptor ruleFieldDesc)
throws CompilationException {
DescriptorProtos.FieldOptions options = ruleFieldDesc.getOptions();
Expand DownExpand Up@@ -310,7 +344,7 @@ private ResolvedRule resolveRules(
DynamicMessage.parseFrom(
expectedRuleMessageDescriptor, typeRules.toByteString(), extensionRegistry);
} catch (InvalidProtocolBufferException e) {
throw new RuntimeException(e);
throw new CompilationException("failed to reparse rules with extension registry", e);
}
}
if (!allowUnknownFields && !typeRules.getUnknownFields().isEmpty()) {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Follow up fixes to RuleCache#458

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

pkwarren
merged 1 commit into

from

Apr 23, 2026
 Merged


Follow up fixes to RuleCache
#458
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


8 changes: 8 additions & 0 deletions
benchmarks/build.gradle.kts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import com.diffplug.gradle.spotless.SpotlessExtension

plugins {
 java
 alias(libs.plugins.jmh)
Expand All@@ -10,6 +12,12 @@ java {
 targetCompatibility = JavaVersion.VERSION_21
}

configure<SpotlessExtension> {
 java {
 targetExclude("build/generated/**/*.java")
 }
}

val buf: Configuration by configurations.creating

tasks.register("configureBuf") {
Expand Down

32 changes: 12 additions & 20 deletions
benchmarks/src/jmh/java/build/buf/protovalidate/benchmarks/ValidationBenchmark.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,10 +19,8 @@
import build.buf.protovalidate.benchmarks.gen.ManyUnruledFieldsMessage;
import build.buf.protovalidate.benchmarks.gen.RepeatedRuleMessage;
import build.buf.protovalidate.benchmarks.gen.SimpleStringMessage;
import build.buf.protovalidate.exceptions.CompilationException;
import build.buf.protovalidate.exceptions.ValidationException;
import com.google.protobuf.Descriptors.Descriptor;
import java.util.Collections;
import com.google.protobuf.Descriptors.FieldDescriptor;
import java.util.concurrent.TimeUnit;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.BenchmarkMode;
Expand All@@ -41,9 +39,7 @@ public class ValidationBenchmark {
 private Validator validator;
 private SimpleStringMessage simple;
 private ManyUnruledFieldsMessage manyUnruled;

 // Descriptor captured once; cheap to reference during benchmark.
 private static final Descriptor REPEATED_RULE_DESC = RepeatedRuleMessage.getDescriptor();
 private RepeatedRuleMessage repeatedRule;

 @Setup
 public void setup() throws ValidationException {
Expand All@@ -65,13 +61,20 @@ public void setup() throws ValidationException {
 .setF9("v9")
 .build();

 RepeatedRuleMessage.Builder repeatedRuleBuilder = RepeatedRuleMessage.newBuilder();
 for (FieldDescriptor fd : RepeatedRuleMessage.getDescriptor().getFields()) {
 repeatedRuleBuilder.setField(fd, "v");
 }
 repeatedRule = repeatedRuleBuilder.build();

 // Warm evaluator cache for steady-state benchmarks.
 validator.validate(simple);
 validator.validate(manyUnruled);
 validator.validate(repeatedRule);
 }

 // Steady-state validate() benchmarks. These exercise the hot path after the
 // evaluator cache is warm. PR #451 does not affect this path.
 // evaluator cache is warm.

 @Benchmark
 public void validateSimple(Blackhole bh) throws ValidationException {
Expand All@@ -83,19 +86,8 @@ public void validateManyUnruled(Blackhole bh) throws ValidationException {
 bh.consume(validator.validate(manyUnruled));
 }

 // Compile-path benchmark. Measures building a fresh validator and warming
 // its RuleCache for RepeatedRuleMessage (20 string fields, all min_len).
 // PR #451 affects exactly this path: without the fix, the AST is rebuilt
 // for every field; with the fix, fields 2..20 hit the cache.
 //
 // Time is dominated by Cel environment construction in newCel(); the #451
 // signal is the delta on top of that baseline.
 @Benchmark
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
 public void compileValidatorForRepeated(Blackhole bh) throws CompilationException {
 Validator v =
 ValidatorFactory.newBuilder()
 .buildWithDescriptors(Collections.singletonList(REPEATED_RULE_DESC), false);
 bh.consume(v);
 public void validateRepeatedRule(Blackhole bh) throws ValidationException {
 bh.consume(validator.validate(repeatedRule));
 }
}

54 changes: 44 additions & 10 deletions
src/main/java/build/buf/protovalidate/RuleCache.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,11 +62,10 @@ private CelRule(
 }

 /**
 * Concurrent map for caching {@link FieldDescriptor} and their associated List of {@link
 * AstExpression}.
 * Compiled rules keyed by rule field descriptor (e.g. {@code StringRules.min_len}), shared across
 * all user fields that reference the same rule. The rule value is bound per call at eval time.
 */
 private static final Map<FieldDescriptor, List<CelRule>> descriptorMap =
 new ConcurrentHashMap<>();
 private final Map<FieldDescriptor, List<CelRule>> descriptorMap = new ConcurrentHashMap<>();

 /** The environment to use for evaluation. */
 private final Cel cel;
Expand DownExpand Up@@ -123,14 +122,14 @@ List<CompiledProgram> compile(
 }
 List<CompiledProgram> programs = new ArrayList<>();
 for (CelRule rule : completeProgramList) {
 Object fieldValue = message.getField(rule.field);
 programs.add(
 new CompiledProgram(
 rule.program,
 rule.astExpression.source,
 rule.rulePath,
 new ObjectValue(rule.field, message.getField(rule.field)),
 Variable.newRuleVariable(
 message, ProtoAdapter.toCel(rule.field, message.getField(rule.field)))));
 new ObjectValue(rule.field, fieldValue),
 Variable.newRuleVariable(message, ProtoAdapter.toCel(rule.field, fieldValue))));
 }
 return Collections.unmodifiableList(programs);
 }
Expand All@@ -148,8 +147,31 @@ List<CompiledProgram> compile(
 }
 build.buf.validate.PredefinedRules rules = getFieldRules(ruleFieldDesc);
 if (rules == null) return null;
 try {
 return descriptorMap.computeIfAbsent(
 ruleFieldDesc,
 key -> {
 try {
 return buildCelRules(fieldDescriptor, forItems, setOneof, key, message, rules);
 } catch (CompilationException e) {
 throw new UncheckedCompilationException(e);
 }
 });
 } catch (UncheckedCompilationException e) {
 throw e.getCompilationException();
 }
 }

 private List<CelRule> buildCelRules(
 FieldDescriptor fieldDescriptor,
 boolean forItems,
 FieldDescriptor setOneof,
 FieldDescriptor ruleFieldDesc,
 Message message,
 build.buf.validate.PredefinedRules rules)
 throws CompilationException {
 List<Expression> expressions = Expression.fromRules(rules.getCelList());
 celRules = new ArrayList<>(expressions.size());
List<CelRule> celRules = new ArrayList<>(expressions.size());
 Cel ruleCel = getRuleCel(fieldDescriptor, message, ruleFieldDesc, forItems);
 for (Expression expression : expressions) {
 FieldPath rulePath =
Expand All@@ -167,10 +189,22 @@ List<CompiledProgram> compile(
 }
 celRules.add(new CelRule(astExpression, program, ruleFieldDesc, rulePath));
 }
 descriptorMap.put(ruleFieldDesc, celRules);
 return celRules;
 }

 private static final class UncheckedCompilationException extends RuntimeException {
 private final CompilationException compilationException;

 UncheckedCompilationException(CompilationException cause) {
 super(cause);
 this.compilationException = cause;
 }

 CompilationException getCompilationException() {
 return compilationException;
 }
 }

 private build.buf.validate.@Nullable PredefinedRules getFieldRules(FieldDescriptor ruleFieldDesc)
 throws CompilationException {
 DescriptorProtos.FieldOptions options = ruleFieldDesc.getOptions();
Expand DownExpand Up@@ -310,7 +344,7 @@ private ResolvedRule resolveRules(
 DynamicMessage.parseFrom(
 expectedRuleMessageDescriptor, typeRules.toByteString(), extensionRegistry);
 } catch (InvalidProtocolBufferException e) {
 throw new RuntimeException(e);
 throw new CompilationException("failed to reparse rules with extension registry", e);
 }
 }
 if (!allowUnknownFields && !typeRules.getUnknownFields().isEmpty()) {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Follow up fixes to RuleCache#458

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

pkwarren
merged 1 commit into

from

Apr 23, 2026
 Merged


Follow up fixes to RuleCache
#458
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


8 changes: 8 additions & 0 deletions
benchmarks/build.gradle.kts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import com.diffplug.gradle.spotless.SpotlessExtension

plugins {
 java
 alias(libs.plugins.jmh)
Expand All@@ -10,6 +12,12 @@ java {
 targetCompatibility = JavaVersion.VERSION_21
}

configure<SpotlessExtension> {
 java {
 targetExclude("build/generated/**/*.java")
 }
}

val buf: Configuration by configurations.creating

tasks.register("configureBuf") {
Expand Down

32 changes: 12 additions & 20 deletions
benchmarks/src/jmh/java/build/buf/protovalidate/benchmarks/ValidationBenchmark.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,10 +19,8 @@
import build.buf.protovalidate.benchmarks.gen.ManyUnruledFieldsMessage;
import build.buf.protovalidate.benchmarks.gen.RepeatedRuleMessage;
import build.buf.protovalidate.benchmarks.gen.SimpleStringMessage;
import build.buf.protovalidate.exceptions.CompilationException;
import build.buf.protovalidate.exceptions.ValidationException;
import com.google.protobuf.Descriptors.Descriptor;
import java.util.Collections;
import com.google.protobuf.Descriptors.FieldDescriptor;
import java.util.concurrent.TimeUnit;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.BenchmarkMode;
Expand All@@ -41,9 +39,7 @@ public class ValidationBenchmark {
 private Validator validator;
 private SimpleStringMessage simple;
 private ManyUnruledFieldsMessage manyUnruled;

 // Descriptor captured once; cheap to reference during benchmark.
 private static final Descriptor REPEATED_RULE_DESC = RepeatedRuleMessage.getDescriptor();
 private RepeatedRuleMessage repeatedRule;

 @Setup
 public void setup() throws ValidationException {
Expand All@@ -65,13 +61,20 @@ public void setup() throws ValidationException {
 .setF9("v9")
 .build();

 RepeatedRuleMessage.Builder repeatedRuleBuilder = RepeatedRuleMessage.newBuilder();
 for (FieldDescriptor fd : RepeatedRuleMessage.getDescriptor().getFields()) {
 repeatedRuleBuilder.setField(fd, "v");
 }
 repeatedRule = repeatedRuleBuilder.build();

 // Warm evaluator cache for steady-state benchmarks.
 validator.validate(simple);
 validator.validate(manyUnruled);
 validator.validate(repeatedRule);
 }

 // Steady-state validate() benchmarks. These exercise the hot path after the
 // evaluator cache is warm. PR #451 does not affect this path.
 // evaluator cache is warm.

 @Benchmark
 public void validateSimple(Blackhole bh) throws ValidationException {
Expand All@@ -83,19 +86,8 @@ public void validateManyUnruled(Blackhole bh) throws ValidationException {
 bh.consume(validator.validate(manyUnruled));
 }

 // Compile-path benchmark. Measures building a fresh validator and warming
 // its RuleCache for RepeatedRuleMessage (20 string fields, all min_len).
 // PR #451 affects exactly this path: without the fix, the AST is rebuilt
 // for every field; with the fix, fields 2..20 hit the cache.
 //
 // Time is dominated by Cel environment construction in newCel(); the #451
 // signal is the delta on top of that baseline.
 @Benchmark
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
 public void compileValidatorForRepeated(Blackhole bh) throws CompilationException {
 Validator v =
 ValidatorFactory.newBuilder()
 .buildWithDescriptors(Collections.singletonList(REPEATED_RULE_DESC), false);
 bh.consume(v);
 public void validateRepeatedRule(Blackhole bh) throws ValidationException {
 bh.consume(validator.validate(repeatedRule));
 }
}

54 changes: 44 additions & 10 deletions
src/main/java/build/buf/protovalidate/RuleCache.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,11 +62,10 @@ private CelRule(
 }

 /**
 * Concurrent map for caching {@link FieldDescriptor} and their associated List of {@link
 * AstExpression}.
 * Compiled rules keyed by rule field descriptor (e.g. {@code StringRules.min_len}), shared across
 * all user fields that reference the same rule. The rule value is bound per call at eval time.
 */
 private static final Map<FieldDescriptor, List<CelRule>> descriptorMap =
 new ConcurrentHashMap<>();
 private final Map<FieldDescriptor, List<CelRule>> descriptorMap = new ConcurrentHashMap<>();

 /** The environment to use for evaluation. */
 private final Cel cel;
Expand DownExpand Up@@ -123,14 +122,14 @@ List<CompiledProgram> compile(
 }
 List<CompiledProgram> programs = new ArrayList<>();
 for (CelRule rule : completeProgramList) {
 Object fieldValue = message.getField(rule.field);
 programs.add(
 new CompiledProgram(
 rule.program,
 rule.astExpression.source,
 rule.rulePath,
 new ObjectValue(rule.field, message.getField(rule.field)),
 Variable.newRuleVariable(
 message, ProtoAdapter.toCel(rule.field, message.getField(rule.field)))));
 new ObjectValue(rule.field, fieldValue),
 Variable.newRuleVariable(message, ProtoAdapter.toCel(rule.field, fieldValue))));
 }
 return Collections.unmodifiableList(programs);
 }
Expand All@@ -148,8 +147,31 @@ List<CompiledProgram> compile(
 }
 build.buf.validate.PredefinedRules rules = getFieldRules(ruleFieldDesc);
 if (rules == null) return null;
 try {
 return descriptorMap.computeIfAbsent(
 ruleFieldDesc,
 key -> {
 try {
 return buildCelRules(fieldDescriptor, forItems, setOneof, key, message, rules);
 } catch (CompilationException e) {
 throw new UncheckedCompilationException(e);
 }
 });
 } catch (UncheckedCompilationException e) {
 throw e.getCompilationException();
 }
 }

 private List<CelRule> buildCelRules(
 FieldDescriptor fieldDescriptor,
 boolean forItems,
 FieldDescriptor setOneof,
 FieldDescriptor ruleFieldDesc,
 Message message,
 build.buf.validate.PredefinedRules rules)
 throws CompilationException {
 List<Expression> expressions = Expression.fromRules(rules.getCelList());
 celRules = new ArrayList<>(expressions.size());
List<CelRule> celRules = new ArrayList<>(expressions.size());
 Cel ruleCel = getRuleCel(fieldDescriptor, message, ruleFieldDesc, forItems);
 for (Expression expression : expressions) {
 FieldPath rulePath =
Expand All@@ -167,10 +189,22 @@ List<CompiledProgram> compile(
 }
 celRules.add(new CelRule(astExpression, program, ruleFieldDesc, rulePath));
 }
 descriptorMap.put(ruleFieldDesc, celRules);
 return celRules;
 }

 private static final class UncheckedCompilationException extends RuntimeException {
 private final CompilationException compilationException;

 UncheckedCompilationException(CompilationException cause) {
 super(cause);
 this.compilationException = cause;
 }

 CompilationException getCompilationException() {
 return compilationException;
 }
 }

 private build.buf.validate.@Nullable PredefinedRules getFieldRules(FieldDescriptor ruleFieldDesc)
 throws CompilationException {
 DescriptorProtos.FieldOptions options = ruleFieldDesc.getOptions();
Expand DownExpand Up@@ -310,7 +344,7 @@ private ResolvedRule resolveRules(
 DynamicMessage.parseFrom(
 expectedRuleMessageDescriptor, typeRules.toByteString(), extensionRegistry);
 } catch (InvalidProtocolBufferException e) {
 throw new RuntimeException(e);
 throw new CompilationException("failed to reparse rules with extension registry", e);
 }
 }
 if (!allowUnknownFields && !typeRules.getUnknownFields().isEmpty()) {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Follow up fixes to RuleCache#458

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

pkwarren
merged 1 commit into

from

Apr 23, 2026
 Merged


Follow up fixes to RuleCache
#458
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


8 changes: 8 additions & 0 deletions
benchmarks/build.gradle.kts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import com.diffplug.gradle.spotless.SpotlessExtension

plugins {
 java
 alias(libs.plugins.jmh)
Expand All@@ -10,6 +12,12 @@ java {
 targetCompatibility = JavaVersion.VERSION_21
}

configure<SpotlessExtension> {
 java {
 targetExclude("build/generated/**/*.java")
 }
}

val buf: Configuration by configurations.creating

tasks.register("configureBuf") {
Expand Down

32 changes: 12 additions & 20 deletions
benchmarks/src/jmh/java/build/buf/protovalidate/benchmarks/ValidationBenchmark.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,10 +19,8 @@
import build.buf.protovalidate.benchmarks.gen.ManyUnruledFieldsMessage;
import build.buf.protovalidate.benchmarks.gen.RepeatedRuleMessage;
import build.buf.protovalidate.benchmarks.gen.SimpleStringMessage;
import build.buf.protovalidate.exceptions.CompilationException;
import build.buf.protovalidate.exceptions.ValidationException;
import com.google.protobuf.Descriptors.Descriptor;
import java.util.Collections;
import com.google.protobuf.Descriptors.FieldDescriptor;
import java.util.concurrent.TimeUnit;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.BenchmarkMode;
Expand All@@ -41,9 +39,7 @@ public class ValidationBenchmark {
 private Validator validator;
 private SimpleStringMessage simple;
 private ManyUnruledFieldsMessage manyUnruled;

 // Descriptor captured once; cheap to reference during benchmark.
 private static final Descriptor REPEATED_RULE_DESC = RepeatedRuleMessage.getDescriptor();
 private RepeatedRuleMessage repeatedRule;

 @Setup
 public void setup() throws ValidationException {
Expand All@@ -65,13 +61,20 @@ public void setup() throws ValidationException {
 .setF9("v9")
 .build();

 RepeatedRuleMessage.Builder repeatedRuleBuilder = RepeatedRuleMessage.newBuilder();
 for (FieldDescriptor fd : RepeatedRuleMessage.getDescriptor().getFields()) {
 repeatedRuleBuilder.setField(fd, "v");
 }
 repeatedRule = repeatedRuleBuilder.build();

 // Warm evaluator cache for steady-state benchmarks.
 validator.validate(simple);
 validator.validate(manyUnruled);
 validator.validate(repeatedRule);
 }

 // Steady-state validate() benchmarks. These exercise the hot path after the
 // evaluator cache is warm. PR #451 does not affect this path.
 // evaluator cache is warm.

 @Benchmark
 public void validateSimple(Blackhole bh) throws ValidationException {
Expand All@@ -83,19 +86,8 @@ public void validateManyUnruled(Blackhole bh) throws ValidationException {
 bh.consume(validator.validate(manyUnruled));
 }

 // Compile-path benchmark. Measures building a fresh validator and warming
 // its RuleCache for RepeatedRuleMessage (20 string fields, all min_len).
 // PR #451 affects exactly this path: without the fix, the AST is rebuilt
 // for every field; with the fix, fields 2..20 hit the cache.
 //
 // Time is dominated by Cel environment construction in newCel(); the #451
 // signal is the delta on top of that baseline.
 @Benchmark
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
 public void compileValidatorForRepeated(Blackhole bh) throws CompilationException {
 Validator v =
 ValidatorFactory.newBuilder()
 .buildWithDescriptors(Collections.singletonList(REPEATED_RULE_DESC), false);
 bh.consume(v);
 public void validateRepeatedRule(Blackhole bh) throws ValidationException {
 bh.consume(validator.validate(repeatedRule));
 }
}

54 changes: 44 additions & 10 deletions
src/main/java/build/buf/protovalidate/RuleCache.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,11 +62,10 @@ private CelRule(
 }

 /**
 * Concurrent map for caching {@link FieldDescriptor} and their associated List of {@link
 * AstExpression}.
 * Compiled rules keyed by rule field descriptor (e.g. {@code StringRules.min_len}), shared across
 * all user fields that reference the same rule. The rule value is bound per call at eval time.
 */
 private static final Map<FieldDescriptor, List<CelRule>> descriptorMap =
 new ConcurrentHashMap<>();
 private final Map<FieldDescriptor, List<CelRule>> descriptorMap = new ConcurrentHashMap<>();

 /** The environment to use for evaluation. */
 private final Cel cel;
Expand DownExpand Up@@ -123,14 +122,14 @@ List<CompiledProgram> compile(
 }
 List<CompiledProgram> programs = new ArrayList<>();
 for (CelRule rule : completeProgramList) {
 Object fieldValue = message.getField(rule.field);
 programs.add(
 new CompiledProgram(
 rule.program,
 rule.astExpression.source,
 rule.rulePath,
 new ObjectValue(rule.field, message.getField(rule.field)),
 Variable.newRuleVariable(
 message, ProtoAdapter.toCel(rule.field, message.getField(rule.field)))));
 new ObjectValue(rule.field, fieldValue),
 Variable.newRuleVariable(message, ProtoAdapter.toCel(rule.field, fieldValue))));
 }
 return Collections.unmodifiableList(programs);
 }
Expand All@@ -148,8 +147,31 @@ List<CompiledProgram> compile(
 }
 build.buf.validate.PredefinedRules rules = getFieldRules(ruleFieldDesc);
 if (rules == null) return null;
 try {
 return descriptorMap.computeIfAbsent(
 ruleFieldDesc,
 key -> {
 try {
 return buildCelRules(fieldDescriptor, forItems, setOneof, key, message, rules);
 } catch (CompilationException e) {
 throw new UncheckedCompilationException(e);
 }
 });
 } catch (UncheckedCompilationException e) {
 throw e.getCompilationException();
 }
 }

 private List<CelRule> buildCelRules(
 FieldDescriptor fieldDescriptor,
 boolean forItems,
 FieldDescriptor setOneof,
 FieldDescriptor ruleFieldDesc,
 Message message,
 build.buf.validate.PredefinedRules rules)
 throws CompilationException {
 List<Expression> expressions = Expression.fromRules(rules.getCelList());
 celRules = new ArrayList<>(expressions.size());
List<CelRule> celRules = new ArrayList<>(expressions.size());
 Cel ruleCel = getRuleCel(fieldDescriptor, message, ruleFieldDesc, forItems);
 for (Expression expression : expressions) {
 FieldPath rulePath =
Expand All@@ -167,10 +189,22 @@ List<CompiledProgram> compile(
 }
 celRules.add(new CelRule(astExpression, program, ruleFieldDesc, rulePath));
 }
 descriptorMap.put(ruleFieldDesc, celRules);
 return celRules;
 }

 private static final class UncheckedCompilationException extends RuntimeException {
 private final CompilationException compilationException;

 UncheckedCompilationException(CompilationException cause) {
 super(cause);
 this.compilationException = cause;
 }

 CompilationException getCompilationException() {
 return compilationException;
 }
 }

 private build.buf.validate.@Nullable PredefinedRules getFieldRules(FieldDescriptor ruleFieldDesc)
 throws CompilationException {
 DescriptorProtos.FieldOptions options = ruleFieldDesc.getOptions();
Expand DownExpand Up@@ -310,7 +344,7 @@ private ResolvedRule resolveRules(
 DynamicMessage.parseFrom(
 expectedRuleMessageDescriptor, typeRules.toByteString(), extensionRegistry);
 } catch (InvalidProtocolBufferException e) {
 throw new RuntimeException(e);
 throw new CompilationException("failed to reparse rules with extension registry", e);
 }
 }
 if (!allowUnknownFields && !typeRules.getUnknownFields().isEmpty()) {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Follow up fixes to RuleCache#458

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

pkwarren
merged 1 commit into

from

Apr 23, 2026
 Merged


Follow up fixes to RuleCache
#458
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


8 changes: 8 additions & 0 deletions
benchmarks/build.gradle.kts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import com.diffplug.gradle.spotless.SpotlessExtension

plugins {
 java
 alias(libs.plugins.jmh)
Expand All@@ -10,6 +12,12 @@ java {
 targetCompatibility = JavaVersion.VERSION_21
}

configure<SpotlessExtension> {
 java {
 targetExclude("build/generated/**/*.java")
 }
}

val buf: Configuration by configurations.creating

tasks.register("configureBuf") {
Expand Down

32 changes: 12 additions & 20 deletions
benchmarks/src/jmh/java/build/buf/protovalidate/benchmarks/ValidationBenchmark.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,10 +19,8 @@
import build.buf.protovalidate.benchmarks.gen.ManyUnruledFieldsMessage;
import build.buf.protovalidate.benchmarks.gen.RepeatedRuleMessage;
import build.buf.protovalidate.benchmarks.gen.SimpleStringMessage;
import build.buf.protovalidate.exceptions.CompilationException;
import build.buf.protovalidate.exceptions.ValidationException;
import com.google.protobuf.Descriptors.Descriptor;
import java.util.Collections;
import com.google.protobuf.Descriptors.FieldDescriptor;
import java.util.concurrent.TimeUnit;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.BenchmarkMode;
Expand All@@ -41,9 +39,7 @@ public class ValidationBenchmark {
 private Validator validator;
 private SimpleStringMessage simple;
 private ManyUnruledFieldsMessage manyUnruled;

 // Descriptor captured once; cheap to reference during benchmark.
 private static final Descriptor REPEATED_RULE_DESC = RepeatedRuleMessage.getDescriptor();
 private RepeatedRuleMessage repeatedRule;

 @Setup
 public void setup() throws ValidationException {
Expand All@@ -65,13 +61,20 @@ public void setup() throws ValidationException {
 .setF9("v9")
 .build();

 RepeatedRuleMessage.Builder repeatedRuleBuilder = RepeatedRuleMessage.newBuilder();
 for (FieldDescriptor fd : RepeatedRuleMessage.getDescriptor().getFields()) {
 repeatedRuleBuilder.setField(fd, "v");
 }
 repeatedRule = repeatedRuleBuilder.build();

 // Warm evaluator cache for steady-state benchmarks.
 validator.validate(simple);
 validator.validate(manyUnruled);
 validator.validate(repeatedRule);
 }

 // Steady-state validate() benchmarks. These exercise the hot path after the
 // evaluator cache is warm. PR #451 does not affect this path.
 // evaluator cache is warm.

 @Benchmark
 public void validateSimple(Blackhole bh) throws ValidationException {
Expand All@@ -83,19 +86,8 @@ public void validateManyUnruled(Blackhole bh) throws ValidationException {
 bh.consume(validator.validate(manyUnruled));
 }

 // Compile-path benchmark. Measures building a fresh validator and warming
 // its RuleCache for RepeatedRuleMessage (20 string fields, all min_len).
 // PR #451 affects exactly this path: without the fix, the AST is rebuilt
 // for every field; with the fix, fields 2..20 hit the cache.
 //
 // Time is dominated by Cel environment construction in newCel(); the #451
 // signal is the delta on top of that baseline.
 @Benchmark
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
 public void compileValidatorForRepeated(Blackhole bh) throws CompilationException {
 Validator v =
 ValidatorFactory.newBuilder()
 .buildWithDescriptors(Collections.singletonList(REPEATED_RULE_DESC), false);
 bh.consume(v);
 public void validateRepeatedRule(Blackhole bh) throws ValidationException {
 bh.consume(validator.validate(repeatedRule));
 }
}

54 changes: 44 additions & 10 deletions
src/main/java/build/buf/protovalidate/RuleCache.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,11 +62,10 @@ private CelRule(
 }

 /**
 * Concurrent map for caching {@link FieldDescriptor} and their associated List of {@link
 * AstExpression}.
 * Compiled rules keyed by rule field descriptor (e.g. {@code StringRules.min_len}), shared across
 * all user fields that reference the same rule. The rule value is bound per call at eval time.
 */
 private static final Map<FieldDescriptor, List<CelRule>> descriptorMap =
 new ConcurrentHashMap<>();
 private final Map<FieldDescriptor, List<CelRule>> descriptorMap = new ConcurrentHashMap<>();

 /** The environment to use for evaluation. */
 private final Cel cel;
Expand DownExpand Up@@ -123,14 +122,14 @@ List<CompiledProgram> compile(
 }
 List<CompiledProgram> programs = new ArrayList<>();
 for (CelRule rule : completeProgramList) {
 Object fieldValue = message.getField(rule.field);
 programs.add(
 new CompiledProgram(
 rule.program,
 rule.astExpression.source,
 rule.rulePath,
 new ObjectValue(rule.field, message.getField(rule.field)),
 Variable.newRuleVariable(
 message, ProtoAdapter.toCel(rule.field, message.getField(rule.field)))));
 new ObjectValue(rule.field, fieldValue),
 Variable.newRuleVariable(message, ProtoAdapter.toCel(rule.field, fieldValue))));
 }
 return Collections.unmodifiableList(programs);
 }
Expand All@@ -148,8 +147,31 @@ List<CompiledProgram> compile(
 }
 build.buf.validate.PredefinedRules rules = getFieldRules(ruleFieldDesc);
 if (rules == null) return null;
 try {
 return descriptorMap.computeIfAbsent(
 ruleFieldDesc,
 key -> {
 try {
 return buildCelRules(fieldDescriptor, forItems, setOneof, key, message, rules);
 } catch (CompilationException e) {
 throw new UncheckedCompilationException(e);
 }
 });
 } catch (UncheckedCompilationException e) {
 throw e.getCompilationException();
 }
 }

 private List<CelRule> buildCelRules(
 FieldDescriptor fieldDescriptor,
 boolean forItems,
 FieldDescriptor setOneof,
 FieldDescriptor ruleFieldDesc,
 Message message,
 build.buf.validate.PredefinedRules rules)
 throws CompilationException {
 List<Expression> expressions = Expression.fromRules(rules.getCelList());
 celRules = new ArrayList<>(expressions.size());
List<CelRule> celRules = new ArrayList<>(expressions.size());
 Cel ruleCel = getRuleCel(fieldDescriptor, message, ruleFieldDesc, forItems);
 for (Expression expression : expressions) {
 FieldPath rulePath =
Expand All@@ -167,10 +189,22 @@ List<CompiledProgram> compile(
 }
 celRules.add(new CelRule(astExpression, program, ruleFieldDesc, rulePath));
 }
 descriptorMap.put(ruleFieldDesc, celRules);
 return celRules;
 }

 private static final class UncheckedCompilationException extends RuntimeException {
 private final CompilationException compilationException;

 UncheckedCompilationException(CompilationException cause) {
 super(cause);
 this.compilationException = cause;
 }

 CompilationException getCompilationException() {
 return compilationException;
 }
 }

 private build.buf.validate.@Nullable PredefinedRules getFieldRules(FieldDescriptor ruleFieldDesc)
 throws CompilationException {
 DescriptorProtos.FieldOptions options = ruleFieldDesc.getOptions();
Expand DownExpand Up@@ -310,7 +344,7 @@ private ResolvedRule resolveRules(
 DynamicMessage.parseFrom(
 expectedRuleMessageDescriptor, typeRules.toByteString(), extensionRegistry);
 } catch (InvalidProtocolBufferException e) {
 throw new RuntimeException(e);
 throw new CompilationException("failed to reparse rules with extension registry", e);
 }
 }
 if (!allowUnknownFields && !typeRules.getUnknownFields().isEmpty()) {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Follow up fixes to RuleCache#458

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

pkwarren
merged 1 commit into

from

Apr 23, 2026
 Merged


Follow up fixes to RuleCache
#458
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


8 changes: 8 additions & 0 deletions
benchmarks/build.gradle.kts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import com.diffplug.gradle.spotless.SpotlessExtension

plugins {
 java
 alias(libs.plugins.jmh)
Expand All@@ -10,6 +12,12 @@ java {
 targetCompatibility = JavaVersion.VERSION_21
}

configure<SpotlessExtension> {
 java {
 targetExclude("build/generated/**/*.java")
 }
}

val buf: Configuration by configurations.creating

tasks.register("configureBuf") {
Expand Down

32 changes: 12 additions & 20 deletions
benchmarks/src/jmh/java/build/buf/protovalidate/benchmarks/ValidationBenchmark.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,10 +19,8 @@
import build.buf.protovalidate.benchmarks.gen.ManyUnruledFieldsMessage;
import build.buf.protovalidate.benchmarks.gen.RepeatedRuleMessage;
import build.buf.protovalidate.benchmarks.gen.SimpleStringMessage;
import build.buf.protovalidate.exceptions.CompilationException;
import build.buf.protovalidate.exceptions.ValidationException;
import com.google.protobuf.Descriptors.Descriptor;
import java.util.Collections;
import com.google.protobuf.Descriptors.FieldDescriptor;
import java.util.concurrent.TimeUnit;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.BenchmarkMode;
Expand All@@ -41,9 +39,7 @@ public class ValidationBenchmark {
 private Validator validator;
 private SimpleStringMessage simple;
 private ManyUnruledFieldsMessage manyUnruled;

 // Descriptor captured once; cheap to reference during benchmark.
 private static final Descriptor REPEATED_RULE_DESC = RepeatedRuleMessage.getDescriptor();
 private RepeatedRuleMessage repeatedRule;

 @Setup
 public void setup() throws ValidationException {
Expand All@@ -65,13 +61,20 @@ public void setup() throws ValidationException {
 .setF9("v9")
 .build();

 RepeatedRuleMessage.Builder repeatedRuleBuilder = RepeatedRuleMessage.newBuilder();
 for (FieldDescriptor fd : RepeatedRuleMessage.getDescriptor().getFields()) {
 repeatedRuleBuilder.setField(fd, "v");
 }
 repeatedRule = repeatedRuleBuilder.build();

 // Warm evaluator cache for steady-state benchmarks.
 validator.validate(simple);
 validator.validate(manyUnruled);
 validator.validate(repeatedRule);
 }

 // Steady-state validate() benchmarks. These exercise the hot path after the
 // evaluator cache is warm. PR #451 does not affect this path.
 // evaluator cache is warm.

 @Benchmark
 public void validateSimple(Blackhole bh) throws ValidationException {
Expand All@@ -83,19 +86,8 @@ public void validateManyUnruled(Blackhole bh) throws ValidationException {
 bh.consume(validator.validate(manyUnruled));
 }

 // Compile-path benchmark. Measures building a fresh validator and warming
 // its RuleCache for RepeatedRuleMessage (20 string fields, all min_len).
 // PR #451 affects exactly this path: without the fix, the AST is rebuilt
 // for every field; with the fix, fields 2..20 hit the cache.
 //
 // Time is dominated by Cel environment construction in newCel(); the #451
 // signal is the delta on top of that baseline.
 @Benchmark
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
 public void compileValidatorForRepeated(Blackhole bh) throws CompilationException {
 Validator v =
 ValidatorFactory.newBuilder()
 .buildWithDescriptors(Collections.singletonList(REPEATED_RULE_DESC), false);
 bh.consume(v);
 public void validateRepeatedRule(Blackhole bh) throws ValidationException {
 bh.consume(validator.validate(repeatedRule));
 }
}

54 changes: 44 additions & 10 deletions
src/main/java/build/buf/protovalidate/RuleCache.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,11 +62,10 @@ private CelRule(
 }

 /**
 * Concurrent map for caching {@link FieldDescriptor} and their associated List of {@link
 * AstExpression}.
 * Compiled rules keyed by rule field descriptor (e.g. {@code StringRules.min_len}), shared across
 * all user fields that reference the same rule. The rule value is bound per call at eval time.
 */
 private static final Map<FieldDescriptor, List<CelRule>> descriptorMap =
 new ConcurrentHashMap<>();
 private final Map<FieldDescriptor, List<CelRule>> descriptorMap = new ConcurrentHashMap<>();

 /** The environment to use for evaluation. */
 private final Cel cel;
Expand DownExpand Up@@ -123,14 +122,14 @@ List<CompiledProgram> compile(
 }
 List<CompiledProgram> programs = new ArrayList<>();
 for (CelRule rule : completeProgramList) {
 Object fieldValue = message.getField(rule.field);
 programs.add(
 new CompiledProgram(
 rule.program,
 rule.astExpression.source,
 rule.rulePath,
 new ObjectValue(rule.field, message.getField(rule.field)),
 Variable.newRuleVariable(
 message, ProtoAdapter.toCel(rule.field, message.getField(rule.field)))));
 new ObjectValue(rule.field, fieldValue),
 Variable.newRuleVariable(message, ProtoAdapter.toCel(rule.field, fieldValue))));
 }
 return Collections.unmodifiableList(programs);
 }
Expand All@@ -148,8 +147,31 @@ List<CompiledProgram> compile(
 }
 build.buf.validate.PredefinedRules rules = getFieldRules(ruleFieldDesc);
 if (rules == null) return null;
 try {
 return descriptorMap.computeIfAbsent(
 ruleFieldDesc,
 key -> {
 try {
 return buildCelRules(fieldDescriptor, forItems, setOneof, key, message, rules);
 } catch (CompilationException e) {
 throw new UncheckedCompilationException(e);
 }
 });
 } catch (UncheckedCompilationException e) {
 throw e.getCompilationException();
 }
 }

 private List<CelRule> buildCelRules(
 FieldDescriptor fieldDescriptor,
 boolean forItems,
 FieldDescriptor setOneof,
 FieldDescriptor ruleFieldDesc,
 Message message,
 build.buf.validate.PredefinedRules rules)
 throws CompilationException {
 List<Expression> expressions = Expression.fromRules(rules.getCelList());
 celRules = new ArrayList<>(expressions.size());
List<CelRule> celRules = new ArrayList<>(expressions.size());
 Cel ruleCel = getRuleCel(fieldDescriptor, message, ruleFieldDesc, forItems);
 for (Expression expression : expressions) {
 FieldPath rulePath =
Expand All@@ -167,10 +189,22 @@ List<CompiledProgram> compile(
 }
 celRules.add(new CelRule(astExpression, program, ruleFieldDesc, rulePath));
 }
 descriptorMap.put(ruleFieldDesc, celRules);
 return celRules;
 }

 private static final class UncheckedCompilationException extends RuntimeException {
 private final CompilationException compilationException;

 UncheckedCompilationException(CompilationException cause) {
 super(cause);
 this.compilationException = cause;
 }

 CompilationException getCompilationException() {
 return compilationException;
 }
 }

 private build.buf.validate.@Nullable PredefinedRules getFieldRules(FieldDescriptor ruleFieldDesc)
 throws CompilationException {
 DescriptorProtos.FieldOptions options = ruleFieldDesc.getOptions();
Expand DownExpand Up@@ -310,7 +344,7 @@ private ResolvedRule resolveRules(
 DynamicMessage.parseFrom(
 expectedRuleMessageDescriptor, typeRules.toByteString(), extensionRegistry);
 } catch (InvalidProtocolBufferException e) {
 throw new RuntimeException(e);
 throw new CompilationException("failed to reparse rules with extension registry", e);
 }
 }
 if (!allowUnknownFields && !typeRules.getUnknownFields().isEmpty()) {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Follow up fixes to RuleCache#458

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

pkwarren
merged 1 commit into

from

Apr 23, 2026
 Merged


Follow up fixes to RuleCache
#458
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


8 changes: 8 additions & 0 deletions
benchmarks/build.gradle.kts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import com.diffplug.gradle.spotless.SpotlessExtension

plugins {
 java
 alias(libs.plugins.jmh)
Expand All@@ -10,6 +12,12 @@ java {
 targetCompatibility = JavaVersion.VERSION_21
}

configure<SpotlessExtension> {
 java {
 targetExclude("build/generated/**/*.java")
 }
}

val buf: Configuration by configurations.creating

tasks.register("configureBuf") {
Expand Down

32 changes: 12 additions & 20 deletions
benchmarks/src/jmh/java/build/buf/protovalidate/benchmarks/ValidationBenchmark.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,10 +19,8 @@
import build.buf.protovalidate.benchmarks.gen.ManyUnruledFieldsMessage;
import build.buf.protovalidate.benchmarks.gen.RepeatedRuleMessage;
import build.buf.protovalidate.benchmarks.gen.SimpleStringMessage;
import build.buf.protovalidate.exceptions.CompilationException;
import build.buf.protovalidate.exceptions.ValidationException;
import com.google.protobuf.Descriptors.Descriptor;
import java.util.Collections;
import com.google.protobuf.Descriptors.FieldDescriptor;
import java.util.concurrent.TimeUnit;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.BenchmarkMode;
Expand All@@ -41,9 +39,7 @@ public class ValidationBenchmark {
 private Validator validator;
 private SimpleStringMessage simple;
 private ManyUnruledFieldsMessage manyUnruled;

 // Descriptor captured once; cheap to reference during benchmark.
 private static final Descriptor REPEATED_RULE_DESC = RepeatedRuleMessage.getDescriptor();
 private RepeatedRuleMessage repeatedRule;

 @Setup
 public void setup() throws ValidationException {
Expand All@@ -65,13 +61,20 @@ public void setup() throws ValidationException {
 .setF9("v9")
 .build();

 RepeatedRuleMessage.Builder repeatedRuleBuilder = RepeatedRuleMessage.newBuilder();
 for (FieldDescriptor fd : RepeatedRuleMessage.getDescriptor().getFields()) {
 repeatedRuleBuilder.setField(fd, "v");
 }
 repeatedRule = repeatedRuleBuilder.build();

 // Warm evaluator cache for steady-state benchmarks.
 validator.validate(simple);
 validator.validate(manyUnruled);
 validator.validate(repeatedRule);
 }

 // Steady-state validate() benchmarks. These exercise the hot path after the
 // evaluator cache is warm. PR #451 does not affect this path.
 // evaluator cache is warm.

 @Benchmark
 public void validateSimple(Blackhole bh) throws ValidationException {
Expand All@@ -83,19 +86,8 @@ public void validateManyUnruled(Blackhole bh) throws ValidationException {
 bh.consume(validator.validate(manyUnruled));
 }

 // Compile-path benchmark. Measures building a fresh validator and warming
 // its RuleCache for RepeatedRuleMessage (20 string fields, all min_len).
 // PR #451 affects exactly this path: without the fix, the AST is rebuilt
 // for every field; with the fix, fields 2..20 hit the cache.
 //
 // Time is dominated by Cel environment construction in newCel(); the #451
 // signal is the delta on top of that baseline.
 @Benchmark
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
 public void compileValidatorForRepeated(Blackhole bh) throws CompilationException {
 Validator v =
 ValidatorFactory.newBuilder()
 .buildWithDescriptors(Collections.singletonList(REPEATED_RULE_DESC), false);
 bh.consume(v);
 public void validateRepeatedRule(Blackhole bh) throws ValidationException {
 bh.consume(validator.validate(repeatedRule));
 }
}

54 changes: 44 additions & 10 deletions
src/main/java/build/buf/protovalidate/RuleCache.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,11 +62,10 @@ private CelRule(
 }

 /**
 * Concurrent map for caching {@link FieldDescriptor} and their associated List of {@link
 * AstExpression}.
 * Compiled rules keyed by rule field descriptor (e.g. {@code StringRules.min_len}), shared across
 * all user fields that reference the same rule. The rule value is bound per call at eval time.
 */
 private static final Map<FieldDescriptor, List<CelRule>> descriptorMap =
 new ConcurrentHashMap<>();
 private final Map<FieldDescriptor, List<CelRule>> descriptorMap = new ConcurrentHashMap<>();

 /** The environment to use for evaluation. */
 private final Cel cel;
Expand DownExpand Up@@ -123,14 +122,14 @@ List<CompiledProgram> compile(
 }
 List<CompiledProgram> programs = new ArrayList<>();
 for (CelRule rule : completeProgramList) {
 Object fieldValue = message.getField(rule.field);
 programs.add(
 new CompiledProgram(
 rule.program,
 rule.astExpression.source,
 rule.rulePath,
 new ObjectValue(rule.field, message.getField(rule.field)),
 Variable.newRuleVariable(
 message, ProtoAdapter.toCel(rule.field, message.getField(rule.field)))));
 new ObjectValue(rule.field, fieldValue),
 Variable.newRuleVariable(message, ProtoAdapter.toCel(rule.field, fieldValue))));
 }
 return Collections.unmodifiableList(programs);
 }
Expand All@@ -148,8 +147,31 @@ List<CompiledProgram> compile(
 }
 build.buf.validate.PredefinedRules rules = getFieldRules(ruleFieldDesc);
 if (rules == null) return null;
 try {
 return descriptorMap.computeIfAbsent(
 ruleFieldDesc,
 key -> {
 try {
 return buildCelRules(fieldDescriptor, forItems, setOneof, key, message, rules);
 } catch (CompilationException e) {
 throw new UncheckedCompilationException(e);
 }
 });
 } catch (UncheckedCompilationException e) {
 throw e.getCompilationException();
 }
 }

 private List<CelRule> buildCelRules(
 FieldDescriptor fieldDescriptor,
 boolean forItems,
 FieldDescriptor setOneof,
 FieldDescriptor ruleFieldDesc,
 Message message,
 build.buf.validate.PredefinedRules rules)
 throws CompilationException {
 List<Expression> expressions = Expression.fromRules(rules.getCelList());
 celRules = new ArrayList<>(expressions.size());
List<CelRule> celRules = new ArrayList<>(expressions.size());
 Cel ruleCel = getRuleCel(fieldDescriptor, message, ruleFieldDesc, forItems);
 for (Expression expression : expressions) {
 FieldPath rulePath =
Expand All@@ -167,10 +189,22 @@ List<CompiledProgram> compile(
 }
 celRules.add(new CelRule(astExpression, program, ruleFieldDesc, rulePath));
 }
 descriptorMap.put(ruleFieldDesc, celRules);
 return celRules;
 }

 private static final class UncheckedCompilationException extends RuntimeException {
 private final CompilationException compilationException;

 UncheckedCompilationException(CompilationException cause) {
 super(cause);
 this.compilationException = cause;
 }

 CompilationException getCompilationException() {
 return compilationException;
 }
 }

 private build.buf.validate.@Nullable PredefinedRules getFieldRules(FieldDescriptor ruleFieldDesc)
 throws CompilationException {
 DescriptorProtos.FieldOptions options = ruleFieldDesc.getOptions();
Expand DownExpand Up@@ -310,7 +344,7 @@ private ResolvedRule resolveRules(
 DynamicMessage.parseFrom(
 expectedRuleMessageDescriptor, typeRules.toByteString(), extensionRegistry);
 } catch (InvalidProtocolBufferException e) {
 throw new RuntimeException(e);
 throw new CompilationException("failed to reparse rules with extension registry", e);
 }
 }
 if (!allowUnknownFields && !typeRules.getUnknownFields().isEmpty()) {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Follow up fixes to RuleCache#458

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

pkwarren
merged 1 commit into

from

Apr 23, 2026
 Merged


Follow up fixes to RuleCache
#458
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


8 changes: 8 additions & 0 deletions
benchmarks/build.gradle.kts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import com.diffplug.gradle.spotless.SpotlessExtension

plugins {
 java
 alias(libs.plugins.jmh)
Expand All@@ -10,6 +12,12 @@ java {
 targetCompatibility = JavaVersion.VERSION_21
}

configure<SpotlessExtension> {
 java {
 targetExclude("build/generated/**/*.java")
 }
}

val buf: Configuration by configurations.creating

tasks.register("configureBuf") {
Expand Down

32 changes: 12 additions & 20 deletions
benchmarks/src/jmh/java/build/buf/protovalidate/benchmarks/ValidationBenchmark.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,10 +19,8 @@
import build.buf.protovalidate.benchmarks.gen.ManyUnruledFieldsMessage;
import build.buf.protovalidate.benchmarks.gen.RepeatedRuleMessage;
import build.buf.protovalidate.benchmarks.gen.SimpleStringMessage;
import build.buf.protovalidate.exceptions.CompilationException;
import build.buf.protovalidate.exceptions.ValidationException;
import com.google.protobuf.Descriptors.Descriptor;
import java.util.Collections;
import com.google.protobuf.Descriptors.FieldDescriptor;
import java.util.concurrent.TimeUnit;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.BenchmarkMode;
Expand All@@ -41,9 +39,7 @@ public class ValidationBenchmark {
 private Validator validator;
 private SimpleStringMessage simple;
 private ManyUnruledFieldsMessage manyUnruled;

 // Descriptor captured once; cheap to reference during benchmark.
 private static final Descriptor REPEATED_RULE_DESC = RepeatedRuleMessage.getDescriptor();
 private RepeatedRuleMessage repeatedRule;

 @Setup
 public void setup() throws ValidationException {
Expand All@@ -65,13 +61,20 @@ public void setup() throws ValidationException {
 .setF9("v9")
 .build();

 RepeatedRuleMessage.Builder repeatedRuleBuilder = RepeatedRuleMessage.newBuilder();
 for (FieldDescriptor fd : RepeatedRuleMessage.getDescriptor().getFields()) {
 repeatedRuleBuilder.setField(fd, "v");
 }
 repeatedRule = repeatedRuleBuilder.build();

 // Warm evaluator cache for steady-state benchmarks.
 validator.validate(simple);
 validator.validate(manyUnruled);
 validator.validate(repeatedRule);
 }

 // Steady-state validate() benchmarks. These exercise the hot path after the
 // evaluator cache is warm. PR #451 does not affect this path.
 // evaluator cache is warm.

 @Benchmark
 public void validateSimple(Blackhole bh) throws ValidationException {
Expand All@@ -83,19 +86,8 @@ public void validateManyUnruled(Blackhole bh) throws ValidationException {
 bh.consume(validator.validate(manyUnruled));
 }

 // Compile-path benchmark. Measures building a fresh validator and warming
 // its RuleCache for RepeatedRuleMessage (20 string fields, all min_len).
 // PR #451 affects exactly this path: without the fix, the AST is rebuilt
 // for every field; with the fix, fields 2..20 hit the cache.
 //
 // Time is dominated by Cel environment construction in newCel(); the #451
 // signal is the delta on top of that baseline.
 @Benchmark
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
 public void compileValidatorForRepeated(Blackhole bh) throws CompilationException {
 Validator v =
 ValidatorFactory.newBuilder()
 .buildWithDescriptors(Collections.singletonList(REPEATED_RULE_DESC), false);
 bh.consume(v);
 public void validateRepeatedRule(Blackhole bh) throws ValidationException {
 bh.consume(validator.validate(repeatedRule));
 }
}

54 changes: 44 additions & 10 deletions
src/main/java/build/buf/protovalidate/RuleCache.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,11 +62,10 @@ private CelRule(
 }

 /**
 * Concurrent map for caching {@link FieldDescriptor} and their associated List of {@link
 * AstExpression}.
 * Compiled rules keyed by rule field descriptor (e.g. {@code StringRules.min_len}), shared across
 * all user fields that reference the same rule. The rule value is bound per call at eval time.
 */
 private static final Map<FieldDescriptor, List<CelRule>> descriptorMap =
 new ConcurrentHashMap<>();
 private final Map<FieldDescriptor, List<CelRule>> descriptorMap = new ConcurrentHashMap<>();

 /** The environment to use for evaluation. */
 private final Cel cel;
Expand DownExpand Up@@ -123,14 +122,14 @@ List<CompiledProgram> compile(
 }
 List<CompiledProgram> programs = new ArrayList<>();
 for (CelRule rule : completeProgramList) {
 Object fieldValue = message.getField(rule.field);
 programs.add(
 new CompiledProgram(
 rule.program,
 rule.astExpression.source,
 rule.rulePath,
 new ObjectValue(rule.field, message.getField(rule.field)),
 Variable.newRuleVariable(
 message, ProtoAdapter.toCel(rule.field, message.getField(rule.field)))));
 new ObjectValue(rule.field, fieldValue),
 Variable.newRuleVariable(message, ProtoAdapter.toCel(rule.field, fieldValue))));
 }
 return Collections.unmodifiableList(programs);
 }
Expand All@@ -148,8 +147,31 @@ List<CompiledProgram> compile(
 }
 build.buf.validate.PredefinedRules rules = getFieldRules(ruleFieldDesc);
 if (rules == null) return null;
 try {
 return descriptorMap.computeIfAbsent(
 ruleFieldDesc,
 key -> {
 try {
 return buildCelRules(fieldDescriptor, forItems, setOneof, key, message, rules);
 } catch (CompilationException e) {
 throw new UncheckedCompilationException(e);
 }
 });
 } catch (UncheckedCompilationException e) {
 throw e.getCompilationException();
 }
 }

 private List<CelRule> buildCelRules(
 FieldDescriptor fieldDescriptor,
 boolean forItems,
 FieldDescriptor setOneof,
 FieldDescriptor ruleFieldDesc,
 Message message,
 build.buf.validate.PredefinedRules rules)
 throws CompilationException {
 List<Expression> expressions = Expression.fromRules(rules.getCelList());
 celRules = new ArrayList<>(expressions.size());
List<CelRule> celRules = new ArrayList<>(expressions.size());
 Cel ruleCel = getRuleCel(fieldDescriptor, message, ruleFieldDesc, forItems);
 for (Expression expression : expressions) {
 FieldPath rulePath =
Expand All@@ -167,10 +189,22 @@ List<CompiledProgram> compile(
 }
 celRules.add(new CelRule(astExpression, program, ruleFieldDesc, rulePath));
 }
 descriptorMap.put(ruleFieldDesc, celRules);
 return celRules;
 }

 private static final class UncheckedCompilationException extends RuntimeException {
 private final CompilationException compilationException;

 UncheckedCompilationException(CompilationException cause) {
 super(cause);
 this.compilationException = cause;
 }

 CompilationException getCompilationException() {
 return compilationException;
 }
 }

 private build.buf.validate.@Nullable PredefinedRules getFieldRules(FieldDescriptor ruleFieldDesc)
 throws CompilationException {
 DescriptorProtos.FieldOptions options = ruleFieldDesc.getOptions();
Expand DownExpand Up@@ -310,7 +344,7 @@ private ResolvedRule resolveRules(
 DynamicMessage.parseFrom(
 expectedRuleMessageDescriptor, typeRules.toByteString(), extensionRegistry);
 } catch (InvalidProtocolBufferException e) {
 throw new RuntimeException(e);
 throw new CompilationException("failed to reparse rules with extension registry", e);
 }
 }
 if (!allowUnknownFields && !typeRules.getUnknownFields().isEmpty()) {
Expand Down
Loading