Change the interface of open/create_db

Author: wtdcode

crates/mdbx-remote/src/any.rs

@@ -204,12 +204,12 @@ pub enum TransactionAny<K: TransactionKind> {
 }
 
 impl<K: TransactionKind> TransactionAny<K> {
-    pub async fn open_db(&self, db: Option<String>) -> Result<DatabaseAny> {
+    pub async fn open_db(&self, db: Option<&str>) -> Result<DatabaseAny> {
         match self {
-            Self::Local(tx) => Ok(DatabaseAny::Local(
-                tx.open_db(db.as_ref().map(|t| t.as_str()))?,
+            Self::Local(tx) => Ok(DatabaseAny::Local(tx.open_db(db)?)),
+            Self::Remote(tx) => Ok(DatabaseAny::Remote(
+                tx.open_db(db.map(|t| t.to_string())).await?,
             )),
-            Self::Remote(tx) => Ok(DatabaseAny::Remote(tx.open_db(db).await?)),
         }
     }
 
@@ -274,12 +274,12 @@ impl TransactionAny<RW> {
         }
     }
 
-    pub async fn create_db(&self, db: Option<String>, flags: DatabaseFlags) -> Result<DatabaseAny> {
+    pub async fn create_db(&self, db: Option<&str>, flags: DatabaseFlags) -> Result<DatabaseAny> {
         match self {
-            Self::Local(tx) => Ok(DatabaseAny::Local(
-                tx.create_db(db.as_ref().map(|t| t.as_str()), flags)?,
+            Self::Local(tx) => Ok(DatabaseAny::Local(tx.create_db(db, flags)?)),
+            Self::Remote(tx) => Ok(DatabaseAny::Remote(
+                tx.create_db(db.map(|t| t.to_string()), flags).await?,
             )),
-            Self::Remote(tx) => Ok(DatabaseAny::Remote(tx.create_db(db, flags).await?)),
         }
     }
 

crates/mdbx/src/reth.rs

@@ -26,9 +26,7 @@ pub async fn reth_main(args: RethArguments) -> Result<()> {
 
     match args.table.to_lowercase().as_str() {
         "plainaccountstate" => {
-            let db = tx
-                .open_db(Some(PlainAccountState::NAME.to_string()))
-                .await?;
+            let db = tx.open_db(Some(PlainAccountState::NAME)).await?;
             let val = tx.get::<Vec<u8>>(db.dbi(), &args.key).await?;
             let val = val
                 .map(|t| <PlainAccountState as reth_db::table::Table>::Value::decompress(&t))

crates/mdbx/src/stat.rs

@@ -41,7 +41,7 @@ pub async fn stat_main(args: StatArguments) -> Result<()> {
         while let Some(it) = st.next().await {
             let (k, _) = it?;
             let table = String::from_utf8(k)?;
-            let db = tx.open_db(Some(table.clone())).await?;
+            let db = tx.open_db(Some(&table)).await?;
 
             let stat = tx.db_stat(&db).await?;
             println!("Table {}:", table);