ci: Fix CI errors (#381)

pingyu · web-flow · commit d2f78b2768f3 · 2022-12-14T10:21:58.000+08:00
Signed-off-by: Ping Yu &lt;yuping@pingcap.com&gt;
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,6 +17,11 @@ jobs:
           profile: minimal
           toolchain: nightly
           override: true
+      - name: Install Protoc
+        uses: arduino/setup-protoc@v1
+        with:
+          version: '3.x'
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Rust Cache
         uses: Swatinem/rust-cache@v1.4.0
       - uses: actions-rs/cargo@v1
@@ -39,6 +44,7 @@ jobs:
         with:
           command: fmt
           args: --all -- --check
+
   clippy:
     name: clippy
     runs-on: ubuntu-latest
@@ -49,13 +55,19 @@ jobs:
           toolchain: nightly
           components: clippy
           override: true
+      - name: Install Protoc
+        uses: arduino/setup-protoc@v1
+        with:
+          version: '3.x'
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Rust Cache
         uses: Swatinem/rust-cache@v1.4.0
       - uses: actions-rs/clippy-check@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           args: --all-targets --all-features -- -D clippy::all
           name: Clippy Output
+
   unit-test:
     name: unit test
     env:
@@ -68,10 +80,16 @@ jobs:
           profile: minimal
           toolchain: nightly
           override: true
+      - name: Install Protoc
+        uses: arduino/setup-protoc@v1
+        with:
+          version: '3.x'
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Rust Cache
         uses: Swatinem/rust-cache@v1.4.0
       - name: unit test
         run: make unit-test
+
   integration-test:
     name: integration test
     env:
@@ -84,6 +102,11 @@ jobs:
           profile: minimal
           toolchain: nightly
           override: true
+      - name: Install Protoc
+        uses: arduino/setup-protoc@v1
+        with:
+          version: '3.x'
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Rust Cache
         uses: Swatinem/rust-cache@v1.4.0
       - name: install tiup
diff --git a/examples/raw.rs b/examples/raw.rs
@@ -35,7 +35,7 @@ async fn main() -> Result<()> {
     //
     // Here we set the key `TiKV` to have the value `Rust` associated with it.
     client.put(KEY.to_owned(), VALUE.to_owned()).await.unwrap(); // Returns a `tikv_client::Error` on failure.
-    println!("Put key {:?}, value {:?}.", KEY, VALUE);
+    println!("Put key {KEY:?}, value {VALUE:?}.");
 
     // Unlike a standard Rust HashMap all calls take owned values. This is because under the hood
     // protobufs must take ownership of the data. If we only took a borrow we'd need to internally
@@ -48,15 +48,15 @@ async fn main() -> Result<()> {
     // types are supported as well, but it all ends up as `Vec<u8>` in the end.
     let value: Option<Value> = client.get(KEY.to_owned()).await?;
     assert_eq!(value, Some(Value::from(VALUE.to_owned())));
-    println!("Get key `{}` returned value {:?}.", KEY, value);
+    println!("Get key `{KEY}` returned value {value:?}.");
 
     // You can also set the `ColumnFamily` used by the request.
     // This is *advanced usage* and should have some special considerations.
     client
         .delete(KEY.to_owned())
         .await
         .expect("Could not delete value");
-    println!("Key: `{}` deleted", KEY);
+    println!("Key: `{KEY}` deleted");
 
     // Here we check if the key has been deleted from the key-value store.
     let value: Option<Value> = client
@@ -80,7 +80,7 @@ async fn main() -> Result<()> {
         .batch_get(keys.clone())
         .await
         .expect("Could not get values");
-    println!("Found values: {:?} for keys: {:?}", values, keys);
+    println!("Found values: {values:?} for keys: {keys:?}");
 
     // Scanning a range of keys is also possible giving it two bounds
     // it will returns all entries between these two.
@@ -96,7 +96,7 @@ async fn main() -> Result<()> {
         &keys,
         &[Key::from("k1".to_owned()), Key::from("k2".to_owned()),]
     );
-    println!("Scaning from {:?} to {:?} gives: {:?}", start, end, keys);
+    println!("Scanning from {start:?} to {end:?} gives: {keys:?}");
 
     let k1 = "k1";
     let k2 = "k2";
@@ -126,10 +126,7 @@ async fn main() -> Result<()> {
             "v3".to_owned()
         ]
     );
-    println!(
-        "Scaning batch scan from {:?} gives: {:?}",
-        batch_scan_keys, vals
-    );
+    println!("Scanning batch scan from {batch_scan_keys:?} gives: {vals:?}");
 
     // Cleanly exit.
     Ok(())
diff --git a/examples/transaction.rs b/examples/transaction.rs
@@ -52,7 +52,7 @@ async fn scan(client: &Client, range: impl Into<BoundRange>, limit: u32) {
     txn.scan(range, limit)
         .await
         .expect("Could not scan key-value pairs in range")
-        .for_each(|pair| println!("{:?}", pair));
+        .for_each(|pair| println!("{pair:?}"));
     txn.commit().await.expect("Could not commit transaction");
 }
 
diff --git a/mock-tikv/src/pd.rs b/mock-tikv/src/pd.rs
@@ -32,7 +32,7 @@ impl MockPd {
     fn store() -> tikv_client_proto::metapb::Store {
         // TODO: start_timestamp?
         tikv_client_proto::metapb::Store {
-            address: format!("localhost:{}", MOCK_TIKV_PORT),
+            address: format!("localhost:{MOCK_TIKV_PORT}"),
             ..Default::default()
         }
     }
@@ -58,7 +58,7 @@ impl Pd for MockPd {
     ) {
         let member = Member {
             name: "mock tikv".to_owned(),
-            client_urls: vec![format!("localhost:{}", MOCK_PD_PORT)],
+            client_urls: vec![format!("localhost:{MOCK_PD_PORT}")],
             ..Default::default()
         };
         let resp = GetMembersResponse {
diff --git a/src/kv/mod.rs b/src/kv/mod.rs
@@ -17,7 +17,7 @@ struct HexRepr<'a>(pub &'a [u8]);
 impl<'a> fmt::Display for HexRepr<'a> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         for byte in self.0 {
-            write!(f, "{:02X}", byte)?;
+            write!(f, "{byte:02X}")?;
         }
         Ok(())
     }
diff --git a/src/pd/client.rs b/src/pd/client.rs
@@ -285,7 +285,7 @@ fn thread_name(prefix: &str) -> String {
     thread::current()
         .name()
         .and_then(|name| name.split("::").skip(1).last())
-        .map(|tag| format!("{}::{}", prefix, tag))
+        .map(|tag| format!("{prefix}::{tag}"))
         .unwrap_or_else(|| prefix.to_owned())
 }
 
diff --git a/src/region_cache.rs b/src/region_cache.rs
@@ -111,8 +111,7 @@ impl<C: RetryClientTrait> RegionCache<C> {
             }
         }
         Err(Error::StringError(format!(
-            "Concurrent PD requests failed for {} times",
-            MAX_RETRY_WAITING_CONCURRENT_REQUEST
+            "Concurrent PD requests failed for {MAX_RETRY_WAITING_CONCURRENT_REQUEST} times"
         )))
     }
 
diff --git a/src/request/plan.rs b/src/request/plan.rs
@@ -155,7 +155,7 @@ where
                     )
                     .await
                 }
