Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -203,10 +203,10 @@ private TypeSpec type() {
for (ClassName groupIdClass : GROUP_IDS_CLASSES) {
builder.addMethod(addRawInputLoop(groupIdClass, blockType(aggParam.type())));
builder.addMethod(addRawInputLoop(groupIdClass, vectorType(aggParam.type())));
builder.addMethod(addIntermediateInput(groupIdClass));
}
builder.addMethod(selectedMayContainUnseenGroups());
builder.addMethod(addIntermediateInput());
builder.addMethod(addIntermediateRowInput());
builder.addMethod(selectedMayContainUnseenGroups());
builder.addMethod(evaluateIntermediate());
builder.addMethod(evaluateFinal());
builder.addMethod(toStringMethod());
Expand Down Expand Up @@ -580,11 +580,12 @@ private MethodSpec selectedMayContainUnseenGroups() {
return builder.build();
}

private MethodSpec addIntermediateInput() {
private MethodSpec addIntermediateInput(TypeName groupsType) {
boolean groupsIsBlock = groupsType.toString().endsWith("Block");
MethodSpec.Builder builder = MethodSpec.methodBuilder("addIntermediateInput");
builder.addAnnotation(Override.class).addModifiers(Modifier.PUBLIC);
builder.addParameter(TypeName.INT, "positionOffset");
builder.addParameter(INT_VECTOR, "groups");
builder.addParameter(groupsType, "groups");
builder.addParameter(PAGE, "page");

builder.addStatement("state.enableGroupIdTracking(new $T.Empty())", SEEN_GROUP_IDS);
Expand All @@ -610,7 +611,18 @@ private MethodSpec addIntermediateInput() {
}
builder.beginControlFlow("for (int groupPosition = 0; groupPosition < groups.getPositionCount(); groupPosition++)");
{
builder.addStatement("int groupId = groups.getInt(groupPosition)");
if (groupsIsBlock) {
builder.beginControlFlow("if (groups.isNull(groupPosition))");
builder.addStatement("continue");
builder.endControlFlow();
builder.addStatement("int groupStart = groups.getFirstValueIndex(groupPosition)");
builder.addStatement("int groupEnd = groupStart + groups.getValueCount(groupPosition)");
builder.beginControlFlow("for (int g = groupStart; g < groupEnd; g++)");
builder.addStatement("int groupId = groups.getInt(g)");
} else {
builder.addStatement("int groupId = groups.getInt(groupPosition)");
}

if (aggState.declaredType().isPrimitive()) {
if (warnExceptions.isEmpty()) {
assert intermediateState.size() == 2;
Expand Down Expand Up @@ -661,6 +673,9 @@ private MethodSpec addIntermediateInput() {
declarationType
);
}
if (groupsIsBlock) {
builder.endControlFlow();
}
builder.endControlFlow();
}
return builder.build();
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading