aljaz/turso
1
0
Fork 0
mirror of https://github.com/aljazceru/turso.git synced 2026-01-07 18:24:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

tweaks

Browse Source
This commit is contained in:
jussisaurio
2024-11-23 17:58:34 +02:00
parent 120601f732
commit 52beeabd45
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/translate/emitter.rs
View File

@@ -207,7 +207,8 @@ pub fn emit_program(
let mut order_by_necessary = plan.order_by.is_some();
// IF GROUP BY, SORT BY GROUPS AND DO AGGREGATION
// IF GROUP BY, SORT BY GROUPS AND DO AGGREGATION ETC
// EITHER EMITS RESULTROWS DIRECTLY OR INSERTS INTO ORDER BY SORTER
if let Some(ref mut group_by) = plan.group_by {
group_by_emit(
&mut program,
@@ -233,7 +234,7 @@ pub fn emit_program(
order_by_necessary = false;
}
// IF ORDER BY, SORT BY ORDER BY
// EMIT RESULT ROWS FROM THE ORDER BY SORTER
if let Some(ref mut order_by) = plan.order_by {
if order_by_necessary {
sort_order_by(
@@ -252,8 +253,6 @@ pub fn emit_program(
Ok(program.build(database_header, connection))
}
const ORDER_BY_ID: usize = 0;
fn init_order_by(
program: &mut ProgramBuilder,
order_by: &Vec<(ast::Expr, Direction)>,

19
core/translate/optimizer.rs
View File

@@ -44,15 +44,15 @@ fn _operator_is_already_ordered_by(
match operator {
SourceOperator::Scan {
table_reference, ..
} => Ok(key.is_primary_key_of(table_reference.table_index)),
} => Ok(key.is_rowid_alias_of(table_reference.table_index)),
SourceOperator::Search {
table_reference,
search,
..
} => match search {
Search::PrimaryKeyEq { .. } => Ok(key.is_primary_key_of(table_reference.table_index)),
Search::PrimaryKeyEq { .. } => Ok(key.is_rowid_alias_of(table_reference.table_index)),
Search::PrimaryKeySearch { .. } => {
Ok(key.is_primary_key_of(table_reference.table_index))
Ok(key.is_rowid_alias_of(table_reference.table_index))
}
Search::IndexSearch { index, .. } => {
let index_idx = key.check_index_scan(
@@ -457,7 +457,7 @@ pub trait Optimizable {
.check_constant()?
.map_or(false, |c| c == ConstantPredicate::AlwaysFalse))
}
fn is_primary_key_of(&self, table_index: usize) -> bool;
fn is_rowid_alias_of(&self, table_index: usize) -> bool;
fn check_index_scan(
&mut self,
table_index: usize,
@@ -467,14 +467,13 @@ pub trait Optimizable {
}
impl Optimizable for ast::Expr {
fn is_primary_key_of(&self, table_index: usize) -> bool {
fn is_rowid_alias_of(&self, table_index: usize) -> bool {
match self {
ast::Expr::Column {
table,
column,
is_rowid_alias: is_primary_key,
is_rowid_alias,
..
} => *is_primary_key && *table == table_index,
} => *is_rowid_alias && *table == table_index,
_ => false,
}
}
@@ -652,7 +651,7 @@ pub fn try_extract_index_search_expression(
) -> Result<Either<ast::Expr, Search>> {
match expr {
ast::Expr::Binary(mut lhs, operator, mut rhs) => {
if lhs.is_primary_key_of(table_index) {
if lhs.is_rowid_alias_of(table_index) {
match operator {
ast::Operator::Equals => {
return Ok(Either::Right(Search::PrimaryKeyEq { cmp_expr: *rhs }));
@@ -670,7 +669,7 @@ pub fn try_extract_index_search_expression(
}
}
if rhs.is_primary_key_of(table_index) {
if rhs.is_rowid_alias_of(table_index) {
match operator {
ast::Operator::Equals => {
return Ok(Either::Right(Search::PrimaryKeyEq { cmp_expr: *lhs }));