trying to update deps

Author: gschoeni

Cargo.lock

@@ -27,16 +27,16 @@ actix-files = "0.6.2"
 actix-http = "3.4.0"
 actix-multipart = "0.7.2"
 actix-service = "2.0.2"
-actix-web = { version = "4.4.0", features = ["rustls"] }
+actix-web = { version = "4.9.0", features = ["rustls"] }
 actix-web-httpauth = "0.8.0"
 approx = "0.5.1"
 async-compression = { version = "0.4.2", features = ["futures-io", "gzip"] }
 async-recursion = "1.0.5"
 async-std = { version = "1.12.0", features = ["unstable"] }
 async-tar = "0.5.0"
 async-trait = "0.1.80"
-arrow-json = "54.2.1"
-arrow = "54.2.1"
+arrow-json = "54.0.0"
+arrow = "54.0.0"
 bincode = "1.3.3"
 blocking = "1.6.1"
 bytecount = "0.6.3"
@@ -47,7 +47,7 @@ chrono = "0.4.30"
 clap = { version = "4.4.2", features = ["cargo"] }
 colored = "2.0.4"
 comfy-table = "7.0.1"
-duckdb = { package = "duckdb", version = "1.1.0", default-features = false, optional = true, features = [
+duckdb = { package = "duckdb", version = "1.2.0", default-features = false, optional = true, features = [
     "serde_json",
 ] }
 deadqueue = "0.2.4"
@@ -61,7 +61,7 @@ env_logger = "0.11.3"
 # ffmpeg-next = { version = "6.0.0", features = ["codec", "format"] }
 fd-lock = "4.0.1"
 filetime = "0.2.22"
-flate2 = "1.0.23"
+flate2 = { version = "1.1.0", default-features = false, features = ["zlib-ng"] }
 fs_extra = "1.3.0"
 futures = "0.3.28"
 futures-util = "0.3.28"
@@ -77,7 +77,7 @@ itertools = "0.13.0"
 jsonwebtoken = "9.3.0"
 jwalk = "0.8.1"
 lazy_static = "1.4.0"
-lofty = "0.21.0"
+lofty = "0.22.2"
 log = "0.4.20"
 lru = "0.12.0"
 mockito = "1.1.0"
@@ -88,7 +88,7 @@ nom = "7.1.3"
 num_cpus = "1.16.0"
 percent-encoding = "2.1"
 pluralizer = "0.4.0"
-polars = { version = "0.45.0", features = [
+polars = { version = "0.46.0", features = [
     "lazy",
     "parquet",
     "json",
@@ -113,7 +113,6 @@ reqwest = { version = "0.12.2", features = [
 rocksdb = { version = "0.22.0", default-features = false, features = [
     "lz4",
     "snappy",
-    "zlib",
     "multi-threaded-cf",
 ] }
 sanitize-filename = "0.6.0"
@@ -127,7 +126,7 @@ simdutf8 = "0.1.4"
 sqlparser = "0.53.0"
 sql_query_builder = { version = "2.1.0", features = ["postgresql"] }
 sysinfo = "0.33.0"
-tar = "0.4.40"
+tar = "0.4.44"
 tempfile = "3.8.0"
 thread_local = "1.1.7"
 threadpool = "1.8.1"

Cargo.toml

@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 async-trait = "0.1.80"
-bytesize = "1.1.0"
+bytesize = "1.3.0"
 clap = { version = "4.2.7", features = ["cargo"] }
 colored = "2.0.0"
 dialoguer = "0.11.0"
@@ -20,8 +20,6 @@ serde_json = "1.0.78"
 rocksdb = { version = "0.22.0", default-features = false, features = [
     "lz4",
     "snappy",
-    "zstd",
-    "zlib",
     "multi-threaded-cf",
 ] }
 time = { version = "0.3.20", features = ["serde"] }

src/cli/Cargo.toml

@@ -28,13 +28,13 @@ async-compression = { version = "0.4.0", features = ["futures-io", "gzip"] }
 async-recursion = "1.0.0"
 async-std = { version = "1.12.0", features = ["unstable"] }
 async-tar = "0.5.0"
-arrow-json = "54.2.1"
-arrow = "54.2.1"
+arrow-json = "54.0.0"
+arrow = "54.0.0"
 bincode = "1.3.3"
 blocking = "1.6.1"
 bytecount = "0.6.3"
 bytes = "1.2.1"
-bytesize = "1.1.0"
+bytesize = "1.3.0"
 bytevec = "0.2.0"
 chrono = "0.4.22"
 clap = { version = "4.2.7", features = ["cargo"] }
@@ -46,14 +46,14 @@ difference = "2.0.0"
 dirs = "5.0.1"
 dotenv = "0.15.0"
 dunce = "1"
-duckdb = { package = "duckdb", version = "1.1.0", default-features = false, optional = true, features = [
+duckdb = { package = "duckdb", version = "1.2.0", default-features = false, optional = true, features = [
     "serde_json",
 ] }
 env_logger = "0.11.3"
 # ffmpeg-next = { version = "6.0.0", features = ["codec", "format"] }
 fd-lock = "4.0.1"
 filetime = "0.2.16"
-flate2 = "1.0.23"
+flate2 = { version = "1.1.0", default-features = false, features = ["zlib-ng"] }
 fs_extra = "1.2.0"
 futures = "0.3"
 futures-util = "0.3.21"
@@ -68,7 +68,7 @@ infer = "0.16.0"
 itertools = "0.13.0"
 jwalk = "0.8.1"
 lazy_static = "1.4.0"
-lofty = "0.21.0"
+lofty = "0.22.2"
 log = "0.4.17"
 lru = "0.12.0"
 # magick_rust = "0.18.0"
@@ -78,7 +78,7 @@ mp4 = "0.14.0"
 nom = "7.1.1"
 num_cpus = "1.13.1"
 pluralizer = "0.4.0"
-polars = { version = "0.45.0", features = [
+polars = { version = "0.46.0", features = [
     "lazy",
     "parquet",
     "json",
@@ -103,7 +103,6 @@ reqwest = { version = "0.12.2", features = [
 rocksdb = { version = "0.22.0", default-features = false, features = [
     "lz4",
     "snappy",
-    "zlib",
     "multi-threaded-cf",
 ] }
 serde = { version = "1.0.136", features = ["derive"] }
@@ -116,7 +115,7 @@ sha2 = "0.10.8"
 sqlparser = "0.53.0"
 sql_query_builder = { version = "2.1.0", features = ["postgresql"] }
 sysinfo = "0.33.0"
-tar = "0.4.38"
+tar = "0.4.44"
 threadpool = "1.8.1"
 time = { version = "0.3.20", features = ["serde"] }
 tokio = { version = "1", features = ["full"] }

src/lib/Cargo.toml

@@ -57,8 +57,11 @@ pub async fn create_nodes(
     progress: &Arc<PushProgress>,
 ) -> Result<(), OxenError> {
     // Compress the node
+    log::debug!("create_nodes starting compression");
     let enc = GzEncoder::new(Vec::new(), Compression::default());
+    log::debug!("create_nodes compressing nodes");
     let mut tar = tar::Builder::new(enc);
+    log::debug!("create_nodes creating tar");
     let mut children_count = 0;
     for (i, node) in nodes.iter().enumerate() {
         let node_dir = node_db_path(local_repo, &node.hash);
@@ -80,13 +83,15 @@ pub async fn create_nodes(
             children_count
         ));
 
+        log::debug!("create_nodes appending dir to tar");
         tar.append_dir_all(sub_dir, node_dir)?;
         children_count += node.children.len();
+        log::debug!("create_nodes appended dir to tar {}", children_count);
     }
     log::debug!("create_nodes packed {} nodes", children_count);
 
     tar.finish()?;
-
+    log::debug!("create_nodes finished tar");
     let buffer: Vec<u8> = tar.into_inner()?.finish()?;
 
     // Upload the node

src/lib/src/api/client/tree.rs

@@ -252,7 +252,7 @@ pub fn n_duped_rows(df: &DataFrame, cols: &[&str]) -> Result<u64, OxenError> {
 
 pub fn row_from_str_and_schema(
     data: impl AsRef<str>,
-    schema: Schema,
+    schema: &Arc<Schema>,
 ) -> Result<DataFrame, OxenError> {
     if serde_json::from_str::<Value>(data.as_ref()).is_ok() {
         return parse_str_to_df(data);

src/lib/src/core/df/tabular.rs

@@ -898,13 +898,17 @@ pub fn unpack_nodes(
     buffer: &[u8],
 ) -> Result<HashSet<MerkleHash>, OxenError> {
     let mut hashes: HashSet<MerkleHash> = HashSet::new();
-    let mut archive = Archive::new(GzDecoder::new(buffer));
+    log::debug!("Unpacking nodes from buffer...");
+    let decoder = GzDecoder::new(buffer);
+    log::debug!("Decoder created");
+    let mut archive = Archive::new(decoder);
+    log::debug!("Archive created");
     let Ok(entries) = archive.entries() else {
         return Err(OxenError::basic_str(
             "Could not unpack tree database from archive",
         ));
     };
-
+    log::debug!("Extracting entries...");
     for file in entries {
         let Ok(mut file) = file else {
             log::error!("Could not unpack file in archive...");

src/lib/src/repositories/tree.rs

@@ -12,15 +12,15 @@ actix-multipart = "0.7.2"
 actix-web = { version = "4", features = ["rustls"] }
 actix-web-httpauth = "0.8.0"
 bincode = "1.3.3"
-bytesize = "1.1.0"
+bytesize = "1.3.0"
 chrono = "0.4.19"
 clap = { version = "4.2.7", features = ["cargo"] }
 derive_more = { version = "1.0.0", features = ["full"] }
 dotenv = "0.15.0"
 dunce = "1"
-duckdb = { version = "1.1.0", features = ["bundled", "serde_json"] }
+duckdb = { version = "1.2.0", features = ["bundled", "serde_json"] }
 env_logger = "0.11.3"
-flate2 = "1.0.23"
+flate2 = { version = "1.1.0", default-features = false, features = ["zlib-ng"] }
 futures = "0.3.21"
 futures-util = "0.3.21"
 hashbrown = "0.15.0"
@@ -33,7 +33,7 @@ lru = "0.12.0"
 mime = "0.3.17"
 os_path = "0.8.0"
 percent-encoding = "2.1"
-polars = { version = "0.45.0", features = [
+polars = { version = "0.46.0", features = [
     "lazy",
     "parquet",
     "json",
@@ -46,13 +46,12 @@ rand = "0.8.0"
 rocksdb = { version = "0.22.0", default-features = false, features = [
     "lz4",
     "snappy",
-    "zlib",
     "multi-threaded-cf",
 ] }
 sanitize-filename = "0.6.0"
 serde = { version = "1.0.136", features = ["derive"] }
 serde_json = "1.0.78"
-tar = "0.4.38"
+tar = "0.4.44"
 time = { version = "0.3.20", features = ["serde"] }
 tokio = { version = "1", features = ["full"] }
 tokio-util = "0.7.8"