Skip to content
Merged
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
3 changes: 1 addition & 2 deletions rust/lance-index/src/vector/flat.rs
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,5 @@ pub async fn compute_distance(
location: location!(),
})
})
.await
.unwrap()
.await?
}
61 changes: 50 additions & 11 deletions rust/lance-linalg/src/distance.rs
Original file line number Diff line number Diff line change
Expand Up @@ -128,12 +128,18 @@ pub fn multivec_distance(
}
}

let dists = vectors
.iter()
.map(|v| {
v.map(|v| {
let mut dists = Vec::with_capacity(vectors.len());
for v in vectors.iter() {
match v {
None => dists.push(f32::NAN),
Some(v) => {
let multivector = v.as_fixed_size_list();
match distance_type {
if multivector.len() == 0 {
dists.push(f32::NAN);
continue;
}

let sim = match distance_type {
DistanceType::Hamming => {
let query = query.as_primitive::<UInt8Type>().values();
query
Expand Down Expand Up @@ -171,12 +177,12 @@ pub fn multivec_distance(
),
_ => unreachable!("missed to check query type"),
},
}
})
.unwrap_or(f32::NAN)
})
.map(|sim| 1.0 - sim)
.collect();
};

dists.push(1.0 - sim);
}
}
}
Ok(dists)
}

Expand Down Expand Up @@ -204,3 +210,36 @@ where
})
.sum()
}

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

use std::sync::Arc;

use arrow_array::types::Float32Type;
use arrow_array::{Float32Array, ListArray};
use arrow_buffer::OffsetBuffer;
use arrow_schema::Field;

#[test]
fn test_multivec_distance_empty_row_is_nan() {
let query: Arc<dyn Array> = Arc::new(Float32Array::from_iter_values([1.0_f32, 2.0]));

let dim = 2;
let values = FixedSizeListArray::from_iter_primitive::<Float32Type, _, _>(
vec![Some(vec![Some(1.0_f32), Some(2.0)])],
dim,
);

// Two rows: first is empty list, second has one sub-vector.
let offsets = OffsetBuffer::from_lengths([0_usize, 1]);
let field = Arc::new(Field::new("item", values.data_type().clone(), true));
let vectors = ListArray::try_new(field, offsets, Arc::new(values), None).unwrap();

let dists = multivec_distance(query.as_ref(), &vectors, DistanceType::Dot).unwrap();
assert_eq!(dists.len(), 2);
assert!(dists[0].is_nan());
assert_eq!(dists[1], -4.0);
}
}
13 changes: 11 additions & 2 deletions rust/lance/src/io/exec/knn.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use arrow::datatypes::{Float32Type, UInt32Type, UInt64Type};
use arrow_array::{
builder::{ListBuilder, UInt32Builder},
cast::AsArray,
ArrayRef, RecordBatch, StringArray,
ArrayRef, BooleanArray, RecordBatch, StringArray,
};
use arrow_array::{Array, Float32Array, UInt32Array, UInt64Array};
use arrow_schema::{DataType, Field, Schema, SchemaRef};
Expand Down Expand Up @@ -231,8 +231,17 @@ impl ExecutionPlan for KNNVectorDistanceExec {
let key = key.clone();
let column = column.clone();
async move {
compute_distance(key, dt, &column, batch?)
let batch = compute_distance(key, dt, &column, batch?)
.await
.map_err(|e| DataFusionError::Execution(e.to_string()))?;

let distances = batch[DIST_COL].as_primitive::<Float32Type>();
let mask = BooleanArray::from_iter(
distances
.iter()
.map(|v| Some(v.map(|v| !v.is_nan()).unwrap_or(false))),
);
arrow::compute::filter_record_batch(&batch, &mask)
.map_err(|e| DataFusionError::Execution(e.to_string()))
}
})
Expand Down