Skip to content

lib: Don't panic in RelValueRef::get #450

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

Merged
merged 1 commit into from
Oct 19, 2023
Merged

lib: Don't panic in RelValueRef::get #450

Show file tree
Hide file tree
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
8 changes: 4 additions & 4 deletions crates/core/src/vm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,16 +112,16 @@ fn join_inner<'a>(
rhs,
header,
move |row| {
let f = row.get(&key_lhs, &key_lhs_header);
let f = row.get(&key_lhs, &key_lhs_header)?;
Ok(f.into())
},
move |row| {
let f = row.get(&key_rhs, &key_rhs_header);
let f = row.get(&key_rhs, &key_rhs_header)?;
Ok(f.into())
},
move |l, r| {
let l = l.get(&col_lhs, &col_lhs_header);
let r = r.get(&col_rhs, &col_rhs_header);
let l = l.get(&col_lhs, &col_lhs_header)?;
let r = r.get(&col_rhs, &col_rhs_header)?;
Ok(l == r)
},
move |l, r| {
Expand Down
2 changes: 2 additions & 0 deletions crates/lib/src/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@ pub enum AuthError {
pub enum RelationError {
#[error("Field `{1}` not found. Must be one of {0}")]
FieldNotFound(Header, FieldName),
#[error("Field `{1}` not found at position {0}")]
FieldNotFoundAtPos(usize, FieldName),
#[error("Field `{0}` fail to infer the type: {1}")]
TypeInference(FieldName, TypeError),
#[error("Field declaration only support `table.field` or `field`. It gets instead `{0}`")]
Expand Down
24 changes: 12 additions & 12 deletions crates/lib/src/relation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,21 +416,21 @@ impl<'a> RelValueRef<'a> {
Self { data }
}

pub fn get(&self, col: &'a FieldExpr, header: &'a Header) -> &'a AlgebraicValue {
match col {
pub fn get(&self, col: &'a FieldExpr, header: &'a Header) -> Result<&'a AlgebraicValue, RelationError> {
Copy link
Collaborator

@joshua-spacetime joshua-spacetime Oct 19, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mamcx would know the details here more than I would. Ideally the compiler would ensure we never panic here, but this seems fine given that the callers return Result anyway.

let val = match col {
FieldExpr::Name(col) => {
if let Some(pos) = header.column_pos(col) {
if let Some(v) = self.data.elements.get(pos) {
v
} else {
unreachable!("Field `{col}` at pos {pos} not found on row: {:?}", self.data.elements)
}
} else {
unreachable!("Field `{col}` not found on `{}`. Fields:{}", header.table_name, header)
}
let pos = header
.column_pos(col)
.ok_or_else(|| RelationError::FieldNotFound(header.clone(), col.clone()))?;
self.data
.elements
.get(pos)
.ok_or_else(|| RelationError::FieldNotFoundAtPos(pos, col.clone()))?
}
FieldExpr::Value(x) => x,
}
};

Ok(val)
}

pub fn project(&self, cols: &[FieldExpr], header: &'a Header) -> Result<ProductValue, RelationError> {
Expand Down
8 changes: 4 additions & 4 deletions crates/vm/src/eval.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,16 +458,16 @@ pub fn build_query(mut result: Box<IterRows>, query: Vec<Query>) -> Result<Box<I
rhs,
col_lhs_header.extend(&col_rhs_header),
move |row| {
let f = row.get(&key_lhs, &key_lhs_header);
let f = row.get(&key_lhs, &key_lhs_header)?;
Ok(f.into())
},
move |row| {
let f = row.get(&key_rhs, &key_rhs_header);
let f = row.get(&key_rhs, &key_rhs_header)?;
Ok(f.into())
},
move |l, r| {
let l = l.get(&col_lhs, &col_lhs_header);
let r = r.get(&col_rhs, &col_rhs_header);
let l = l.get(&col_lhs, &col_lhs_header)?;
let r = r.get(&col_rhs, &col_rhs_header)?;
Ok(l == r)
},
move |l, r| l.extend(r),
Expand Down
6 changes: 3 additions & 3 deletions crates/vm/src/expr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,15 +100,15 @@ impl ColumnOp {

fn reduce(&self, row: RelValueRef, value: &ColumnOp, header: &Header) -> Result<AlgebraicValue, ErrorLang> {
match value {
ColumnOp::Field(field) => Ok(row.get(field, header).clone()),
ColumnOp::Field(field) => Ok(row.get(field, header)?.clone()),
ColumnOp::Cmp { op, lhs, rhs } => Ok(self.compare_bin_op(row, *op, lhs, rhs, header)?.into()),
}
}

fn reduce_bool(&self, row: RelValueRef, value: &ColumnOp, header: &Header) -> Result<bool, ErrorLang> {
match value {
ColumnOp::Field(field) => {
let field = row.get(field, header);
let field = row.get(field, header)?;

match field.as_bool() {
Some(b) => Ok(*b),
Expand Down Expand Up @@ -156,7 +156,7 @@ impl ColumnOp {
pub fn compare(&self, row: RelValueRef, header: &Header) -> Result<bool, ErrorVm> {
match self {
ColumnOp::Field(field) => {
let lhs = row.get(field, header);
let lhs = row.get(field, header)?;
Ok(*lhs.as_bool().unwrap())
}
ColumnOp::Cmp { op, lhs, rhs } => self.compare_bin_op(row, *op, lhs, rhs, header),
Expand Down