Skip to content

Commit 2a18b4b

Browse files
committed
Remove unused warnings field and related logic from NowEvaluator and conditionally generate it in EvaluatorImplementer.
1 parent 3b25b97 commit 2a18b4b

File tree

2 files changed

+11
-19
lines changed

2 files changed

+11
-19
lines changed

x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/EvaluatorImplementer.java

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,25 +105,32 @@ private TypeSpec type() {
105105
processFunction.args.forEach(a -> a.declareField(builder));
106106
builder.addField(DRIVER_CONTEXT, "driverContext", Modifier.PRIVATE, Modifier.FINAL);
107107

108-
builder.addField(WARNINGS, "warnings", Modifier.PRIVATE);
108+
var hasFixedProcessFunctionArgs = processFunction.args.stream()
109+
.anyMatch(x -> x instanceof FixedProcessFunctionArg == false);
110+
var usesWarnings = processFunction.warnExceptions.isEmpty() == false || hasFixedProcessFunctionArgs;
109111

112+
if (usesWarnings) {
113+
builder.addField(WARNINGS, "warnings", Modifier.PRIVATE);
114+
}
110115
builder.addMethod(ctor());
111116
builder.addMethod(eval());
112117
builder.addMethod(processFunction.baseRamBytesUsed());
113118

114119
if (processOutputsMultivalued) {
115-
if (processFunction.args.stream().anyMatch(x -> x instanceof FixedProcessFunctionArg == false)) {
120+
if (hasFixedProcessFunctionArgs) {
116121
builder.addMethod(realEval(true));
117122
}
118123
} else {
119-
if (processFunction.args.stream().anyMatch(x -> x instanceof FixedProcessFunctionArg == false)) {
124+
if (hasFixedProcessFunctionArgs) {
120125
builder.addMethod(realEval(true));
121126
}
122127
builder.addMethod(realEval(false));
123128
}
124129
builder.addMethod(processFunction.toStringMethod(implementation));
125130
builder.addMethod(processFunction.close());
126-
builder.addMethod(warnings());
131+
if (usesWarnings) {
132+
builder.addMethod(warnings());
133+
}
127134
return builder.build();
128135
}
129136

x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/date/NowEvaluator.java

Lines changed: 0 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)