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

fix conflicts

Browse Source
This commit is contained in:
Iaroslav Zeigerman
2025-07-17 19:03:02 +02:00
parent 6a609398fe
commit edf2be1432
1 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
core/vdbe/sorter.rs
View File

@@ -57,18 +57,21 @@ impl Sorter {
min_chunk_read_buffer_size_bytes: usize,
io: Arc<dyn IO>,
) -> Self {
assert_eq!(order.len(), collations.len());
Self {
records: Vec::new(),
current: None,
key_len: order.len(),
index_key_info: order
.iter()
.zip(collations)
.map(|(order, collation)| KeyInfo {
sort_order: *order,
collation,
})
.collect(),
index_key_info: Rc::new(
order
.iter()
.zip(collations)
.map(|(order, collation)| KeyInfo {
sort_order: *order,
collation,
})
.collect(),
),
chunks: Vec::new(),
chunk_heap: BinaryHeap::new(),
max_buffer_size: max_buffer_size_bytes,
@@ -201,8 +204,7 @@ impl Sorter {
Reverse(SortableImmutableRecord::new(
record,
self.key_len,
self.order,
self.collations.clone(),
self.index_key_info.clone(),
)),
chunk_idx,
));
@@ -434,11 +436,7 @@ struct SortableImmutableRecord {
}
impl SortableImmutableRecord {
fn new(
record: ImmutableRecord,
key_len: usize,
index_key_info: Rc<Vec<KeyInfo>>,
) -> Self {
fn new(record: ImmutableRecord, key_len: usize, index_key_info: Rc<Vec<KeyInfo>>) -> Self {
Self {
record,
key_len,
@@ -464,7 +462,7 @@ impl Ord for SortableImmutableRecord {
&other_values[..]
};
compare_immutable(a_key, b_key, self.index_key_info)
compare_immutable(a_key, b_key, self.index_key_info.as_ref())
}
}
@@ -495,13 +493,20 @@ enum SortedChunkIOState {
#[cfg(test)]
mod tests {
use super::*;
use crate::translate::collate::CollationSeq;
use crate::types::{ImmutableRecord, RefValue, Value};
use crate::PlatformIO;
#[test]
fn test_external_sort() {
let io = Arc::new(PlatformIO::new().unwrap());
let mut sorter = Sorter::new(&[SortOrder::Asc], vec![], 64, 13, io.clone());
let mut sorter = Sorter::new(
&[SortOrder::Asc],
vec![CollationSeq::Binary],
64,
13,
io.clone(),
);
for i in (0..1024).rev() {
sorter
.insert(&ImmutableRecord::from_values(&[Value::Integer(i)], 1))