resolve conflict from master

Signed-off-by: iosmanthus <[email protected]>

Author: iosmanthus

.github/workflows/ci.yml

@@ -17,6 +17,8 @@ jobs:
           profile: minimal
           toolchain: nightly
           override: true
+      - name: Rust Cache
+        uses: Swatinem/[email protected]
       - uses: actions-rs/cargo@v1
         with:
           command: check
@@ -47,6 +49,8 @@ jobs:
           toolchain: nightly
           components: clippy
           override: true
+      - name: Rust Cache
+        uses: Swatinem/[email protected]
       - uses: actions-rs/clippy-check@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -64,18 +68,8 @@ jobs:
           profile: minimal
           toolchain: nightly
           override: true
-      - run: cargo generate-lockfile
-      - name: Cache dependencies
-        uses: actions/cache@v2
-        env:
-          cache-name: cache-dependencies
-        with:
-          path: |
-            ~/.cargo/.crates.toml
-            ~/.cargo/.crates2.json
-            ~/.cargo/registry/index
-            ~/.cargo/registry/cache
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('Cargo.lock') }}
+      - name: Rust Cache
+        uses: Swatinem/[email protected]
       - name: unit test
         run: make unit-test
   integration-test:
@@ -90,21 +84,18 @@ jobs:
           profile: minimal
           toolchain: nightly
           override: true
-      - run: cargo generate-lockfile
-      - name: Cache dependencies
-        uses: actions/cache@v2
-        env:
-          cache-name: cache-dependencies
-        with:
-          path: |
-            ~/.cargo/.crates.toml
-            ~/.cargo/.crates2.json
-            ~/.cargo/registry/index
-            ~/.cargo/registry/cache
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('Cargo.lock') }}
+      - name: Rust Cache
+        uses: Swatinem/[email protected]
       - name: install tiup
         run: curl --proto '=https' --tlsv1.2 -sSf https://tiup-mirrors.pingcap.com/install.sh | sh
       - name: start tiup playground
-        run: /home/runner/.tiup/bin/tiup playground nightly --mode tikv-slim --kv 3 --without-monitor --kv.config /home/runner/work/client-rust/client-rust/config/tikv.toml --pd.config /home/runner/work/client-rust/client-rust/config/pd.toml &
+        run: |
+          ~/.tiup/bin/tiup install tikv:nightly pd:nightly
+          ~/.tiup/bin/tiup playground nightly --mode tikv-slim --kv 3 --without-monitor --kv.config config/tikv.toml --pd.config config/pd.toml &
+          while :; do
+            echo "waiting cluster to be ready"
+            [[ "$(curl -I http://127.0.0.1:2379/pd/api/v1/regions 2>/dev/null | head -n 1 | cut -d$' ' -f2)" -ne "405" ]] || break
+            sleep 1
+          done
       - name: integration test
         run: MULTI_REGION=1 make integration-test

config/tikv.toml

@@ -4,7 +4,7 @@ region-split-keys = 7
 batch-split-limit = 100
 
 [raftstore]
-region-split-check-diff = "0KB"
+region-split-check-diff = "1B"
 pd-heartbeat-tick-interval = "2s"
 pd-store-heartbeat-tick-interval = "5s"
 split-region-check-tick-interval = "1s"

src/config.rs

@@ -8,7 +8,7 @@ use std::{path::PathBuf, time::Duration};
 ///
 /// See also [`TransactionOptions`](crate::TransactionOptions) which provides more ways to configure
 /// requests.
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
 #[serde(default)]
 #[serde(rename_all = "kebab-case")]
 pub struct Config {

src/pd/client.rs

@@ -74,7 +74,7 @@ pub trait PdClient: Send + Sync + 'static {
     fn group_keys_by_region<K, K2>(
         self: Arc<Self>,
         keys: impl Iterator<Item = K> + Send + Sync + 'static,
-    ) -> BoxStream<'static, Result<(RegionId, Vec<K2>)>>
+    ) -> BoxStream<'static, Result<(RegionWithLeader, Vec<K2>)>>
     where
         K: AsRef<Key> + Into<K2> + Send + Sync + 'static,
         K2: Send + Sync + 'static,
