aljaz/turso
1
0
Fork 0
mirror of https://github.com/aljazceru/turso.git synced 2025-12-24 19:44:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge 'Fix rowid search codegen' from Nikita Sivukhin

Browse Source 
This PR fixes a bug when index search used incorrect operator if index
column were the "rhs" in the expression (not "lhs" as usual, e.g.
`SELECT * FROM t WHERE 1 < rowid_alias`)

Reviewed-by: Jussi Saurio (@jussisaurio)

Closes #870
This commit is contained in:
Jussi Saurio
2025-02-03 12:38:04 +02:00
parent 482dd78f27 10e868bc4b
commit d41dfd0c5d
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/translate/optimizer.rs
View File

@@ -474,6 +474,17 @@ impl Optimizable for ast::Expr {
}
}
fn opposite_cmp_op(op: ast::Operator) -> ast::Operator {
match op {
ast::Operator::Equals => ast::Operator::Equals,
ast::Operator::Greater => ast::Operator::Less,
ast::Operator::GreaterEquals => ast::Operator::LessEquals,
ast::Operator::Less => ast::Operator::Greater,
ast::Operator::LessEquals => ast::Operator::GreaterEquals,
_ => panic!("unexpected operator: {:?}", op),
}
}
pub fn try_extract_index_search_expression(
cond: &mut WhereTerm,
table_index: usize,
@@ -533,7 +544,7 @@ pub fn try_extract_index_search_expression(
| ast::Operator::LessEquals => {
let lhs_owned = lhs.take_ownership();
return Ok(Some(Search::RowidSearch {
cmp_op: *operator,
cmp_op: opposite_cmp_op(*operator),
cmp_expr: WhereTerm {
expr: lhs_owned,
from_outer_join: cond.from_outer_join,
@@ -581,7 +592,7 @@ pub fn try_extract_index_search_expression(
let lhs_owned = lhs.take_ownership();
return Ok(Some(Search::IndexSearch {
index: available_indexes[index_index].clone(),
cmp_op: *operator,
cmp_op: opposite_cmp_op(*operator),
cmp_expr: WhereTerm {
expr: lhs_owned,
from_outer_join: cond.from_outer_join,

10
testing/where.test
View File

@@ -341,6 +341,16 @@ do_execsql_test where-id-index-seek-regression-test {
9999
10000}
do_execsql_test where-id-index-seek-regression-test-opposite {
select id from users where 9999 < id;
select id from users where 10000 <= id;
select id from users where 2 > id;
select id from users where 1 >= id;
} {10000
10000
1
1}
do_execsql_test where-id-index-seek-regression-test-2 {
select count(1) from users where id > 0;
} {10000}