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
14 changes: 10 additions & 4 deletions rust/lance/src/dataset/rowids.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use crate::session::index_caches::RowIdIndexKey;
use crate::{Error, Result};
use futures::{Stream, StreamExt, TryFutureExt, TryStreamExt};
use lance_core::utils::{address::RowAddress, deletion::DeletionVector};
use lance_select::{RowAddrSelection, RowAddrTreeMap};
use lance_select::{RowAddrSelection, RowAddrTreeMap, RowSetOps};
use lance_table::{
format::{
Fragment, ROW_CREATED_AT_VERSION_FIELD_ID, ROW_ID_FIELD_ID,
Expand Down Expand Up @@ -273,13 +273,19 @@ pub(crate) async fn translate_addr_treemap_to_row_ids(
};
let sequence = load_row_id_sequence(dataset, file_fragment.metadata()).await?;

let deletion_vector = file_fragment.get_deletion_vector().await?;
match selection {
RowAddrSelection::Full => {
// The whole fragment is selected: every live row's id qualifies.
row_ids |= RowAddrTreeMap::from(sequence.as_ref());
let mut fragment_ids = RowAddrTreeMap::from(sequence.as_ref());
if let Some(deletions) = deletion_vector {
let offsets = deletions.to_sorted_iter().map(|offset| offset as usize);
for deleted_id in sequence.select(offsets) {
fragment_ids.remove(deleted_id);
}
}
row_ids |= fragment_ids;
}
RowAddrSelection::Partial(offsets) => {
let deletion_vector = file_fragment.get_deletion_vector().await?;
for physical_offset in offsets.iter() {
// A deletion does not compact the row id sequence; the deleted row keeps
// its slot (the deletion vector tracks it separately). So a physical offset
Expand Down
13 changes: 12 additions & 1 deletion rust/lance/src/io/exec/scalar_index.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1628,7 +1628,7 @@ mod tests {
max_rows_per_file: 5,
..Default::default()
};
let dataset = Dataset::write(reader, test_dir.as_str(), Some(write_params))
let mut dataset = Dataset::write(reader, test_dir.as_str(), Some(write_params))
.await
.unwrap();
let fragment_id = dataset.get_fragments()[1].id() as u32;
Expand Down Expand Up @@ -1693,6 +1693,17 @@ mod tests {
.unwrap();
assert!(scoped.is_exact());
assert_eq!(scoped.lower, NullableRowAddrMask::allow_nothing());

dataset.delete("id = 7").await.unwrap();
let all_offsets = (0..5)
.map(|offset| u64::from(RowAddress::new_from_parts(fragment_id, offset)))
.collect::<RowAddrTreeMap>();
for selection in [&full_fragment, &all_offsets] {
let live_ids = super::translate_addr_treemap_to_row_ids(&dataset, selection)
.await
.unwrap();
assert_eq!(live_ids, [5, 6, 8, 9].into_iter().collect());
}
}

/// An empty block-list (e.g. NGram's "cannot tell, scan everything" result
Expand Down
Loading