Skip to content

Commit 813aff7

Browse files
committed
Enable CI when PR targets non-develop branch
Signed-off-by: Nicholas Gates <[email protected]>
1 parent f0616ca commit 813aff7

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

.github/workflows/bench-pr.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ name: PR Benchmarks
55
on:
66
pull_request:
77
types: [labeled, synchronize]
8-
branches: ["develop"]
98
workflow_dispatch: { }
109

1110
permissions:

.github/workflows/sql-pr.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ name: PR SQL Benchmarks
55
on:
66
pull_request:
77
types: [labeled, synchronize]
8-
branches: ["develop"]
98
workflow_dispatch: { }
109

1110
permissions:

vortex-array/src/vtable/mod.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,10 @@ use vortex_mask::Mask;
3131
use crate::Array;
3232
use crate::ArrayRef;
3333
use crate::IntoArray;
34+
use crate::VectorExecutor;
3435
use crate::kernel::BindCtx;
3536
use crate::kernel::KernelRef;
37+
use crate::kernel::kernel;
3638
use crate::serde::ArrayChildren;
3739

3840
/// The array [`VTable`] encapsulates logic for an Array type within Vortex.
@@ -143,8 +145,12 @@ pub trait VTable: 'static + Sized + Send + Sync + Debug {
143145
/// arrays as needed.
144146
fn bind_kernel(array: &Self::Array, ctx: &mut BindCtx) -> VortexResult<KernelRef> {
145147
// TODO(ngates): convert arrays to canonicalize over vectors.
146-
let canonical = Self::CanonicalVTable::canonicalize(array);
147-
canonical.into_array().bind_kernel(ctx)
148+
let array = array.clone();
149+
let session = ctx.session().clone();
150+
Ok(kernel(move || {
151+
let canonical = Self::CanonicalVTable::canonicalize(&array);
152+
canonical.into_array().execute_vector_optimized(&session)
153+
}))
148154
}
149155

150156
/// Return an array filtered using the given mask.

vortex-layout/src/layouts/flat/reader.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,9 @@ impl LayoutReader for FlatReader {
152152
// Apply the expression to the array.
153153
let array = array.apply(&expr)?;
154154

155-
log::info!("Filter Array:\n{}", array.display_tree());
155+
log::debug!("Filter Array:\n{}", array.display_tree());
156156
let array = optimizer.optimize_array(&array)?;
157-
log::warn!("Optimized Filter Array:\n{}", array.display_tree());
157+
log::info!("Optimized Filter Array:\n{}", array.display_tree());
158158

159159
// Evaluate the array into a mask.
160160
let array_mask = array.execute_mask(&session)?;

0 commit comments

Comments
 (0)