-                None => Err(Error::RegionError(e)),
+                None => Err(Error::RegionError(Box::new(e))),
             }
         } else {
             Ok(vec![Ok(resp)])
@@ -213,7 +213,7 @@ where
             || e.has_raft_entry_too_large()
             || e.has_max_timestamp_not_synced()
         {
-            Err(Error::RegionError(e))
+            Err(Error::RegionError(Box::new(e)))
         } else {
             // TODO: pass the logger around
             // info!("unknwon region error: {:?}", e);
@@ -475,7 +475,10 @@ where
             Err(Error::ExtractedErrors(errors))
         } else if let Some(errors) = result.region_errors() {
             Err(Error::ExtractedErrors(
-                errors.into_iter().map(Error::RegionError).collect(),
+                errors
+                    .into_iter()
+                    .map(|e| Error::RegionError(Box::new(e)))
+                    .collect(),
             ))
         } else {
             Ok(result)
diff --git a/src/transaction/lock.rs b/src/transaction/lock.rs
@@ -159,7 +159,7 @@ mod tests {
                     };
                     Ok(Box::new(resp) as Box<dyn Any>)
                 });
-                Ok(Box::new(kvrpcpb::ResolveLockResponse::default()) as Box<dyn Any>)
+                Ok(Box::<kvrpcpb::ResolveLockResponse>::default() as Box<dyn Any>)
             },
         )));
 
