mirrors/limbo
1
0
Fork 0
mirror of https://github.com/tursodatabase/limbo.git synced 2025-08-04 18:18:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

fix conflicts

Browse source 
Signed-off-by: Pere Diaz Bou <pere-altea@hotmail.com>
This commit is contained in:
Pere Diaz Bou 2024-07-31 17:38:33 +02:00
parent 8810a5c11e
commit 2b221d2b3c
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bindings/wasm/lib.rs
View file

@ -45,7 +45,7 @@ impl limbo_core::PageIO for PageIO {
&self,
_page_idx: usize,
_buffer: Rc<std::cell::RefCell<limbo_core::Buffer>>,
_c: Rc<limbo_core::WriteCompletion>,
_c: Rc<limbo_core::Completion>,
) -> Result<()> {
todo!()
}

6
core/translate/where_clause.rs
View file

@ -554,7 +554,7 @@ fn translate_condition_expr(
// The left hand side only needs to be evaluated once we have a list of values to compare against.
let lhs_reg = program.alloc_register();
let _ = translate_expr(program, select, lhs, lhs_reg, cursor_hint)?;
let _ = translate_expr(program, Some(select), lhs, lhs_reg, cursor_hint)?;
let rhs = rhs.as_ref().unwrap();
@ -577,7 +577,7 @@ fn translate_condition_expr(
for (i, expr) in rhs.iter().enumerate() {
let rhs_reg = program.alloc_register();
let last_condition = i == rhs.len() - 1;
let _ = translate_expr(program, select, expr, rhs_reg, cursor_hint)?;
let _ = translate_expr(program, Some(select), expr, rhs_reg, cursor_hint)?;
// If this is not the last condition, we need to jump to the 'jump_target_when_true' label if the condition is true.
if !last_condition {
program.emit_insn_with_label_dependency(
@ -614,7 +614,7 @@ fn translate_condition_expr(
// If it's a NOT IN expression, we need to jump to the 'jump_target_when_false' label if any of the conditions are true.
for expr in rhs.iter() {
let rhs_reg = program.alloc_register();
let _ = translate_expr(program, select, expr, rhs_reg, cursor_hint)?;
let _ = translate_expr(program, Some(select), expr, rhs_reg, cursor_hint)?;
program.emit_insn_with_label_dependency(
Insn::Eq {
lhs: lhs_reg,

2
simulator/main.rs
View file

@ -162,7 +162,7 @@ impl limbo_core::File for SimulatorFile {
&self,
pos: usize,
buffer: Rc<std::cell::RefCell<limbo_core::Buffer>>,
c: Rc<limbo_core::WriteCompletion>,
c: Rc<limbo_core::Completion>,
) -> Result<()> {
if *self.fault.borrow() {
*self.nr_pwrite_faults.borrow_mut() += 1;