Update orcxx

Cargo.lock

@@ -1145,19 +1145,19 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
 
 [[package]]
 name = "orcxx"
-version = "0.2.3"
-source = "git+https://gitlab.softwareheritage.org/swh/devel/orcxx-rs.git?rev=2765108b17bed3a030acd76735e48667d198b867#2765108b17bed3a030acd76735e48667d198b867"
+version = "0.4.1"
+source = "git+https://gitlab.softwareheritage.org/swh/devel/orcxx-rs.git?rev=59eeb8868764f2fd8a77f9b985d98672f03e0ed3#59eeb8868764f2fd8a77f9b985d98672f03e0ed3"
 dependencies = [
  "cxx",
  "cxx-build",
  "rust_decimal",
- "unsafe_unwrap",
+ "thiserror",
 ]
 
 [[package]]
 name = "orcxx_derive"
-version = "0.2.3"
-source = "git+https://gitlab.softwareheritage.org/swh/devel/orcxx-rs.git?rev=2765108b17bed3a030acd76735e48667d198b867#2765108b17bed3a030acd76735e48667d198b867"
+version = "0.4.1"
+source = "git+https://gitlab.softwareheritage.org/swh/devel/orcxx-rs.git?rev=59eeb8868764f2fd8a77f9b985d98672f03e0ed3#59eeb8868764f2fd8a77f9b985d98672f03e0ed3"
 dependencies = [
  "orcxx",
  "proc-macro2",

rust/Cargo.toml

@@ -26,8 +26,8 @@ dsi-progress-logger = "0.1.0"
 clap = { version = "4.1.6", features = ["derive"] }
 #ph = { git = "https://github.com/beling/bsuccinct-rs.git", rev = "f6636350a8149bc8deca83527ca195fe22311a4e" }
 ph = { version = "0.8.0" }
-orcxx = { git = "https://gitlab.softwareheritage.org/swh/devel/orcxx-rs.git", optional = true, rev = "2765108b17bed3a030acd76735e48667d198b867" }
-orcxx_derive = { git = "https://gitlab.softwareheritage.org/swh/devel/orcxx-rs.git", optional = true, rev = "2765108b17bed3a030acd76735e48667d198b867" }
+orcxx = { git = "https://gitlab.softwareheritage.org/swh/devel/orcxx-rs.git", optional = true, rev = "59eeb8868764f2fd8a77f9b985d98672f03e0ed3" }
+orcxx_derive = { git = "https://gitlab.softwareheritage.org/swh/devel/orcxx-rs.git", optional = true, rev = "59eeb8868764f2fd8a77f9b985d98672f03e0ed3" }
 #orcxx = { path = "../../../../rust/orcxx/orcxx/", optional = true }
 #orcxx_derive = { path = "../../../../rust/orcxx/orcxx_derive/", optional = true }
 faster-hex = { version = "0.8.0", features = ["std"], default-features = false }

rust/src/compress/orc.rs

@@ -145,7 +145,6 @@ where
 {
     RowIterator::<T>::new(&reader, (ORC_BATCH_SIZE as u64).try_into().unwrap())
         .expect("Could not open row reader")
-        .expect("Unexpected schema")
         .par_bridge()
         .flat_map(f)
         .map(|swhid| swhid.as_bytes().try_into().unwrap())
@@ -331,7 +330,6 @@ where
 {
     RowIterator::<T>::new(&reader, (ORC_BATCH_SIZE as u64).try_into().unwrap())
         .expect("Could not open row reader")
-        .expect("Unexpected schema")
         .flat_map(f)
         .map(|(src_swhid, dst_swhid)| {
             (
@@ -499,7 +497,6 @@ where
 {
     RowIterator::<T>::new(&reader, (ORC_BATCH_SIZE as u64).try_into().unwrap())
         .expect("Could not open row reader")
-        .expect("Unexpected schema")
         .for_each(f)
 }
 
@@ -647,7 +644,6 @@ where
 {
     RowIterator::<T>::new(&reader, (ORC_BATCH_SIZE as u64).try_into().unwrap())
         .expect("Could not open row reader")
-        .expect("Unexpected schema")
         .par_bridge()
         .flat_map(f)
 }