Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion crates/resonance-collections/src/cache.rs
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,9 @@ impl CollectionCache {
/// than cold.
pub fn refresh(&self, dir: &Path, collection: &LoadedCollection) {
if let Ok(fingerprint) = fingerprint(dir) {
self.put(dir, fingerprint, collection.clone());
let mut collection = collection.clone();
crate::read::sort_folder(&mut collection.root);
self.put(dir, fingerprint, collection);
}
}

Expand Down
3 changes: 2 additions & 1 deletion crates/resonance-collections/src/capture.rs
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,8 @@ pub fn capture_runner_entry(entry: &CaptureEntry<'_>, target: &CaptureTarget) ->
.filter(|row| row_enabled(row) && row_key(row).is_some())
.map(parameter)
.collect();
if query_rows.is_empty()
if overrides.query_params.is_none()
&& query_source.is_empty()
&& let Some(examples) = query_examples
{
query_rows = examples
Expand Down
135 changes: 134 additions & 1 deletion crates/resonance-collections/src/ipc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -696,7 +696,41 @@ fn renumber_if_reordered(requests: &mut [RequestEntry], existing: Option<&Folder
.collect();

if previous_surviving == incoming_known {
return;
// Allocate inserted/moved requests between their destination siblings.
// A moved request's old seq belongs to its source folder.
let mut candidate: Vec<i64> = requests.iter().map(|entry| entry.doc.seq).collect();
let mut last = 0_i64;
let mut fits = true;
for index in 0..requests.len() {
if previous.contains(&requests[index].doc.id.as_str()) {
if candidate[index] <= last {
fits = false;
break;
}
} else {
let next = requests[index + 1..]
.iter()
.find(|entry| previous.contains(&entry.doc.id.as_str()))
.map(|entry| entry.doc.seq);
let step = if next.is_some() { 1 } else { 10 };
let Some(seq) = last.checked_add(step) else {
fits = false;
break;
};
if next.is_some_and(|next| seq >= next) {
fits = false;
break;
}
candidate[index] = seq;
}
last = candidate[index];
}
if fits {
for (entry, seq) in requests.iter_mut().zip(candidate) {
entry.doc.seq = seq;
}
return;
}
}

for (index, entry) in requests.iter_mut().enumerate() {
Expand Down Expand Up @@ -1587,6 +1621,105 @@ mod save_path {
mod reordering {
use super::*;

#[test]
fn moved_requests_keep_the_requested_order_in_cache_and_on_disk() {
use crate::cache::{CollectionCache, read_collection_dir_cached};
use crate::read::read_collection_dir;
use crate::write::write_collection_dir;

for (source, destination) in [
("root", "destination"),
("source", "root"),
("source", "destination"),
] {
for position in 0..=2 {
let temp = tempfile::TempDir::new().unwrap();
let mut existing = existing_three();
let entries = |ids: &[&str]| -> Vec<RequestEntry> {
ids.iter()
.enumerate()
.map(|(index, id)| {
let mut doc = RequestDoc::new((*id).into(), id.to_uppercase());
doc.seq = (index as i64 + 1) * 10;
RequestEntry::new(doc)
})
.collect()
};
existing.root.requests = entries(if source == "root" {
&["z"]
} else if destination == "root" {
&["a", "c"]
} else {
&["untouched"]
});
existing.root.folders.clear();
for (id, ids) in [(source, vec!["z"]), (destination, vec!["a", "c"])] {
if id == "root" {
continue;
}
existing.root.folders.push(FolderNode {
meta: Some(crate::model::FolderDoc {
format: FORMAT_VERSION,
id: id.into(),
name: id.into(),
seq: 10,
auth: None,
extra: Map::new(),
}),
requests: entries(&ids),
..Default::default()
});
}
write_collection_dir(temp.path(), &mut existing).unwrap();
let existing = read_collection_dir(temp.path()).unwrap();
let mut desired = vec!["a", "c"];
desired.insert(position, "z");
let mut folders = Vec::new();
if source != "root" {
folders.push(json!({"id": source, "name": source, "endpoints": []}));
}
if destination != "root" {
folders.push(json!({"id": destination, "name": destination,
"endpoints": desired.iter().map(|id| endpoint(id)).collect::<Vec<_>>() }));
}
let mut flat = desired.iter().map(|id| endpoint(id)).collect::<Vec<_>>();
if source != "root" && destination != "root" {
flat.push(endpoint("untouched"));
}
let incoming = ipc_collection(flat, folders);
let mut updated = existing.clone();
updated.root = tree_from_ipc(&incoming, Some(&existing));
write_collection_dir(temp.path(), &mut updated).unwrap();
let cache = CollectionCache::default();
cache.refresh(temp.path(), &updated);
for collection in [
read_collection_dir_cached(&cache, temp.path()).unwrap(),
read_collection_dir(temp.path()).unwrap(),
] {
let node = if destination == "root" {
&collection.root
} else {
collection
.root
.folders
.iter()
.find(|folder| folder.meta.as_ref().unwrap().id == destination)
.unwrap()
};
let actual: Vec<_> = node
.requests
.iter()
.map(|entry| entry.doc.id.as_str())
.collect();
assert_eq!(
actual, desired,
"move {source} -> {destination}, insertion {position}"
);
}
}
}
}

fn existing_three() -> LoadedCollection {
let mut c = existing_with_state();
c.root.requests.clear();
Expand Down
26 changes: 17 additions & 9 deletions crates/resonance-collections/src/read.rs
Original file line number Diff line number Diff line change
Expand Up @@ -279,15 +279,7 @@ fn read_folder(dir: &Path, at_root: bool) -> Result<FolderNode, String> {
}
}

node.requests
.sort_by_key(|entry| sort_key(entry.doc.seq, &entry.doc.name, &entry.doc.id));
node.folders.sort_by_key(|folder| {
let meta = folder.meta.as_ref();
let seq = meta.map(|m| m.seq).unwrap_or(0);
let name = folder_display_name(folder);
let id = meta.map(|m| m.id.clone()).unwrap_or_default();
sort_key(seq, &name, &id)
});
sort_folder(&mut node);

Ok(node)
}
Expand Down Expand Up @@ -460,6 +452,22 @@ pub fn read_collection_dir(dir: &Path) -> Result<LoadedCollection, String> {
})
}

/// Keep warm cache ordering identical to a fresh directory read.
pub(crate) fn sort_folder(node: &mut FolderNode) {
node.requests
.sort_by_key(|entry| sort_key(entry.doc.seq, &entry.doc.name, &entry.doc.id));
node.folders.sort_by_key(|folder| {
let meta = folder.meta.as_ref();
let seq = meta.map(|m| m.seq).unwrap_or(0);
let name = folder_display_name(folder);
let id = meta.map(|m| m.id.clone()).unwrap_or_default();
sort_key(seq, &name, &id)
});
for folder in &mut node.folders {
sort_folder(folder);
}
}

#[cfg(test)]
mod tests {
use super::*;
Expand Down
Loading
Loading