xetldfs integration tests pass

xetdata · Aug 29, 2024 · 94d37c2 · 94d37c2
1 parent 09b3328
commit 94d37c2
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 38 deletions.
diff --git a/libxet/Cargo.lock b/libxet/Cargo.lock
diff --git a/rust/gitxetcore/src/data/configurations.rs b/rust/gitxetcore/src/data/configurations.rs
@@ -3,7 +3,6 @@ use common_constants::LOCAL_CAS_SCHEME;
 use super::errors::DataProcessingError;
 use super::errors::Result;
 use crate::config::XetConfig;
-use crate::constants::SMALL_FILE_THRESHOLD;
 use crate::git_integration::git_repo_salt::RepoSalt;
 use std::path::PathBuf;
 use std::str::FromStr;
@@ -206,7 +205,7 @@ pub async fn shard_storage_config_from(xet: &XetConfig) -> Result<StorageConfig>
 pub fn dedup_config_from(xet: &XetConfig) -> DedupConfig {
     DedupConfig {
         repo_salt: Some(Default::default()),
-        small_file_threshold: SMALL_FILE_THRESHOLD,
+        small_file_threshold: xet.cas.size_threshold,
         global_dedup_policy: xet.global_dedup_query_policy,
     }
 }

diff --git a/xetldfs/Cargo.lock b/xetldfs/Cargo.lock
diff --git a/xetldfs/src/xet_repo_wrapper.rs b/xetldfs/src/xet_repo_wrapper.rs
@@ -2,7 +2,8 @@ use file_utils::SafeFileCreator;
 use std::path::{Path, PathBuf};
 use std::sync::{Arc, RwLock};
 
-use libxet::data::{PointerFile, PointerFileTranslatorV2};
+use libxet::data::data_processing_v3::PointerFileTranslatorV3 as PointerFileTranslatorV2;
+use libxet::data::PointerFile;
 use libxet::errors::Result;
 use libxet::git_integration::GitXetRepo;
 

diff --git a/xetldfs/src/xet_rfile.rs b/xetldfs/src/xet_rfile.rs
@@ -1,6 +1,7 @@
 use errno::{set_errno, Errno};
 use libc::*;
-use libxet::data::{PointerFile, PointerFileTranslatorV2};
+use libxet::data::data_processing_v3::PointerFileTranslatorV3 as PointerFileTranslatorV2;
+use libxet::data::PointerFile;
 use libxet::ErrorPrinter;
 use std::io::Cursor;
 use std::path::{Path, PathBuf};