feat(rust): Let immutable drivers create connections

Author: felipecrv

rust/core/src/driver_manager.rs

@@ -56,7 +56,7 @@
 //! # fn main() -> Result<(), Box<dyn std::error::Error>> {
 //! let opts = [(OptionDatabase::Uri, ":memory:".into())];
 //! let mut driver = ManagedDriver::load_dynamic_from_name("adbc_driver_sqlite", None, AdbcVersion::V100)?;
-//! let mut database = driver.new_database_with_opts(opts)?;
+//! let database = driver.new_database_with_opts(opts)?;
 //! let mut connection = database.new_connection()?;
 //! let mut statement = connection.new_statement()?;
 //!
@@ -251,9 +251,7 @@ impl ManagedDriver {
     }
 
     /// Returns a new database using the loaded driver.
-    ///
-    /// This uses `&mut self` to prevent a deadlock.
-    fn database_new(&mut self) -> Result<ffi::FFI_AdbcDatabase> {
+    fn database_new(&self) -> Result<ffi::FFI_AdbcDatabase> {
         let driver = self.inner_ffi_driver();
         let mut database = ffi::FFI_AdbcDatabase::default();
 
@@ -267,12 +265,7 @@ impl ManagedDriver {
     }
 
     /// Initialize the given database using the loaded driver.
-    ///
-    /// This uses `&mut self` to prevent a deadlock.
-    fn database_init(
-        &mut self,
-        mut database: ffi::FFI_AdbcDatabase,
-    ) -> Result<ffi::FFI_AdbcDatabase> {
+    fn database_init(&self, mut database: ffi::FFI_AdbcDatabase) -> Result<ffi::FFI_AdbcDatabase> {
         let driver = self.inner_ffi_driver();
 
         // DatabaseInit
@@ -473,9 +466,7 @@ impl ManagedDatabase {
     }
 
     /// Returns a new connection using the loaded driver.
-    ///
-    /// This uses `&mut self` to prevent a deadlock.
-    fn connection_new(&mut self) -> Result<ffi::FFI_AdbcConnection> {
+    fn connection_new(&self) -> Result<ffi::FFI_AdbcConnection> {
         let driver = self.ffi_driver();
         let mut connection = ffi::FFI_AdbcConnection::default();
 
@@ -489,10 +480,8 @@ impl ManagedDatabase {
     }
 
     /// Initialize the given connection using the loaded driver.
-    ///
-    /// This uses `&mut self` to prevent a deadlock.
     fn connection_init(
-        &mut self,
+        &self,
         mut connection: ffi::FFI_AdbcConnection,
     ) -> Result<ffi::FFI_AdbcConnection> {
         let driver = self.ffi_driver();
@@ -577,7 +566,7 @@ impl Optionable for ManagedDatabase {
 impl Database for ManagedDatabase {
     type ConnectionType = ManagedConnection;
 
-    fn new_connection(&mut self) -> Result<Self::ConnectionType> {
+    fn new_connection(&self) -> Result<Self::ConnectionType> {
         // Construct a new connection.
         let connection = self.connection_new()?;
         // Initialize the connection.
@@ -592,7 +581,7 @@ impl Database for ManagedDatabase {
     }
 
     fn new_connection_with_opts(
-        &mut self,
+        &self,
         opts: impl IntoIterator<Item = (<Self::ConnectionType as Optionable>::Option, OptionValue)>,
     ) -> Result<Self::ConnectionType> {
         // Construct a new connection.

rust/core/src/lib.rs

@@ -121,11 +121,11 @@ pub trait Database: Optionable<Option = OptionDatabase> {
     type ConnectionType: Connection;
 
     /// Allocate and initialize a new connection without pre-init options.
-    fn new_connection(&mut self) -> Result<Self::ConnectionType>;
+    fn new_connection(&self) -> Result<Self::ConnectionType>;
 
     /// Allocate and initialize a new connection with pre-init options.
     fn new_connection_with_opts(
-        &mut self,
+        &self,
         opts: impl IntoIterator<Item = (options::OptionConnection, OptionValue)>,
     ) -> Result<Self::ConnectionType>;
 }

rust/core/tests/common/mod.rs

@@ -95,7 +95,7 @@ pub fn test_driver(driver: &mut ManagedDriver, uri: &str) {
     assert!(driver.new_database_with_opts(opts).is_err());
 }
 
-pub fn test_database(database: &mut ManagedDatabase) {
+pub fn test_database(database: &ManagedDatabase) {
     assert!(database.new_connection().is_ok());
 
     let opts = [(OptionConnection::AutoCommit, "true".into())];

rust/core/tests/driver_manager_sqlite.rs

@@ -46,8 +46,8 @@ fn test_driver() {
 #[test]
 fn test_database() {
     let mut driver = get_driver();
-    let mut database = get_database(&mut driver);
-    common::test_database(&mut database);
+    let database = get_database(&mut driver);
+    common::test_database(&database);
 }
 
 #[test]
@@ -79,15 +79,15 @@ fn test_database_get_option() {
 #[test]
 fn test_connection() {
     let mut driver = get_driver();
-    let mut database = get_database(&mut driver);
+    let database = get_database(&mut driver);
     let mut connection = database.new_connection().unwrap();
     common::test_connection(&mut connection);
 }
 
 #[test]
 fn test_connection_get_option() {
     let mut driver = get_driver();
-    let mut database = get_database(&mut driver);
+    let database = get_database(&mut driver);
     let connection = database.new_connection().unwrap();
 
     let error = connection
@@ -114,7 +114,7 @@ fn test_connection_get_option() {
 #[test]
 fn test_connection_cancel() {
     let mut driver = get_driver();
-    let mut database = get_database(&mut driver);
+    let database = get_database(&mut driver);
     let mut connection = database.new_connection().unwrap();
 
     let error = connection.cancel().unwrap_err();
@@ -124,71 +124,71 @@ fn test_connection_cancel() {
 #[test]
 fn test_connection_commit_rollback() {
     let mut driver = get_driver();
-    let mut database = get_database(&mut driver);
+    let database = get_database(&mut driver);
     let mut connection = database.new_connection().unwrap();
     common::test_connection_commit_rollback(&mut connection);
 }
 
 #[test]
 fn test_connection_read_partition() {
     let mut driver = get_driver();
-    let mut database = get_database(&mut driver);
+    let database = get_database(&mut driver);
     let connection = database.new_connection().unwrap();
     common::test_connection_read_partition(&connection);
 }
 
 #[test]
 fn test_connection_get_table_types() {
     let mut driver = get_driver();
-    let mut database = get_database(&mut driver);
+    let database = get_database(&mut driver);
     let connection = database.new_connection().unwrap();
     common::test_connection_get_table_types(&connection, &["table", "view"]);
 }
 
 #[test]
 fn test_connection_get_info() {
     let mut driver = get_driver();
-    let mut database = get_database(&mut driver);
+    let database = get_database(&mut driver);
     let connection = database.new_connection().unwrap();
     common::test_connection_get_info(&connection, 5);
 }
 
 #[test]
 fn test_connection_get_objects() {
     let mut driver = get_driver();
-    let mut database = get_database(&mut driver);
+    let database = get_database(&mut driver);
     let connection = database.new_connection().unwrap();
     common::test_connection_get_objects(&connection, 1, 1);
 }
 
 #[test]
 fn test_connection_get_table_schema() {
     let mut driver = get_driver();
-    let mut database = get_database(&mut driver);
+    let database = get_database(&mut driver);
     let mut connection = database.new_connection().unwrap();
     common::test_connection_get_table_schema(&mut connection);
 }
 
 #[test]
 fn test_connection_get_statistic_names() {
     let mut driver = get_driver();
-    let mut database = get_database(&mut driver);
+    let database = get_database(&mut driver);
     let connection = database.new_connection().unwrap();
     assert!(connection.get_statistic_names().is_err());
 }
 
 #[test]
 fn test_connection_get_statistics() {
     let mut driver = get_driver();
-    let mut database = get_database(&mut driver);
+    let database = get_database(&mut driver);
     let connection = database.new_connection().unwrap();
     assert!(connection.get_statistics(None, None, None, false).is_err());
 }
 
 #[test]
 fn test_statement() {
     let mut driver = get_driver();
-    let mut database = get_database(&mut driver);
+    let database = get_database(&mut driver);
     let mut connection = database.new_connection().unwrap();
     let mut statement = connection.new_statement().unwrap();
     common::test_statement(&mut statement);
@@ -197,7 +197,7 @@ fn test_statement() {
 #[test]
 fn test_statement_prepare() {
     let mut driver = get_driver();
-    let mut database = get_database(&mut driver);
+    let database = get_database(&mut driver);
     let mut connection = database.new_connection().unwrap();
     let mut statement = connection.new_statement().unwrap();
     common::test_statement_prepare(&mut statement);
@@ -206,7 +206,7 @@ fn test_statement_prepare() {
 #[test]
 fn test_statement_set_substrait_plan() {
     let mut driver = get_driver();
-    let mut database = get_database(&mut driver);
+    let database = get_database(&mut driver);
     let mut connection = database.new_connection().unwrap();
     let mut statement = connection.new_statement().unwrap();
     common::test_statement_set_substrait_plan(&mut statement);
@@ -215,7 +215,7 @@ fn test_statement_set_substrait_plan() {
 #[test]
 fn test_statement_get_parameter_schema() {
     let mut driver = get_driver();
-    let mut database = get_database(&mut driver);
+    let database = get_database(&mut driver);
     let mut connection = database.new_connection().unwrap();
     let mut statement = connection.new_statement().unwrap();
 
@@ -233,7 +233,7 @@ fn test_statement_get_parameter_schema() {
 #[test]
 fn test_statement_execute() {
     let mut driver = get_driver();
-    let mut database = get_database(&mut driver);
+    let database = get_database(&mut driver);
     let mut connection = database.new_connection().unwrap();
     let mut statement = connection.new_statement().unwrap();
     common::test_statement_execute(&mut statement);
@@ -242,15 +242,15 @@ fn test_statement_execute() {
 #[test]
 fn test_statement_execute_update() {
     let mut driver = get_driver();
-    let mut database = get_database(&mut driver);
+    let database = get_database(&mut driver);
     let mut connection = database.new_connection().unwrap();
     common::test_statement_execute_update(&mut connection);
 }
 
 #[test]
 fn test_statement_execute_schema() {
     let mut driver = get_driver();
-    let mut database = get_database(&mut driver);
+    let database = get_database(&mut driver);
     let mut connection = database.new_connection().unwrap();
     let mut statement = connection.new_statement().unwrap();
 
@@ -261,7 +261,7 @@ fn test_statement_execute_schema() {
 #[test]
 fn test_statement_execute_partitions() {
     let mut driver = get_driver();
-    let mut database = get_database(&mut driver);
+    let database = get_database(&mut driver);
     let mut connection = database.new_connection().unwrap();
     let mut statement = connection.new_statement().unwrap();
     common::test_statement_execute_partitions(&mut statement);
@@ -270,7 +270,7 @@ fn test_statement_execute_partitions() {
 #[test]
 fn test_statement_cancel() {
     let mut driver = get_driver();
-    let mut database = get_database(&mut driver);
+    let database = get_database(&mut driver);
     let mut connection = database.new_connection().unwrap();
     let mut statement = connection.new_statement().unwrap();
 
@@ -281,7 +281,7 @@ fn test_statement_cancel() {
 #[test]
 fn test_statement_bind() {
     let mut driver = get_driver();
-    let mut database = get_database(&mut driver);
+    let database = get_database(&mut driver);
     let mut connection = database.new_connection().unwrap();
     let mut statement = connection.new_statement().unwrap();
     common::test_statement_bind(&mut statement);
@@ -290,7 +290,7 @@ fn test_statement_bind() {
 #[test]
 fn test_statement_bind_stream() {
     let mut driver = get_driver();
-    let mut database = get_database(&mut driver);
+    let database = get_database(&mut driver);
     let mut connection = database.new_connection().unwrap();
     let mut statement = connection.new_statement().unwrap();
     common::test_statement_bind_stream(&mut statement);
@@ -299,7 +299,7 @@ fn test_statement_bind_stream() {
 #[test]
 fn test_ingestion_roundtrip() {
     let mut driver = get_driver();
-    let mut database = get_database(&mut driver);
+    let database = get_database(&mut driver);
     let mut connection = database.new_connection().unwrap();
     common::test_ingestion_roundtrip(&mut connection);
 }

rust/driver/datafusion/README.md

@@ -36,7 +36,7 @@ fn main() {
     )
     .unwrap();
 
-    let mut database = driver.new_database().unwrap();
+    let database = driver.new_database().unwrap();
 
     let mut connection = database.new_connection().unwrap();
 

rust/driver/datafusion/src/lib.rs

@@ -183,7 +183,7 @@ impl Optionable for DataFusionDatabase {
 impl Database for DataFusionDatabase {
     type ConnectionType = DataFusionConnection;
 
-    fn new_connection(&mut self) -> Result<Self::ConnectionType> {
+    fn new_connection(&self) -> Result<Self::ConnectionType> {
         let ctx = SessionContext::new();
 
         let runtime = tokio::runtime::Builder::new_multi_thread()
@@ -198,7 +198,7 @@ impl Database for DataFusionDatabase {
     }
 
     fn new_connection_with_opts(
-        &mut self,
+        &self,
         opts: impl IntoIterator<
             Item = (
                 adbc_core::options::OptionConnection,

rust/driver/datafusion/tests/test_datafusion.rs

@@ -34,7 +34,7 @@ fn get_connection() -> ManagedConnection {
     )
     .unwrap();
 
-    let mut database = driver.new_database().unwrap();
+    let database = driver.new_database().unwrap();
 
     database.new_connection().unwrap()
 }

rust/driver/dummy/src/lib.rs

@@ -230,12 +230,12 @@ impl Optionable for DummyDatabase {
 impl Database for DummyDatabase {
     type ConnectionType = DummyConnection;
 
-    fn new_connection(&mut self) -> Result<Self::ConnectionType> {
+    fn new_connection(&self) -> Result<Self::ConnectionType> {
         Ok(Self::ConnectionType::default())
     }
 
     fn new_connection_with_opts(
-        &mut self,
+        &self,
         opts: impl IntoIterator<Item = (<Self::ConnectionType as Optionable>::Option, OptionValue)>,
     ) -> Result<Self::ConnectionType> {
         let mut connection = Self::ConnectionType::default();

rust/driver/dummy/tests/driver_exporter_dummy.rs

@@ -73,15 +73,15 @@ fn get_exported() -> (
         AdbcVersion::V110,
     )
     .unwrap();
-    let mut database = driver.new_database().unwrap();
+    let database = driver.new_database().unwrap();
     let mut connection = database.new_connection().unwrap();
     let statement = connection.new_statement().unwrap();
     (driver, database, connection, statement)
 }
 
 fn get_native() -> (DummyDriver, DummyDatabase, DummyConnection, DummyStatement) {
     let mut driver = DummyDriver {};
-    let mut database = driver.new_database().unwrap();
+    let database = driver.new_database().unwrap();
     let mut connection = database.new_connection().unwrap();
     let statement = connection.new_statement().unwrap();
     (driver, database, connection, statement)
@@ -197,7 +197,7 @@ fn test_database_options() {
 
 #[test]
 fn test_connection_options() {
-    let (_, mut database, _, _) = get_exported();
+    let (_, database, _, _) = get_exported();
 
     // Pre-init options
     let options = [