Skip to content

Commit 133aacd

Browse files
authored
Fix semantic merge conflit in is_nan pushdown (#9984)
Signed-off-by: Robert Kruszewski <github@robertk.io>
1 parent 2919b50 commit 133aacd

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

‎vortex-array/src/stats/rewrite/builtins.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -345,17 +345,17 @@ impl StatsRewriteRule for IsNanNaNCountStatsRewrite {
345345
fn falsify(
346346
&self,
347347
expr: &BoundExpression,
348-
ctx: &StatsRewriteCtx<'_>,
348+
_session: &VortexSession,
349349
) -> VortexResult<Option<BoundExpression>> {
350-
Ok(nan_count(expr.child(0), ctx).map(|nan_count| eq(nan_count, lit(0u64))))
350+
Ok(nan_count(expr.child(0)).map(|nan_count| eq(nan_count, lit(0u64))))
351351
}
352352

353353
fn satisfy(
354354
&self,
355355
expr: &BoundExpression,
356-
ctx: &StatsRewriteCtx<'_>,
356+
_session: &VortexSession,
357357
) -> VortexResult<Option<BoundExpression>> {
358-
Ok(nan_count(expr.child(0), ctx).map(|nan_count| eq(nan_count, row_count())))
358+
Ok(nan_count(expr.child(0)).map(|nan_count| eq(nan_count, row_count())))
359359
}
360360
}
361361

@@ -372,7 +372,7 @@ impl StatsRewriteRule for IsNanAllNonNanStatsRewrite {
372372
fn falsify(
373373
&self,
374374
expr: &BoundExpression,
375-
_ctx: &StatsRewriteCtx<'_>,
375+
_session: &VortexSession,
376376
) -> VortexResult<Option<BoundExpression>> {
377377
Ok(Some(all_non_nan(expr.child(0))))
378378
}
@@ -391,7 +391,7 @@ impl StatsRewriteRule for IsNanAllNanStatsRewrite {
391391
fn satisfy(
392392
&self,
393393
expr: &BoundExpression,
394-
_ctx: &StatsRewriteCtx<'_>,
394+
_session: &VortexSession,
395395
) -> VortexResult<Option<BoundExpression>> {
396396
Ok(Some(all_nan(expr.child(0))))
397397
}
@@ -598,8 +598,8 @@ fn null_count(expr: &BoundExpression) -> Option<BoundExpression> {
598598
stat_expr(expr, Stat::NullCount)
599599
}
600600

601-
fn nan_count(expr: &BoundExpression, ctx: &StatsRewriteCtx<'_>) -> Option<BoundExpression> {
602-
stat_expr(expr, Stat::NaNCount, ctx)
601+
fn nan_count(expr: &BoundExpression) -> Option<BoundExpression> {
602+
stat_expr(expr, Stat::NaNCount)
603603
}
604604

605605
fn all_null(expr: &BoundExpression) -> BoundExpression {

0 commit comments

Comments
 (0)