Skip to content

Attach RowFn validity directly to canonical output #10742

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

Draft
connortsui20 wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

Attach RowFn validity directly to canonical output #10742

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
18 changes: 17 additions & 1 deletion vortex-array/src/scalar_fn/unstable/row/batch/execute/dense.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,12 @@ use vortex_mask::MaskValuesRef;
use super::super::RowFnExecutionArgs;
use super::super::args::BorrowedRowFnArgs;
use crate::ArrayRef;
use crate::Canonical;
use crate::ExecutionCtx;
use crate::IntoArray;
use crate::arrays::masked::mask_validity_canonical;
use crate::builtins::ArrayBuiltins;
use crate::canonical::AnyCanonical;
use crate::scalar_fn::unstable::row::execute::DenseAttempt;
use crate::validity::Validity;

Expand Down Expand Up @@ -107,7 +111,19 @@ impl RowFnExecutionArgs {
Validity::NonNullable | Validity::AllValid => {
self.finalize_output(values, self.row_count)
}
Validity::Array(valid) => self.finalize_output(values.mask(valid)?, self.row_count),
Validity::Array(valid) => {
// Canonical output can carry validity directly, without a second mask execution.
let values = match values.as_opt::<AnyCanonical>() {
Some(canonical) => mask_validity_canonical(
Canonical::from(canonical),
Validity::Array(valid),
ctx,
)?
.into_array(),
None => values.mask(valid)?,
};
self.finalize_output(values, self.row_count)
}
Validity::AllInvalid => {
unreachable!("all-invalid validity is handled before dense row execution")
}
Expand Down
Loading