Skip to content

Commit 84106d0

Browse files
committed
chore: codefmt
1 parent 8065f2b commit 84106d0

File tree

4 files changed

+21
-21
lines changed

4 files changed

+21
-21
lines changed

core/translate/emitter.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1090,7 +1090,7 @@ fn open_loop(
10901090
if !try_index_cover(
10911091
program,
10921092
related_columns,
1093-
&table_reference,
1093+
table_reference,
10941094
index_cursor_id,
10951095
table_cursor_id,
10961096
) {
@@ -1172,15 +1172,16 @@ fn try_index_cover(
11721172
index_column_map.insert(pos, index_column_map.len());
11731173
}
11741174

1175-
let len = table.columns.len();
11761175
let lower = ColumnBinding {
11771176
table: *table_index,
11781177
column: 0,
11791178
};
1180-
1179+
let upper = ColumnBinding {
1180+
table: table_index + 1,
1181+
column: 0,
1182+
};
11811183
let is_cover = related_columns
1182-
.range(lower..)
1183-
.take(len)
1184+
.range(lower..upper)
11841185
.all(|binding| index_column_map.contains_key(&binding.column));
11851186
if is_cover {
11861187
program

core/translate/expr.rs

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1976,20 +1976,19 @@ pub fn translate_expr(
19761976
column: columns_mapping[column],
19771977
dest: target_register,
19781978
});
1979+
} else if *is_rowid_alias {
1980+
program.emit_insn(Insn::RowId {
1981+
cursor_id,
1982+
dest: target_register,
1983+
});
19791984
} else {
1980-
if *is_rowid_alias {
1981-
program.emit_insn(Insn::RowId {
1982-
cursor_id,
1983-
dest: target_register,
1984-
});
1985-
} else {
1986-
program.emit_insn(Insn::Column {
1987-
cursor_id,
1988-
column: *column,
1989-
dest: target_register,
1990-
});
1991-
}
1985+
program.emit_insn(Insn::Column {
1986+
cursor_id,
1987+
column: *column,
1988+
dest: target_register,
1989+
});
19921990
}
1991+
19931992
let column = tbl_ref.table.get_column_at(*column);
19941993
maybe_apply_affinity(column.ty, target_register, program);
19951994
Ok(target_register)

core/translate/optimizer.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -846,10 +846,10 @@ fn one_select_related_columns(
846846
}
847847
}
848848
if let Some(from) = from {
849-
from_clause_related_columns(&from, related_columns, referenced_tables)?;
849+
from_clause_related_columns(from, related_columns, referenced_tables)?;
850850
}
851851
if let Some(expr) = where_clause {
852-
expr_related_columns(&expr, related_columns, referenced_tables)?;
852+
expr_related_columns(expr, related_columns, referenced_tables)?;
853853
}
854854
if let Some(group_by) = group_by {
855855
for expr in group_by.exprs.iter() {
@@ -861,7 +861,7 @@ fn one_select_related_columns(
861861
}
862862
if let Some(windows) = window_clause {
863863
for window in windows.iter().map(|window| &window.window) {
864-
window_related_columns(&window, related_columns, referenced_tables)?;
864+
window_related_columns(window, related_columns, referenced_tables)?;
865865
}
866866
}
867867
}

core/vdbe/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1840,7 +1840,7 @@ impl Program {
18401840
}
18411841

18421842
#[inline]
1843-
fn deferred_seek<'a>(
1843+
fn deferred_seek(
18441844
deferred_seek: &mut Option<(CursorID, CursorID)>,
18451845
cursors: &mut BTreeMap<CursorID, Box<dyn Cursor>>,
18461846
) -> Result<bool> {

0 commit comments

Comments
 (0)