@@ -85,15 +85,14 @@ pub trait PdClient: Send + Sync + 'static {
             async move {
                 if let Some(key) = keys.next() {
                     let region = this.region_for_key(key.as_ref()).await?;
-                    let id = region.id();
                     let mut grouped = vec![key.into()];
                     while let Some(key) = keys.peek() {
                         if !region.contains(key.as_ref()) {
                             break;
                         }
                         grouped.push(keys.next().unwrap().into());
                     }
-                    Ok(Some((keys, (id, grouped))))
+                    Ok(Some((keys, (region, grouped))))
                 } else {
                     Ok(None)
                 }
@@ -137,7 +136,7 @@ pub trait PdClient: Send + Sync + 'static {
     fn group_ranges_by_region(
         self: Arc<Self>,
         mut ranges: Vec<kvrpcpb::KeyRange>,
-    ) -> BoxStream<'static, Result<(RegionId, Vec<kvrpcpb::KeyRange>)>> {
+    ) -> BoxStream<'static, Result<(RegionWithLeader, Vec<kvrpcpb::KeyRange>)>> {
         ranges.reverse();
         stream_fn(Some(ranges), move |ranges| {
             let this = self.clone();
@@ -151,7 +150,6 @@ pub trait PdClient: Send + Sync + 'static {
                     let start_key: Key = range.start_key.clone().into();
                     let end_key: Key = range.end_key.clone().into();
                     let region = this.region_for_key(&start_key).await?;
-                    let id = region.id();
                     let region_start = region.start_key();
                     let region_end = region.end_key();
                     let mut grouped = vec![];
@@ -164,7 +162,7 @@ pub trait PdClient: Send + Sync + 'static {
                             start_key: region_end.into(),
                             end_key: end_key.into(),
                         });
-                        return Ok(Some((Some(ranges), (id, grouped))));
+                        return Ok(Some((Some(ranges), (region, grouped))));
                     }
                     grouped.push(range);
 
@@ -184,11 +182,11 @@ pub trait PdClient: Send + Sync + 'static {
                                 start_key: region_end.into(),
                                 end_key: end_key.into(),
                             });
-                            return Ok(Some((Some(ranges), (id, grouped))));
+                            return Ok(Some((Some(ranges), (region, grouped))));
                         }
                         grouped.push(range);
                     }
-                    Ok(Some((Some(ranges), (id, grouped))))
+                    Ok(Some((Some(ranges), (region, grouped))))
                 } else {
                     Ok(None)
                 }
@@ -445,7 +443,7 @@ pub mod test {
         let ranges3 = stream.next().unwrap().unwrap();
         let ranges4 = stream.next().unwrap().unwrap();
 
-        assert_eq!(ranges1.0, 1);
+        assert_eq!(ranges1.0.id(), 1);
         assert_eq!(
             ranges1.1,
             vec![
@@ -459,23 +457,23 @@ pub mod test {
                 },
             ]
         );
-        assert_eq!(ranges2.0, 2);
+        assert_eq!(ranges2.0.id(), 2);
         assert_eq!(
             ranges2.1,
             vec![kvrpcpb::KeyRange {
                 start_key: k_split.clone(),
                 end_key: k3,
             }]
         );
-        assert_eq!(ranges3.0, 1);
+        assert_eq!(ranges3.0.id(), 1);
         assert_eq!(
             ranges3.1,
             vec![kvrpcpb::KeyRange {
                 start_key: k2,
                 end_key: k_split.clone(),
             }]
         );
-        assert_eq!(ranges4.0, 2);
+        assert_eq!(ranges4.0.id(), 2);
         assert_eq!(
             ranges4.1,
             vec![kvrpcpb::KeyRange {