Skip to content

Remove combineValueCount from code generation #121637

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
merged 1 commit into from
Feb 5, 2025
Merged

Remove combineValueCount from code generation #121637

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: 0 additions & 5 deletions x-pack/plugin/esql/compute/ann/src/main/java/org/elasticsearch/compute/ann/Aggregator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,6 @@
* are ever collected.
* </p>
* <p>
* The generation code will also look for a method called {@code combineValueCount}
* which is called once per received block with a count of values. NOTE: We may
* not need this after we convert AVG into a composite operation.
* </p>
* <p>
* The generation code also looks for the optional methods {@code combineIntermediate}
* and {@code evaluateFinal} which are used to combine intermediate states and
* produce the final output. If the first is missing then the generated code will
Expand Down
8 changes: 0 additions & 8 deletions ...n/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/AggregatorImplementer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ public class AggregatorImplementer {
private final List<TypeMirror> warnExceptions;
private final ExecutableElement init;
private final ExecutableElement combine;
private final ExecutableElement combineValueCount;
private final ExecutableElement combineIntermediate;
private final ExecutableElement evaluateFinal;
private final ClassName implementation;
Expand Down Expand Up @@ -115,7 +114,6 @@ public AggregatorImplementer(
TypeName firstParamType = TypeName.get(e.getParameters().get(0).asType());
return firstParamType.isPrimitive() || firstParamType.toString().equals(stateType.toString());
});
this.combineValueCount = findMethod(declarationType, "combineValueCount");
this.combineIntermediate = findMethod(declarationType, "combineIntermediate");
this.evaluateFinal = findMethod(declarationType, "evaluateFinal");
this.createParameters = init.getParameters()
Expand Down Expand Up @@ -415,9 +413,6 @@ private MethodSpec addRawVector(boolean masked) {
combineRawInput(builder, "vector");
}
builder.endControlFlow();
if (combineValueCount != null) {
builder.addStatement("$T.combineValueCount(state, vector.getPositionCount())", declarationType);
}
return builder.build();
}

Expand Down Expand Up @@ -459,9 +454,6 @@ private MethodSpec addRawBlock(boolean masked) {
}
}
builder.endControlFlow();
if (combineValueCount != null) {
builder.addStatement("$T.combineValueCount(state, block.getTotalValueCount())", declarationType);
}
return builder.build();
}

Expand Down