Skip to content
Merged
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
28 changes: 25 additions & 3 deletions rust/lance/src/dataset/scanner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,9 @@ use crate::io::exec::knn::MultivectorScoringExec;
use crate::io::exec::scalar_index::{MaterializeIndexExec, ScalarIndexExec};
use crate::io::exec::{get_physical_optimizer, AddRowOffsetExec, LanceFilterExec, LanceScanConfig};
use crate::io::exec::{
knn::new_knn_exec, project, AddRowAddrExec, FilterPlan as ExprFilterPlan,
KNNVectorDistanceExec, LancePushdownScanExec, LanceScanExec, Planner, PreFilterSource,
ScanConfig, TakeExec,
knn::{new_knn_exec, KNN_INDEX_SCHEMA},
project, AddRowAddrExec, FilterPlan as ExprFilterPlan, KNNVectorDistanceExec,
LancePushdownScanExec, LanceScanExec, Planner, PreFilterSource, ScanConfig, TakeExec,
};
use crate::{datatypes::Schema, io::exec::fts::BooleanQueryExec};
use crate::{Error, Result};
Expand Down Expand Up @@ -3562,6 +3562,9 @@ impl Scanner {

Ok(knn_node)
} else {
if self.fast_search {
return Ok(Arc::new(EmptyExec::new(KNN_INDEX_SCHEMA.clone())));
}
// Resolve metric type for flat search (use default if not specified)
let metric = q
.metric_type
Expand Down Expand Up @@ -8634,6 +8637,25 @@ mod test {
.unwrap();
}

#[tokio::test]
async fn test_fast_search_without_vector_index_returns_empty() {
let dataset = TestVectorDataset::new(LanceFileVersion::Stable, true)
.await
.unwrap();
let q: Float32Array = (32..64).map(|v| v as f32).collect();

let mut scanner = dataset.dataset.scan();
scanner.nearest("vec", &q, 10).unwrap();
let normal_rows = scanner.try_into_batch().await.unwrap().num_rows();

let mut scanner = dataset.dataset.scan();
scanner.nearest("vec", &q, 10).unwrap().fast_search();
let fast_rows = scanner.try_into_batch().await.unwrap().num_rows();

assert_eq!(normal_rows, 10);
assert_eq!(fast_rows, 0);
}

#[rstest]
#[tokio::test]
pub async fn test_scan_planning_io(
Expand Down