chore: fixes in feature flagged code

Author: Horusiath

collab/src/error.rs

@@ -183,6 +183,9 @@ pub enum CollabError {
   #[error("Database: Import data failed: {0}")]
   DatabaseImportData(String),
 
+  #[error("Collab version could not be determined")]
+  InvalidVersion,
+
   #[error(transparent)]
   Uuid(#[from] uuid::Error),
 

collab/src/plugins/local_storage/kv/db.rs

@@ -5,6 +5,7 @@ use std::io::Write;
 use std::ops::RangeBounds;
 use std::sync::Arc;
 
+use crate::core::collab::CollabVersion;
 use crate::error::CollabError;
 use crate::plugins::local_storage::kv::keys::*;
 use crate::plugins::local_storage::kv::oid::{DocIDGen, OID};

collab/src/plugins/local_storage/kv/doc.rs

@@ -1,5 +1,6 @@
 #![cfg(feature = "plugins")]
 
+use crate::core::collab::{CollabVersion, VersionedData};
 use crate::error::CollabError;
 use crate::plugins::local_storage::kv::keys::*;
 use crate::plugins::local_storage::kv::snapshot::SnapshotAction;
@@ -99,7 +100,7 @@ where
     get_doc_id(uid, self, workspace_id, object_id).is_some()
   }
 
-  fn get_doc_state(&self, doc_id: DocID) -> Result<Option<VersionedData>, PersistenceError> {
+  fn get_doc_state(&self, doc_id: DocID) -> Result<Option<VersionedData>, CollabError> {
     let doc_state_start = make_doc_start_key(doc_id);
     let doc_state_end = make_doc_end_key(doc_id);
     let mut cursor = self.range(doc_state_start.clone()..doc_state_end)?;
@@ -112,10 +113,7 @@ where
             match key[doc_state_start.len()..doc_state_start.len() + 16].try_into() {
               Ok(v) => v,
               Err(_) => {
-                return Err(PersistenceError::InvalidData(format!(
-                  "invalid collab version in doc state key: {:?}",
-                  key
-                )));
+                return Err(CollabError::InvalidVersion);
               },
             };
           Some(CollabVersion::from_bytes(collab_version))
@@ -141,7 +139,6 @@ where
     object_id: &str,
     txn: &mut TransactionMut,
   ) -> Result<Option<CollabVersion>, CollabError> {
-    let mut update_count = 0;
     let mut collab_version = None;
 
     if let Some(doc_id) = get_doc_id(uid, self, workspace_id, object_id) {

collab/src/plugins/local_storage/kv/keys.rs

@@ -3,7 +3,7 @@
 use std::io::Write;
 use std::ops::Deref;
 
-use collab::core::collab::CollabVersion;
+use crate::core::collab::CollabVersion;
 use smallvec::{SmallVec, smallvec};
 // https://github.com/spacejam/sled
 // sled performs prefix encoding on long keys with similar prefixes that are grouped together in a

collab/src/plugins/local_storage/rocksdb/rocksdb_plugin.rs

@@ -3,6 +3,8 @@ use crate::plugins::local_storage::CollabPersistenceConfig;
 use crate::plugins::local_storage::kv::KVTransactionDB;
 use crate::plugins::local_storage::kv::doc::CollabKVAction;
 
+use crate::core::collab::CollabVersion;
+
 use std::ops::Deref;
 use std::sync::atomic::Ordering::SeqCst;
 use std::sync::atomic::{AtomicBool, AtomicU32};