Skip to content

Commit f3fdb25

Browse files
more simplification
1 parent 7fea7fa commit f3fdb25

2 files changed

Lines changed: 4 additions & 40 deletions

File tree

crates/execution/src/lib.rs

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ pub mod pipelined;
1616

1717
#[derive(Debug, Clone, Copy)]
1818
pub struct ExecutionParams {
19-
sender: Option<Identity>,
19+
sender: Identity,
2020
}
2121

2222
impl ExecutionParams {
2323
pub fn from_sender(sender: Identity) -> Self {
24-
Self { sender: Some(sender) }
24+
Self { sender }
2525
}
2626

2727
pub fn from_auth(auth: &AuthCtx) -> Self {
@@ -32,13 +32,8 @@ impl ExecutionParams {
3232
impl ParamResolver for ExecutionParams {
3333
fn resolve_param(&self, param: Parameter, ty: &AlgebraicType) -> AlgebraicValue {
3434
match param {
35-
Parameter::Sender if ty.is_identity() => self.sender.expect("missing sender binding for :sender").into(),
36-
Parameter::Sender if ty.is_bytes() => AlgebraicValue::Bytes(
37-
self.sender
38-
.expect("missing sender binding for :sender")
39-
.to_be_byte_array()
40-
.into(),
41-
),
35+
Parameter::Sender if ty.is_identity() => self.sender.into(),
36+
Parameter::Sender if ty.is_bytes() => AlgebraicValue::Bytes(self.sender.to_be_byte_array().into()),
4237
Parameter::Sender => panic!("unsupported type for :sender: {ty:?}"),
4338
}
4439
}

crates/physical-plan/src/plan.rs

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,6 @@ pub trait ParamResolver {
3636
fn resolve_param(&self, param: Parameter, ty: &AlgebraicType) -> AlgebraicValue;
3737
}
3838

39-
struct NoParams;
40-
41-
impl ParamResolver for NoParams {
42-
fn resolve_param(&self, param: Parameter, _: &AlgebraicType) -> AlgebraicValue {
43-
panic!("unbound query parameter: {param:?}")
44-
}
45-
}
46-
4739
/// Physical plans always terminate with a projection.
4840
/// This type of projection returns row ids.
4941
///
@@ -1493,19 +1485,6 @@ impl PhysicalExpr {
14931485
}
14941486
}
14951487

1496-
/// Evaluate this boolean expression over `row`
1497-
pub fn eval_bool(&self, row: &impl ProjectField) -> bool {
1498-
self.eval(row).as_bool().copied().unwrap_or(false)
1499-
}
1500-
1501-
/// Evaluate this boolean expression over `row`
1502-
pub fn eval_bool_with_metrics(&self, row: &impl ProjectField, bytes_scanned: &mut usize) -> bool {
1503-
self.eval_with_metrics(row, bytes_scanned)
1504-
.as_bool()
1505-
.copied()
1506-
.unwrap_or(false)
1507-
}
1508-
15091488
/// Evaluate this boolean expression over `row` with runtime parameters.
15101489
pub fn eval_bool_with_params(
15111490
&self,
@@ -1519,16 +1498,6 @@ impl PhysicalExpr {
15191498
.unwrap_or(false)
15201499
}
15211500

1522-
/// Evaluate this expression over `row`
1523-
fn eval(&self, row: &impl ProjectField) -> Cow<'_, AlgebraicValue> {
1524-
self.eval_with_metrics(row, &mut 0)
1525-
}
1526-
1527-
/// Evaluate this expression over `row`
1528-
pub fn eval_with_metrics(&self, row: &impl ProjectField, bytes_scanned: &mut usize) -> Cow<'_, AlgebraicValue> {
1529-
self.eval_with_params(row, &NoParams, bytes_scanned)
1530-
}
1531-
15321501
/// Evaluate this expression over `row` with runtime parameters.
15331502
pub fn eval_with_params<'a>(
15341503
&'a self,

0 commit comments

Comments
 (0)