diff --git a/src/transaction/transaction.rs b/src/transaction/transaction.rs
@@ -1326,7 +1326,7 @@ impl<PdC: PdClient> Committer<PdC> {
         if self.write_size > TXN_COMMIT_BATCH_SIZE {
             let size_mb = self.write_size as f64 / 1024.0 / 1024.0;
             lock_ttl = (TTL_FACTOR * size_mb.sqrt()) as u64;
-            lock_ttl = lock_ttl.min(MAX_TTL).max(DEFAULT_LOCK_TTL);
+            lock_ttl = lock_ttl.clamp(DEFAULT_LOCK_TTL, MAX_TTL);
         }
         lock_ttl
     }
@@ -1388,11 +1388,11 @@ mod tests {
             move |req: &dyn Any| {
                 if req.downcast_ref::<kvrpcpb::TxnHeartBeatRequest>().is_some() {
                     heartbeats_cloned.fetch_add(1, Ordering::SeqCst);
-                    Ok(Box::new(kvrpcpb::TxnHeartBeatResponse::default()) as Box<dyn Any>)
+                    Ok(Box::<kvrpcpb::TxnHeartBeatResponse>::default() as Box<dyn Any>)
                 } else if req.downcast_ref::<kvrpcpb::PrewriteRequest>().is_some() {
-                    Ok(Box::new(kvrpcpb::PrewriteResponse::default()) as Box<dyn Any>)
+                    Ok(Box::<kvrpcpb::PrewriteResponse>::default() as Box<dyn Any>)
                 } else {
-                    Ok(Box::new(kvrpcpb::CommitResponse::default()) as Box<dyn Any>)
+                    Ok(Box::<kvrpcpb::CommitResponse>::default() as Box<dyn Any>)
                 }
             },
         )));
@@ -1432,16 +1432,16 @@ mod tests {
             move |req: &dyn Any| {
                 if req.downcast_ref::<kvrpcpb::TxnHeartBeatRequest>().is_some() {
                     heartbeats_cloned.fetch_add(1, Ordering::SeqCst);
-                    Ok(Box::new(kvrpcpb::TxnHeartBeatResponse::default()) as Box<dyn Any>)
+                    Ok(Box::<kvrpcpb::TxnHeartBeatResponse>::default() as Box<dyn Any>)
                 } else if req.downcast_ref::<kvrpcpb::PrewriteRequest>().is_some() {
-                    Ok(Box::new(kvrpcpb::PrewriteResponse::default()) as Box<dyn Any>)
+                    Ok(Box::<kvrpcpb::PrewriteResponse>::default() as Box<dyn Any>)
                 } else if req
                     .downcast_ref::<kvrpcpb::PessimisticLockRequest>()
                     .is_some()
                 {
-                    Ok(Box::new(kvrpcpb::PessimisticLockResponse::default()) as Box<dyn Any>)
+                    Ok(Box::<kvrpcpb::PessimisticLockResponse>::default() as Box<dyn Any>)
                 } else {
-                    Ok(Box::new(kvrpcpb::CommitResponse::default()) as Box<dyn Any>)
+                    Ok(Box::<kvrpcpb::CommitResponse>::default() as Box<dyn Any>)
                 }
             },
         )));
