fix test build

Author: CTTY

crates/catalog/rest/src/catalog.rs

@@ -2104,9 +2104,9 @@ mod tests {
             .create_async()
             .await;
 
-        let catalog = Arc::new(RestCatalog::new(
+        let catalog = RestCatalog::new(
             RestCatalogConfig::builder().uri(server.url()).build(),
-        ));
+        );
 
         let table1 = {
             let file = File::open(format!(
@@ -2130,7 +2130,7 @@ mod tests {
         let table = Transaction::new(table1)
             .upgrade_table_version(FormatVersion::V2)
             .unwrap()
-            .commit(catalog)
+            .commit(Arc::new(&catalog))
             .await
             .unwrap();
 
@@ -2231,9 +2231,9 @@ mod tests {
             .create_async()
             .await;
 
-        let catalog = Arc::new(RestCatalog::new(
+        let catalog = RestCatalog::new(
             RestCatalogConfig::builder().uri(server.url()).build(),
-        ));
+        );
 
         let table1 = {
             let file = File::open(format!(
@@ -2254,10 +2254,10 @@ mod tests {
                 .unwrap()
         };
 
-        let table_result = Transaction::new(&table1)
+        let table_result = Transaction::new(table1)
             .upgrade_table_version(FormatVersion::V2)
             .unwrap()
-            .commit(catalog)
+            .commit(Arc::new(&catalog))
             .await;
 
         assert!(table_result.is_err());

crates/catalog/rest/tests/rest_catalog_test.rs

@@ -350,7 +350,7 @@ async fn test_update_table() {
     let table2 = Transaction::new(table)
         .set_properties(HashMap::from([("prop1".to_string(), "v1".to_string())]))
         .unwrap()
-        .commit(Arc::new(catalog))
+        .commit(Arc::new(&catalog))
         .await
         .unwrap();
 

crates/iceberg/src/transaction/action/mod.rs

@@ -31,13 +31,13 @@ pub(crate) trait TransactionAction: Sync + Send {
     fn commit(self: Arc<Self>, tx: &mut Transaction) -> Result<()>;
 }
 
-pub struct SetLocation {
+pub struct SetLocationAction {
     pub location: Option<String>,
 }
 
-impl SetLocation {
+impl SetLocationAction {
     pub fn new() -> Self {
-        SetLocation { location: None }
+        SetLocationAction { location: None }
     }
 
     pub fn set_location(mut self, location: String) -> Self {
@@ -46,7 +46,7 @@ impl SetLocation {
     }
 }
 
-impl TransactionAction for SetLocation {
+impl TransactionAction for SetLocationAction {
     fn commit(self: Arc<Self>, tx: &mut Transaction) -> Result<()> {
         let updates: Vec<TableUpdate>;
         let requirements: Vec<TableRequirement>;

crates/iceberg/src/transaction/mod.rs

@@ -37,7 +37,7 @@ use crate::TableUpdate::UpgradeFormatVersion;
 use crate::error::Result;
 use crate::spec::FormatVersion;
 use crate::table::Table;
-use crate::transaction::action::{BoxedTransactionAction, SetLocation, TransactionAction};
+use crate::transaction::action::{BoxedTransactionAction, SetLocationAction, TransactionAction};
 use crate::transaction::append::FastAppendAction;
 use crate::transaction::sort_order::ReplaceSortOrderAction;
 use crate::{Catalog, Error, ErrorKind, TableCommit, TableRequirement, TableUpdate};
@@ -195,7 +195,7 @@ impl Transaction {
 
     /// Set the location of table
     pub fn set_location(mut self, location: String) -> Result<Self> {
-        let set_location = SetLocation::new().set_location(location);
+        let set_location = SetLocationAction::new().set_location(location);
         Arc::new(set_location).commit(&mut self)?;
         Ok(self)
     }

crates/integration_tests/tests/shared_tests/append_data_file_test.rs

@@ -115,7 +115,7 @@ async fn test_append_data_file() {
     let mut append_action = tx.fast_append(None, vec![]).unwrap();
     append_action.add_data_files(data_file.clone()).unwrap();
     let mut tx = append_action.apply().await.unwrap();
-    let table = tx.commit(Arc::new(rest_catalog)).await.unwrap();
+    let table = tx.commit(Arc::new(&rest_catalog)).await.unwrap();
 
     // check result
     let batch_stream = table
@@ -135,7 +135,7 @@ async fn test_append_data_file() {
     let mut append_action = tx.fast_append(None, vec![]).unwrap();
     append_action.add_data_files(data_file.clone()).unwrap();
     let mut tx = append_action.apply().await.unwrap();
-    let table = tx.commit(Arc::new(rest_catalog)).await.unwrap();
+    let table = tx.commit(Arc::new(&rest_catalog)).await.unwrap();
 
     // check result again
     let batch_stream = table

crates/integration_tests/tests/shared_tests/conflict_commit_test.rs

@@ -92,7 +92,7 @@ async fn test_append_data_file_conflict() {
     let tx1 = Transaction::new(table.clone());
     let mut append_action = tx1.fast_append(None, vec![]).unwrap();
     append_action.add_data_files(data_file.clone()).unwrap();
-    let tx1 = append_action.apply().await.unwrap();
+    let mut tx1 = append_action.apply().await.unwrap();
 
     let tx2 = Transaction::new(table.clone());
     let mut append_action = tx2.fast_append(None, vec![]).unwrap();
@@ -117,5 +117,5 @@ async fn test_append_data_file_conflict() {
     assert_eq!(batches[0], batch);
 
     // another commit should fail
-    assert!(tx1.commit(&rest_catalog).await.is_err());
+    assert!(tx1.commit(Arc::new(&rest_catalog)).await.is_err());
 }

crates/integration_tests/tests/shared_tests/scan_all_type.rs

@@ -312,7 +312,7 @@ async fn test_scan_all_type() {
     let mut append_action = tx.fast_append(None, vec![]).unwrap();
     append_action.add_data_files(data_file.clone()).unwrap();
     let mut tx = append_action.apply().await.unwrap();
-    let table = tx.commit(Arc::new(rest_catalog)).await.unwrap();
+    let table = tx.commit(Arc::new(&rest_catalog)).await.unwrap();
 
     // check result
     let batch_stream = table