From d3368a28bc8b6b75a4da22151d0d321ec95d4058 Mon Sep 17 00:00:00 2001 From: Krishna Vishal Date: Tue, 8 Jul 2025 15:11:15 +0530 Subject: [PATCH] fix merge conflicts --- core/storage/btree.rs | 2 +- core/types.rs | 4 ++++ core/vdbe/mod.rs | 19 ------------------- 3 files changed, 5 insertions(+), 20 deletions(-) diff --git a/core/storage/btree.rs b/core/storage/btree.rs index b5cfdc843..d23dc5785 100644 --- a/core/storage/btree.rs +++ b/core/storage/btree.rs @@ -4232,7 +4232,7 @@ impl BTreeCursor { let record = record.as_ref().unwrap(); let record_same_number_cols = &record.get_values()[..key_values.len()]; compare_immutable( - key_values, + key_values.as_slice(), record_same_number_cols, self.key_sort_order(), &self.collations, diff --git a/core/types.rs b/core/types.rs index 55a1b4aad..8ab1f2a4e 100644 --- a/core/types.rs +++ b/core/types.rs @@ -994,6 +994,10 @@ impl ImmutableRecord { } } + pub fn as_blob_value(&self) -> &Value { + &self.payload + } + pub fn start_serialization(&mut self, payload: &[u8]) { self.as_blob_mut().extend_from_slice(payload); } diff --git a/core/vdbe/mod.rs b/core/vdbe/mod.rs index 702c6bdfb..776cbb9f8 100644 --- a/core/vdbe/mod.rs +++ b/core/vdbe/mod.rs @@ -606,25 +606,6 @@ pub fn registers_to_ref_values(registers: &[Register]) -> Vec { .collect() } -pub fn registers_to_ref_values(registers: &[Register]) -> Vec { - registers - .iter() - .map(|reg| { - let value = reg.get_owned_value(); - match value { - Value::Null => RefValue::Null, - Value::Integer(i) => RefValue::Integer(*i), - Value::Float(f) => RefValue::Float(*f), - Value::Text(t) => RefValue::Text(TextRef { - value: RawSlice::new(t.value.as_ptr(), t.value.len()), - subtype: t.subtype.clone(), - }), - Value::Blob(b) => RefValue::Blob(RawSlice::new(b.as_ptr(), b.len())), - } - }) - .collect() -} - #[instrument(skip(program), level = Level::INFO)] fn trace_insn(program: &Program, addr: InsnReference, insn: &Insn) { if !tracing::enabled!(tracing::Level::TRACE) {