tikv
/
client-rust
mirror of https://github.com/tikv/client-rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix get the error ranges in group_ranges_by_region (#394) 

* Fix get the error ranges in group_ranges_by_region

Signed-off-by: joker53-1 <1205637346@qq.com>

* fix error

Signed-off-by: Andy Lok <andylokandy@hotmail.com>

---------

Signed-off-by: joker53-1 <1205637346@qq.com>
Signed-off-by: Andy Lok andylokandy@hotmail.com
Signed-off-by: Andy Lok <andylokandy@hotmail.com>
Co-authored-by: Andy Lok <andylokandy@hotmail.com>
This commit is contained in:
joker53-1 2023-07-10 03:15:36 +08:00 committed by GitHub
parent 9ae3e4fa85
commit bae5ee9d09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/pd/client.rs
View File

@ -168,7 +168,7 @@ pub trait PdClient: Send + Sync + 'static {
while let Some(range) = ranges.pop() {
let start_key: Key = range.start_key.clone().into();
let end_key: Key = range.end_key.clone().into();
if start_key < region_start {
if start_key < region_start || start_key > region_end {
ranges.push(range);
break;
}
@ -415,13 +415,15 @@ pub mod test {
let k2 = vec![5, 2];
let k3 = vec![11, 4];
let k4 = vec![16, 4];
let k5 = vec![250, 251];
let k6 = vec![255, 251];
let k_split = vec![10];
let range1 = make_key_range(k1.clone(), k2.clone());
let range2 = make_key_range(k1.clone(), k3.clone());
let range3 = make_key_range(k2.clone(), k4.clone());
let ranges = vec![range1, range2, range3];
let mut stream = executor::block_on_stream(client.group_ranges_by_region(ranges));
let mut stream = executor::block_on_stream(client.clone().group_ranges_by_region(ranges));
let ranges1 = stream.next().unwrap().unwrap();
let ranges2 = stream.next().unwrap().unwrap();
let ranges3 = stream.next().unwrap().unwrap();
@ -430,14 +432,29 @@ pub mod test {
assert_eq!(ranges1.0.id(), 1);
assert_eq!(ranges1.1, vec![
make_key_range(k1.clone(), k2.clone()),
make_key_range(k1, k_split.clone()),
make_key_range(k1.clone(), k_split.clone()),
]);
assert_eq!(ranges2.0.id(), 2);
assert_eq!(ranges2.1, vec![make_key_range(k_split.clone(), k3)]);
assert_eq!(ranges2.1, vec![make_key_range(k_split.clone(), k3.clone())]);
assert_eq!(ranges3.0.id(), 1);
assert_eq!(ranges3.1, vec![make_key_range(k2, k_split.clone())]);
assert_eq!(ranges3.1, vec![make_key_range(k2.clone(), k_split.clone())]);
assert_eq!(ranges4.0.id(), 2);
assert_eq!(ranges4.1, vec![make_key_range(k_split, k4)]);
assert_eq!(ranges4.1, vec![make_key_range(k_split, k4.clone())]);
assert!(stream.next().is_none());
let range1 = make_key_range(k1.clone(), k2.clone());
let range2 = make_key_range(k3.clone(), k4.clone());
let range3 = make_key_range(k5.clone(), k6.clone());
let ranges = vec![range1, range2, range3];
stream = executor::block_on_stream(client.group_ranges_by_region(ranges));
let ranges1 = stream.next().unwrap().unwrap();
let ranges2 = stream.next().unwrap().unwrap();
let ranges3 = stream.next().unwrap().unwrap();
assert_eq!(ranges1.0.id(), 1);
assert_eq!(ranges1.1, vec![make_key_range(k1, k2)]);
assert_eq!(ranges2.0.id(), 2);
assert_eq!(ranges2.1, vec![make_key_range(k3, k4)]);
assert_eq!(ranges3.0.id(), 3);
assert_eq!(ranges3.1, vec![make_key_range(k5, k6)]);
}
}