refactor: address comments

Signed-off-by: ekexium <ekexium@gmail.com>

Author: ekexium

src/raw/client.rs

@@ -106,7 +106,7 @@ impl Client {
     /// the atomicity of CAS, write operations like [`put`](Client::put) or
     /// [`delete`](Client::delete) in atomic mode are more expensive. Some
     /// operations are not supported in the mode.
-    pub fn with_atomic(&self) -> Client {
+    pub fn with_atomic_for_cas(&self) -> Client {
         Client {
             rpc: self.rpc.clone(),
             cf: self.cf.clone(),
@@ -533,12 +533,12 @@ impl Client {
     fn assert_non_atomic(&self) -> Result<()> {
         (!self.atomic)
             .then(|| ())
-            .ok_or(Error::UnsupportedInAtomicMode)
+            .ok_or(Error::UnsupportedMode)
     }
 
     fn assert_atomic(&self) -> Result<()> {
         self.atomic
             .then(|| ())
-            .ok_or(Error::UnsupportedInNonAtomicMode)
+            .ok_or(Error::UnsupportedMode)
     }
 }

tests/integration_tests.rs

@@ -760,7 +760,7 @@ async fn pessimistic_heartbeat() -> Result<()> {
 #[serial]
 async fn raw_cas() -> Result<()> {
     clear_tikv().await;
-    let client = RawClient::new(pd_addrs()).await?.with_atomic();
+    let client = RawClient::new(pd_addrs()).await?.with_atomic_for_cas();
     let key = "key".to_owned();
     let value = "value".to_owned();
     let new_value = "new value".to_owned();
@@ -801,7 +801,7 @@ async fn raw_cas() -> Result<()> {
     // check unsupported operations
     assert!(matches!(
         client.batch_delete(vec![key.clone()]).await.err().unwrap(),
-        Error::UnsupportedInAtomicMode
+        Error::UnsupportedMode
     ));
     let client = RawClient::new(pd_addrs()).await?;
     assert!(matches!(
@@ -810,7 +810,7 @@ async fn raw_cas() -> Result<()> {
             .await
             .err()
             .unwrap(),
-        Error::UnsupportedInNonAtomicMode
+        Error::UnsupportedMode
     ));
 
     Ok(())

tikv-client-common/src/errors.rs

@@ -28,12 +28,11 @@ pub enum Error {
     /// An operation requires a primary key, but the transaction was empty.
     #[error("transaction has no primary key")]
     NoPrimaryKey,
+    /// For raw client, operation is not supported in atomic/non-atomic mode.
     #[error(
-        "The operation does is not supported in raw-atomic mode, please consider using an atomic client"
+        "The operation is not supported in current mode, please consider using RawClient with or without atomic mode"
     )]
-    UnsupportedInAtomicMode,
-    #[error("The operation is only supported in raw-atomic mode, please consider using a non-atomic raw client")]
-    UnsupportedInNonAtomicMode,
+    UnsupportedMode,
     /// Wraps a `std::io::Error`.
     #[error("IO error: {0}")]
     Io(#[from] std::io::Error),