update iceberg-rust (#1889)

* update iceberg-rust

* fix statistics test

Author: JanKaul

Cargo.lock

@@ -52,15 +52,15 @@ datafusion-expr = { version = "50.0.0" }
 datafusion-functions-json = { git = "https://github.com/Embucket/datafusion-functions-json.git", rev = "439cbd2282504c3ffaf262f1ffdb530a0fb1a151" }
 datafusion-macros = { version = "50.0.0" }
 datafusion-physical-plan = { version = "50.0.0" }
-datafusion_iceberg = { git = "https://github.com/Embucket/iceberg-rust.git", rev = "5664a94fcd7350c5e381aaeaf018bc0b20ce03b6" }
+datafusion_iceberg = { git = "https://github.com/Embucket/iceberg-rust.git", rev = "1eeb4515446119dd3b4dbb7ebd2f70ae5b4f827d" }
 futures = { version = "0.3" }
 http = "1.2"
 http-body-util = "0.1.0"
 iceberg = { git = "https://github.com/apache/iceberg-rust.git", rev="7a5ad1fcaf00d4638857812bab788105f6c60573"}
-iceberg-rest-catalog = { git = "https://github.com/Embucket/iceberg-rust.git", rev = "5664a94fcd7350c5e381aaeaf018bc0b20ce03b6" }
-iceberg-rust = { git = "https://github.com/Embucket/iceberg-rust.git", rev = "5664a94fcd7350c5e381aaeaf018bc0b20ce03b6" }
-iceberg-rust-spec = { git = "https://github.com/Embucket/iceberg-rust.git", rev = "5664a94fcd7350c5e381aaeaf018bc0b20ce03b6" }
-iceberg-s3tables-catalog = { git = "https://github.com/Embucket/iceberg-rust.git", rev = "5664a94fcd7350c5e381aaeaf018bc0b20ce03b6" }
+iceberg-rest-catalog = { git = "https://github.com/Embucket/iceberg-rust.git", rev = "1eeb4515446119dd3b4dbb7ebd2f70ae5b4f827d" }
+iceberg-rust = { git = "https://github.com/Embucket/iceberg-rust.git", rev = "1eeb4515446119dd3b4dbb7ebd2f70ae5b4f827d" }
+iceberg-rust-spec = { git = "https://github.com/Embucket/iceberg-rust.git", rev = "1eeb4515446119dd3b4dbb7ebd2f70ae5b4f827d" }
+iceberg-s3tables-catalog = { git = "https://github.com/Embucket/iceberg-rust.git", rev = "1eeb4515446119dd3b4dbb7ebd2f70ae5b4f827d" }
 indexmap = "2.7.1"
 jsonwebtoken = "9.3.1"
 lazy_static = { version = "1.5" }

Cargo.toml

@@ -219,7 +219,7 @@ async fn test_ui_tables() {
     assert_eq!(http::StatusCode::OK, res.status());
     let TableStatisticsResponse(table) = res.json().await.unwrap();
     assert_eq!(0, table.total_bytes);
-    assert_eq!(0, table.total_rows);
+    assert_eq!(2, table.total_rows);
 
     //Create three more tables
     let query_payload = QueryCreatePayload {

crates/api-ui/src/tests/tables.rs

@@ -157,8 +157,9 @@ impl ExecutionPlan for MergeIntoCOWSinkExec {
             let branch = self.target.branch.clone();
             let schema = schema.clone();
             async move {
-                let mut lock = tabular.write().await;
-                let table = if let Tabular::Table(table) = &mut *lock {
+                #[allow(clippy::unwrap_used)]
+                let value = tabular.write().unwrap().clone();
+                let mut table = if let Tabular::Table(table) = value {
                     Ok(table)
                 } else {
                     Err(IcebergError::InvalidFormat("database entity".to_string()))
@@ -167,7 +168,7 @@ impl ExecutionPlan for MergeIntoCOWSinkExec {
 
                 // Write recordbatches into parquet files on object-storage
                 let datafiles =
-                    write_parquet_data_files(table, batches, &context, branch.as_deref()).await?;
+                    write_parquet_data_files(&table, batches, &context, branch.as_deref()).await?;
 
                 let matching_files = {
                     #[allow(clippy::unwrap_used)]

crates/core-executor/src/datafusion/physical_plan/merge.rs

@@ -3405,8 +3405,8 @@ fn merge_clause_expression(merge_clause: &MergeClause) -> Result<DFExpr> {
 async fn target_filter_expression(
     table: &DataFusionTable,
 ) -> Result<Option<datafusion_expr::Expr>> {
-    let lock = table.tabular.read().await;
-    let table = match &*lock {
+    #[allow(clippy::unwrap_used)]
+    let table = match table.tabular.read().unwrap().clone() {
         Tabular::Table(table) => Ok(table),
         _ => MergeSourceNotSupportedSnafu.fail(),
     }?;