Fix clippy and cleanup

crates/api/src/lib.rs

@@ -8,7 +8,7 @@ use std::sync::{Arc, RwLock};
 use index::flat::FlatIndex;
 use index::{IndexType, VectorIndex};
 use storage::rocks_db::RocksDbStorage;
-use storage::{StorageEngine, StorageType};
+use storage::{StorageEngine, StorageType, VectorPage};
 
 use uuid::Uuid;
 
@@ -101,11 +101,7 @@ impl VectorDb {
         Ok(vectors)
     }
 
-    pub fn list(
-        &self,
-        offset: PointId,
-        limit: usize,
-    ) -> Result<Option<(Vec<(PointId, DenseVector)>, PointId)>, DbError> {
+    pub fn list(&self, offset: PointId, limit: usize) -> Result<Option<VectorPage>, DbError> {
         self.storage.list_vectors(offset, limit)
     }
 

crates/storage/src/in_memory.rs

@@ -1,4 +1,4 @@
-use crate::StorageEngine;
+use crate::{StorageEngine, VectorPage};
 use defs::{DbError, DenseVector, Payload, PointId};
 
 pub struct MemoryStorage {
@@ -38,11 +38,7 @@ impl StorageEngine for MemoryStorage {
     fn get_vector(&self, _id: PointId) -> Result<Option<DenseVector>, DbError> {
         Ok(None)
     }
-    fn list_vectors(
-        &self,
-        _offset: PointId,
-        _limit: usize,
-    ) -> Result<Option<(Vec<(PointId, DenseVector)>, PointId)>, DbError> {
+    fn list_vectors(&self, _offset: PointId, _limit: usize) -> Result<Option<VectorPage>, DbError> {
         Ok(None)
     }
 }

crates/storage/src/lib.rs

@@ -4,6 +4,8 @@ use std::sync::Arc;
 
 use crate::rocks_db::RocksDbStorage;
 
+pub type VectorPage = (Vec<(PointId, DenseVector)>, PointId);
+
 pub trait StorageEngine: Send + Sync {
     fn insert_point(
         &self,
@@ -15,11 +17,7 @@ pub trait StorageEngine: Send + Sync {
     fn get_payload(&self, id: PointId) -> Result<Option<Payload>, DbError>;
     fn delete_point(&self, id: PointId) -> Result<(), DbError>;
     fn contains_point(&self, id: PointId) -> Result<bool, DbError>;
-    fn list_vectors(
-        &self,
-        offset: PointId,
-        limit: usize,
-    ) -> Result<Option<(Vec<(PointId, DenseVector)>, PointId)>, DbError>;
+    fn list_vectors(&self, offset: PointId, limit: usize) -> Result<Option<VectorPage>, DbError>;
 }
 
 pub mod in_memory;

crates/storage/src/rocks_db.rs

@@ -1,6 +1,6 @@
 // Rewrite needed
 
-use crate::StorageEngine;
+use crate::{StorageEngine, VectorPage};
 use bincode::{deserialize, serialize};
 use defs::{DbError, DenseVector, Payload, Point, PointId};
 use rocksdb::{Error, Options, DB};
@@ -122,11 +122,7 @@ impl StorageEngine for RocksDbStorage {
         Ok(value.vector)
     }
 
-    fn list_vectors(
-        &self,
-        offset: PointId,
-        limit: usize,
-    ) -> Result<Option<(Vec<(PointId, DenseVector)>, PointId)>, DbError> {
+    fn list_vectors(&self, offset: PointId, limit: usize) -> Result<Option<VectorPage>, DbError> {
         if limit < 1 {
             return Ok(None);
         }