Skip to content
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.

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

feat!: provide key columns as scalars (vs. vectors) to RollingFormula #6375

Merged
merged 4 commits into from
Nov 19, 2024
Merged
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Update based on review from AggFormula PR
lbooker42 committed Nov 15, 2024
commit d20aa4f002cfd780de8784c0d486593af86fbee6
Original file line number Diff line number Diff line change
@@ -1471,9 +1471,11 @@ private UpdateByOperator makeRollingFormulaMultiColumnOperator(
throw new IllegalArgumentException("RollingFormula does not support virtual row variables");
}

final String[] inputKeyColumns = Arrays.stream(allInputColumns)
.filter(groupByColumnSet::contains)
.toArray(String[]::new);
final Map<Boolean, List<String>> partitioned = Arrays.stream(allInputColumns)
.collect(Collectors.partitioningBy(groupByColumnSet::contains));
final String[] inputKeyColumns = partitioned.get(true).toArray(String[]::new);
final String[] inputNonKeyColumns = partitioned.get(false).toArray(String[]::new);

final Class<?>[] inputKeyColumnTypes = new Class[inputKeyColumns.length];
final Class<?>[] inputKeyComponentTypes = new Class[inputKeyColumns.length];
for (int i = 0; i < inputKeyColumns.length; i++) {
@@ -1482,9 +1484,6 @@ private UpdateByOperator makeRollingFormulaMultiColumnOperator(
inputKeyComponentTypes[i] = columnDef.getComponentType();
}

final String[] inputNonKeyColumns = Arrays.stream(allInputColumns)
.filter(col -> !groupByColumnSet.contains(col))
.toArray(String[]::new);
final Class<?>[] inputNonKeyColumnTypes = new Class[inputNonKeyColumns.length];
final Class<?>[] inputNonKeyVectorTypes = new Class[inputNonKeyColumns.length];
for (int i = 0; i < inputNonKeyColumns.length; i++) {
@@ -1493,7 +1492,6 @@ private UpdateByOperator makeRollingFormulaMultiColumnOperator(
inputNonKeyVectorTypes[i] = vectorColumnDefinitions.get(inputNonKeyColumns[i]).getDataType();
}


final String[] affectingColumns;
if (rs.revWindowScale().timestampCol() == null) {
affectingColumns = ArrayUtils.addAll(inputKeyColumns, inputNonKeyColumns);
Original file line number Diff line number Diff line change
@@ -455,7 +455,6 @@ private static void assignKeyValue(
}
// endregion value-setters


@Override
public void startTrackingPrev() {
outputSource.startTrackingPrevValues();