aljaz/turso
1
0
Fork 0
mirror of https://github.com/aljazceru/turso.git synced 2026-02-11 11:14:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix IdxCmp insn comparisons

Browse Source
This commit is contained in:
Jussi Saurio
2025-03-30 22:59:59 +03:00
parent efd537dc20
commit 42e25d23dd
1 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
core/vdbe/mod.rs
View File

@@ -40,8 +40,8 @@ use crate::storage::wal::CheckpointResult;
use crate::storage::{btree::BTreeCursor, pager::Pager};
use crate::translate::plan::{ResultSetColumn, TableReference};
use crate::types::{
compare_immutable, AggContext, Cursor, CursorResult, ExternalAggState, ImmutableRecord,
OwnedValue, SeekKey, SeekOp,
AggContext, Cursor, CursorResult, ExternalAggState, ImmutableRecord, OwnedValue, SeekKey,
SeekOp,
};
use crate::util::{
cast_real_to_integer, cast_text_to_integer, cast_text_to_numeric, cast_text_to_real,
@@ -1700,10 +1700,9 @@ impl Program {
let record_from_regs = make_record(&state.registers, start_reg, num_regs);
let pc = if let Some(ref idx_record) = *cursor.record() {
// Compare against the same number of values
let ord = compare_immutable(
&idx_record.get_values()[..record_from_regs.len()],
&record_from_regs.get_values(),
);
let ord = idx_record.get_values()[..record_from_regs.len()]
.partial_cmp(&record_from_regs.get_values()[..])
.unwrap();
if ord.is_ge() {
target_pc.to_offset_int()
} else {
@@ -1729,11 +1728,10 @@ impl Program {
let record_from_regs = make_record(&state.registers, start_reg, num_regs);
let pc = if let Some(ref idx_record) = *cursor.record() {
// Compare against the same number of values
if idx_record.get_values()[..record_from_regs.len()]
.iter()
.zip(&record_from_regs.get_values()[..])
.all(|(a, b)| a <= b)
{
let ord = idx_record.get_values()[..record_from_regs.len()]
.partial_cmp(&record_from_regs.get_values()[..])
.unwrap();
if ord.is_le() {
target_pc.to_offset_int()
} else {
state.pc + 1
@@ -1758,11 +1756,10 @@ impl Program {
let record_from_regs = make_record(&state.registers, start_reg, num_regs);
let pc = if let Some(ref idx_record) = *cursor.record() {
// Compare against the same number of values
if idx_record.get_values()[..record_from_regs.len()]
.iter()
.zip(&record_from_regs.get_values()[..])
.all(|(a, b)| a > b)
{
let ord = idx_record.get_values()[..record_from_regs.len()]
.partial_cmp(&record_from_regs.get_values()[..])
.unwrap();
if ord.is_gt() {
target_pc.to_offset_int()
} else {
state.pc + 1
@@ -1787,11 +1784,10 @@ impl Program {
let record_from_regs = make_record(&state.registers, start_reg, num_regs);
let pc = if let Some(ref idx_record) = *cursor.record() {
// Compare against the same number of values
if idx_record.get_values()[..record_from_regs.len()]
.iter()
.zip(&record_from_regs.get_values()[..])
.all(|(a, b)| a < b)
{
let ord = idx_record.get_values()[..record_from_regs.len()]
.partial_cmp(&record_from_regs.get_values()[..])
.unwrap();
if ord.is_lt() {
target_pc.to_offset_int()
} else {
state.pc + 1