diff --git a/tests/integration_tests.rs b/tests/integration_tests.rs
@@ -187,7 +187,7 @@ async fn raw_bank_transfer() -> Result<()> {
     let mut sum: u32 = 0;
     for person in &people {
         let init = rng.gen::<u8>() as u32;
-        sum += init as u32;
+        sum += init;
         client
             .put(person.clone(), init.to_be_bytes().to_vec())
             .await?;
@@ -335,7 +335,7 @@ async fn txn_bank_transfer() -> Result<()> {
     let mut sum: u32 = 0;
     for person in &people {
         let init = rng.gen::<u8>() as u32;
-        sum += init as u32;
+        sum += init;
         txn.put(person.clone(), init.to_be_bytes().to_vec()).await?;
     }
     txn.commit().await?;
diff --git a/tests/mock_tikv_tests.rs b/tests/mock_tikv_tests.rs
@@ -15,7 +15,7 @@ mod test {
         let mut tikv_server = start_mock_tikv_server();
         let _pd_server = start_mock_pd_server();
 
-        let client = RawClient::new(vec![format!("localhost:{}", MOCK_PD_PORT)], None)
+        let client = RawClient::new(vec![format!("localhost:{MOCK_PD_PORT}")], None)
             .await
             .unwrap();
 
diff --git a/tikv-client-common/src/errors.rs b/tikv-client-common/src/errors.rs
@@ -48,13 +48,13 @@ pub enum Error {
     Canceled(#[from] futures::channel::oneshot::Canceled),
     /// Errors caused by changes of region information
     #[error("Region error: {0:?}")]
-    RegionError(tikv_client_proto::errorpb::Error),
+    RegionError(Box<tikv_client_proto::errorpb::Error>),
     /// Whether the transaction is committed or not is undetermined
     #[error("Whether the transaction is committed or not is undetermined")]
     UndeterminedError(Box<Error>),
     /// Wraps `tikv_client_proto::kvrpcpb::KeyError`
     #[error("{0:?}")]
-    KeyError(tikv_client_proto::kvrpcpb::KeyError),
+    KeyError(Box<tikv_client_proto::kvrpcpb::KeyError>),
     /// Multiple errors generated from the ExtractError plan.
     #[error("Multiple errors: {0:?}")]
     ExtractedErrors(Vec<Error>),
@@ -97,13 +97,13 @@ pub enum Error {
 
 impl From<tikv_client_proto::errorpb::Error> for Error {
     fn from(e: tikv_client_proto::errorpb::Error) -> Error {
-        Error::RegionError(e)
+        Error::RegionError(Box::new(e))
     }
 }
 
 impl From<tikv_client_proto::kvrpcpb::KeyError> for Error {
     fn from(e: tikv_client_proto::kvrpcpb::KeyError) -> Error {
-        Error::KeyError(e)
+        Error::KeyError(Box::new(e))
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ async fn scan(client: &Client, range: impl Into<BoundRange>, limit: u32) {`
`52`	`52`	`txn.scan(range, limit)`
`53`	`53`	`.await`
`54`	`54`	`.expect("Could not scan key-value pairs in range")`
`55`		`- .for_each(\|pair\| println!("{:?}", pair));`
	`55`	`+ .for_each(\|pair\| println!("{pair:?}"));`
`56`	`56`	`txn.commit().await.expect("Could not commit transaction");`
`57`	`57`	`}`
`58`	`58`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ struct HexRepr<'a>(pub &'a [u8]);`
`17`	`17`	`impl<'a> fmt::Display for HexRepr<'a> {`
`18`	`18`	`fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {`
`19`	`19`	`for byte in self.0 {`
`20`		`- write!(f, "{:02X}", byte)?;`
	`20`	`+ write!(f, "{byte:02X}")?;`
`21`	`21`	`}`
`22`	`22`	`Ok(())`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -285,7 +285,7 @@ fn thread_name(prefix: &str) -> String {`
`285`	`285`	`thread::current()`
`286`	`286`	`.name()`
`287`	`287`	`.and_then(\|name\| name.split("::").skip(1).last())`
`288`		`- .map(\|tag\| format!("{}::{}", prefix, tag))`
	`288`	`+ .map(\|tag\| format!("{prefix}::{tag}"))`
`289`	`289`	`.unwrap_or_else(\|\| prefix.to_owned())`
`290`	`290`	`}`
`291`	`291`
Original file line number	Diff line number	Diff line change
`@@ -111,8 +111,7 @@ impl<C: RetryClientTrait> RegionCache<C> {`
`111`	`111`	`}`
`112`	`112`	`}`
`113`	`113`	`Err(Error::StringError(format!(`
`114`		`- "Concurrent PD requests failed for {} times",`
`115`		`- MAX_RETRY_WAITING_CONCURRENT_REQUEST`
	`114`	`+ "Concurrent PD requests failed for {MAX_RETRY_WAITING_CONCURRENT_REQUEST} times"`
`116`	`115`	`)))`
`117`	`116`	`}`
`118`	`117`