Add Vector to various DiskSegment struct names (#25935)

GitOrigin-RevId: 9b65e17db39c0549083269173100fb5ac541aa95

Author: sjudd

crates/database/src/tests/vector_test_utils.rs

@@ -76,7 +76,7 @@ use value::{
 use vector::{
     qdrant_segments::{
         unsafe_load_disk_segment,
-        DiskSegmentPaths,
+        VectorDiskSegmentPaths,
     },
     CompiledVectorSearch,
     QdrantSchema,
@@ -347,7 +347,7 @@ impl VectorFixtures {
         // Our usage is safe here because we're always fetching the data into
         // a new temp dir, so it's not possible to load a segment from these
         // specific paths multiple times.
-        unsafe_load_disk_segment(&DiskSegmentPaths {
+        unsafe_load_disk_segment(&VectorDiskSegmentPaths {
             segment: segment_path,
             uuids: id_tracker_path,
             deleted_bitset: bitset_path,

crates/database/src/vector_index_worker/vector_meta.rs

@@ -32,7 +32,7 @@ use search::{
 };
 use storage::Storage;
 use vector::{
-    qdrant_segments::DiskSegmentValues,
+    qdrant_segments::VectorDiskSegmentValues,
     QdrantSchema,
 };
 
@@ -87,7 +87,7 @@ pub struct VectorSearchIndex;
 #[async_trait]
 impl SearchIndex for VectorSearchIndex {
     type DeveloperConfig = DeveloperVectorIndexConfig;
-    type NewSegment = DiskSegmentValues;
+    type NewSegment = VectorDiskSegmentValues;
     type PreviousSegments = Vec<MutableFragmentedSegmentMetadata>;
     type Schema = QdrantSchema;
     type Segment = FragmentedVectorSegment;

crates/search/src/disk_index.rs

@@ -53,8 +53,8 @@ use tokio::io::{
     AsyncWriteExt,
 };
 use vector::qdrant_segments::{
-    DiskSegmentPaths,
-    DiskSegmentValues,
+    VectorDiskSegmentPaths,
+    VectorDiskSegmentValues,
 };
 use walkdir::WalkDir;
 
@@ -165,9 +165,9 @@ pub async fn download_single_file_zip<P: AsRef<Path>>(
 pub async fn upload_segment<RT: Runtime>(
     rt: &RT,
     storage: Arc<dyn Storage>,
-    new_segment: DiskSegmentValues,
+    new_segment: VectorDiskSegmentValues,
 ) -> anyhow::Result<FragmentedVectorSegment> {
-    let DiskSegmentPaths {
+    let VectorDiskSegmentPaths {
         segment,
         uuids,
         deleted_bitset,

crates/search/src/fragmented_segment.rs

@@ -37,7 +37,7 @@ use vector::{
     qdrant_segments::{
         load_disk_segment,
         merge_disk_segments_hnsw,
-        UntarredDiskSegmentPaths,
+        UntarredVectorDiskSegmentPaths,
     },
     PreviousSegment,
 };
@@ -95,7 +95,7 @@ impl<RT: Runtime> FragmentedSegmentFetcher<RT> {
         &'a self,
         search_storage: Arc<dyn Storage>,
         fragments: Vec<T>,
-    ) -> impl Stream<Item = anyhow::Result<UntarredDiskSegmentPaths>> + '_
+    ) -> impl Stream<Item = anyhow::Result<UntarredVectorDiskSegmentPaths>> + '_
     where
         anyhow::Error: From<T::Error>,
     {
@@ -112,7 +112,7 @@ impl<RT: Runtime> FragmentedSegmentFetcher<RT> {
         &self,
         search_storage: Arc<dyn Storage>,
         fragment: T,
-    ) -> anyhow::Result<UntarredDiskSegmentPaths>
+    ) -> anyhow::Result<UntarredVectorDiskSegmentPaths>
     where
         anyhow::Error: From<T::Error>,
     {
@@ -137,7 +137,9 @@ impl<RT: Runtime> FragmentedSegmentFetcher<RT> {
         );
         let (segment, id_tracker, bitset) =
             futures::try_join!(fetch_segment, fetch_id_tracker, fetch_bitset)?;
-        Ok(UntarredDiskSegmentPaths::new(segment, id_tracker, bitset))
+        Ok(UntarredVectorDiskSegmentPaths::new(
+            segment, id_tracker, bitset,
+        ))
     }
 
     async fn fetch_single_file(

crates/search/src/searcher/searcher.rs

@@ -62,7 +62,7 @@ use text_search::tracker::{
 };
 use value::InternalId;
 use vector::{
-    qdrant_segments::UntarredDiskSegmentPaths,
+    qdrant_segments::UntarredVectorDiskSegmentPaths,
     CompiledVectorSearch,
     QdrantSchema,
     VectorIndexType,
@@ -283,7 +283,7 @@ impl<RT: Runtime> SearcherImpl<RT> {
 
     async fn load_fragmented_segment(
         &self,
-        paths: UntarredDiskSegmentPaths,
+        paths: UntarredVectorDiskSegmentPaths,
     ) -> anyhow::Result<Arc<SizedSegment>> {
         self.segment_cache.get(paths).await
     }

crates/search/src/searcher/segment_cache.rs

@@ -15,7 +15,7 @@ use futures::FutureExt;
 use qdrant_segment::segment::Segment;
 use vector::qdrant_segments::{
     load_disk_segment,
-    UntarredDiskSegmentPaths,
+    UntarredVectorDiskSegmentPaths,
 };
 
 #[derive(Clone)]
@@ -40,7 +40,10 @@ impl Deref for SizedSegment {
 }
 
 impl<RT: Runtime> SegmentGenerator<RT> {
-    async fn generate_value(self, paths: UntarredDiskSegmentPaths) -> anyhow::Result<SizedSegment> {
+    async fn generate_value(
+        self,
+        paths: UntarredVectorDiskSegmentPaths,
+    ) -> anyhow::Result<SizedSegment> {
         let segment = self
             .thread_pool
             .execute(move || load_disk_segment(paths))
@@ -50,7 +53,7 @@ impl<RT: Runtime> SegmentGenerator<RT> {
 }
 
 pub(crate) struct SegmentCache<RT: Runtime> {
-    lru: AsyncLru<RT, UntarredDiskSegmentPaths, SizedSegment>,
+    lru: AsyncLru<RT, UntarredVectorDiskSegmentPaths, SizedSegment>,
     segment_generator: SegmentGenerator<RT>,
 }
 
@@ -67,7 +70,10 @@ impl<RT: Runtime> SegmentCache<RT> {
         }
     }
 
-    pub async fn get(&self, paths: UntarredDiskSegmentPaths) -> anyhow::Result<Arc<SizedSegment>> {
+    pub async fn get(
+        &self,
+        paths: UntarredVectorDiskSegmentPaths,
+    ) -> anyhow::Result<Arc<SizedSegment>> {
         self.lru
             .get(
                 paths.clone(),

crates/vector/src/qdrant_index.rs

@@ -90,7 +90,7 @@ use crate::{
         create_mutable_segment,
         segment_config,
         snapshot_segment,
-        DiskSegmentValues,
+        VectorDiskSegmentValues,
         DEFAULT_VECTOR_NAME,
     },
     query::{
@@ -334,7 +334,7 @@ impl QdrantSchema {
         revision_stream: DocumentStream<'_>,
         full_scan_threshold_kb: usize,
         previous_segments: &mut Vec<&mut impl PreviousSegment>,
-    ) -> anyhow::Result<Option<DiskSegmentValues>> {
+    ) -> anyhow::Result<Option<VectorDiskSegmentValues>> {
         let tmpdir = TempDir::new()?;
         let memory_timer = metrics::qdrant_segment_memory_build_timer();
         // With HNSW, we need to construct a temporary index, then do a one-time
@@ -435,7 +435,7 @@ impl QdrantSchema {
                 anyhow::ensure!(
                     num_deleted + memory_segment.available_point_count() as u32 == num_vectors
                 );
-                Ok::<DiskSegmentValues, anyhow::Error>(DiskSegmentValues {
+                Ok::<VectorDiskSegmentValues, anyhow::Error>(VectorDiskSegmentValues {
                     paths: snapshot_segment(
                         &id_tracker,
                         &memory_segment,

crates/vector/src/qdrant_segments.rs

@@ -197,7 +197,7 @@ pub fn create_mutable_segment(
 /// A set of paths for a fragmented vector segment where `segment` points to a
 /// single tar file generated by snapshotting a qdrant segment.
 #[derive(PartialEq, Eq, Debug, Clone, Hash)]
-pub struct DiskSegmentPaths {
+pub struct VectorDiskSegmentPaths {
     pub segment: PathBuf,
     pub uuids: PathBuf,
     pub deleted_bitset: PathBuf,
@@ -207,14 +207,14 @@ pub struct DiskSegmentPaths {
 /// a directory into which we've unpacked a tar file generated from snapshotting
 /// a qdrant segment.
 #[derive(PartialEq, Eq, Debug, Clone, Hash)]
-pub struct UntarredDiskSegmentPaths {
+pub struct UntarredVectorDiskSegmentPaths {
     segment_dir: PathBuf,
     uuids: PathBuf,
     deleted_bitset: PathBuf,
 }
 
-impl UntarredDiskSegmentPaths {
-    pub fn from(untarred_segment: PathBuf, paths: DiskSegmentPaths) -> Self {
+impl UntarredVectorDiskSegmentPaths {
+    pub fn from(untarred_segment: PathBuf, paths: VectorDiskSegmentPaths) -> Self {
         Self::new(untarred_segment, paths.uuids, paths.deleted_bitset)
     }
 
@@ -231,8 +231,8 @@ impl UntarredDiskSegmentPaths {
 }
 
 #[derive(Debug)]
-pub struct DiskSegmentValues {
-    pub paths: DiskSegmentPaths,
+pub struct VectorDiskSegmentValues {
+    pub paths: VectorDiskSegmentPaths,
     pub num_vectors: u32,
     pub num_deleted: u32,
 }
@@ -242,7 +242,7 @@ pub fn build_disk_segment(
     tmp_path: &Path,
     disk_path: &Path,
     segment_config: SegmentConfig,
-) -> anyhow::Result<DiskSegmentValues> {
+) -> anyhow::Result<VectorDiskSegmentValues> {
     merge_disk_segments(vec![segment], tmp_path, disk_path, segment_config)
 }
 
@@ -251,7 +251,7 @@ pub fn merge_disk_segments_hnsw(
     dimension: usize,
     tmp_path: &Path,
     disk_path: &Path,
-) -> anyhow::Result<DiskSegmentValues> {
+) -> anyhow::Result<VectorDiskSegmentValues> {
     let segment_config = segment_config(dimension, false, 4);
     merge_disk_segments(segments, tmp_path, disk_path, segment_config)
 }
@@ -261,7 +261,7 @@ pub fn merge_disk_segments(
     tmp_path: &Path,
     disk_path: &Path,
     segment_config: SegmentConfig,
-) -> anyhow::Result<DiskSegmentValues> {
+) -> anyhow::Result<VectorDiskSegmentValues> {
     // Create separate tmp paths to avoid unexpected overlap with the original
     // segment or various intermediate outputs. Because qdrant restores segments
     // to paths adjacent to the path where we save the snapshot, we want to
@@ -321,7 +321,7 @@ pub fn merge_disk_segments(
         &snapshot_tmp_path,
         disk_path,
     )?;
-    Ok(DiskSegmentValues {
+    Ok(VectorDiskSegmentValues {
         paths: segment,
         num_vectors: total_point_count as u32,
         num_deleted: num_deleted as u32,
@@ -333,7 +333,7 @@ pub fn snapshot_segment(
     segment: &Segment,
     tmp_path: &Path,
     index_path: &Path,
-) -> anyhow::Result<DiskSegmentPaths> {
+) -> anyhow::Result<VectorDiskSegmentPaths> {
     let segment_path = segment.take_snapshot(tmp_path, index_path)?;
 
     // Write out our additional index files for the ID tracker.
@@ -350,7 +350,7 @@ pub fn snapshot_segment(
         id_tracker.write_deleted_bitset(&mut out)?;
         out.into_inner()?.sync_all()?;
     }
-    Ok(DiskSegmentPaths {
+    Ok(VectorDiskSegmentPaths {
         segment: segment_path,
         uuids: uuids_path,
         deleted_bitset: deleted_bitset_path,
@@ -399,13 +399,13 @@ fn open_db<T: AsRef<str>>(
 /// used exactly once per Segment open, use FragmentedSegmentLoader instead of
 /// this method.
 #[cfg(any(test, feature = "testing"))]
-pub fn unsafe_load_disk_segment(paths: &DiskSegmentPaths) -> anyhow::Result<Segment> {
+pub fn unsafe_load_disk_segment(paths: &VectorDiskSegmentPaths) -> anyhow::Result<Segment> {
     let path = restore_segment_from_tar(&paths.segment)?;
-    let paths = UntarredDiskSegmentPaths::from(path, paths.clone());
+    let paths = UntarredVectorDiskSegmentPaths::from(path, paths.clone());
     load_disk_segment(paths)
 }
 
-pub fn load_disk_segment(paths: UntarredDiskSegmentPaths) -> anyhow::Result<Segment> {
+pub fn load_disk_segment(paths: UntarredVectorDiskSegmentPaths) -> anyhow::Result<Segment> {
     let untarred_path = paths.segment_dir;
     if !SegmentVersion::check_exists(&untarred_path) {
         anyhow::bail!("Missing segment version for {untarred_path:?}");
@@ -582,8 +582,8 @@ mod tests {
             segment_config,
             snapshot_segment,
             unsafe_load_disk_segment,
-            DiskSegmentPaths,
-            DiskSegmentValues,
+            VectorDiskSegmentPaths,
+            VectorDiskSegmentValues,
             DEFAULT_VECTOR_NAME,
         },
     };
@@ -657,7 +657,7 @@ mod tests {
         dimensions: usize,
         test_dir: &TempDir,
         vectors: impl Iterator<Item = (ExtendedPointId, Vec<f32>)>,
-    ) -> anyhow::Result<DiskSegmentPaths> {
+    ) -> anyhow::Result<VectorDiskSegmentPaths> {
         // Generate the memory segment
         let (memory_segment, _) = create_test_memory_segment(dimensions, test_dir, vectors)?;
 
@@ -724,7 +724,7 @@ mod tests {
     fn create_disk_segment(
         test_dir: &TempDir,
         memory_segment: &Segment,
-    ) -> anyhow::Result<DiskSegmentPaths> {
+    ) -> anyhow::Result<VectorDiskSegmentPaths> {
         let indexing_path = test_dir.path().join("indexing");
         fs::create_dir_all(&indexing_path)?;
         let disk_path = test_dir.path().join("disk");
@@ -1005,7 +1005,7 @@ mod tests {
             deleted_bitset.write(&mut file)?;
             file.into_inner()?.sync_all()?;
         }
-        let paths_with_deletes = DiskSegmentPaths {
+        let paths_with_deletes = VectorDiskSegmentPaths {
             deleted_bitset: mutated_bitset_path,
             ..paths_with_deletes
         };
@@ -1239,7 +1239,7 @@ mod tests {
 
         // Mutate the deleted bitset and write it back to disk, as we would expect from
         // the index worker.
-        let DiskSegmentPaths {
+        let VectorDiskSegmentPaths {
             deleted_bitset: deleted_bitset_path,
             uuids,
             ..
@@ -1273,7 +1273,7 @@ mod tests {
         segments: Vec<&Segment>,
         tmp_dir: &TempDir,
         config: SegmentConfig,
-    ) -> anyhow::Result<DiskSegmentValues> {
+    ) -> anyhow::Result<VectorDiskSegmentValues> {
         let indexing_path = tmp_dir.path().join("indexing");
         fs::create_dir_all(&indexing_path)?;
         let disk_path = tmp_dir.path().join("disk");
@@ -1326,7 +1326,7 @@ mod tests {
 
         let config = segment_config(DIMENSIONS, false, 4);
         let merged_dir = tempfile::tempdir()?;
-        let DiskSegmentValues { paths, .. } =
+        let VectorDiskSegmentValues { paths, .. } =
             merge_disk_segments_tmpdir(vec![&initial_segment, &new_segment], &merged_dir, config)?;
         let merged_segment = unsafe_load_disk_segment(&paths)?;
         assert_eq!(
@@ -1365,7 +1365,7 @@ mod tests {
 
         let config = segment_config(DIMENSIONS, false, 4);
         let merged_dir = tempfile::tempdir()?;
-        let DiskSegmentValues {
+        let VectorDiskSegmentValues {
             paths: merged_paths,
             num_vectors,
             ..
@@ -1404,7 +1404,7 @@ mod tests {
 
         let config = segment_config(DIMENSIONS, false, 4);
         let merged_dir = tempfile::tempdir()?;
-        let DiskSegmentValues {
+        let VectorDiskSegmentValues {
             paths: merged_paths,
             num_vectors: merged_num_vectors,
             ..
@@ -1447,7 +1447,7 @@ mod tests {
 
         let config = segment_config(DIMENSIONS, false, 4);
         let merged_dir = tempfile::tempdir()?;
-        let DiskSegmentValues {
+        let VectorDiskSegmentValues {
             paths: merged_paths,
             num_vectors: merged_num_vectors,
             ..