rust/greptimedb
1
0
Fork 0
mirror of https://github.com/GreptimeTeam/greptimedb.git synced 2026-05-31 12:20:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Define RegionId as a new type (#1903)

Browse Source 
* refactor: Define RegionId as a new type

* chore: use into

* feat: custom debug print for region id

fix: test_show_create_table
This commit is contained in:
Yingwen
2023-07-07 22:26:03 +09:00
committed by GitHub
parent 963e468286
commit f731193ddc
28 changed files with 203 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/meta/src/rpc/router.rs
View File

@@ -148,7 +148,7 @@ impl TableRoute {
pub fn new(table: Table, region_routes: Vec<RegionRoute>) -> Self {
let region_leaders = region_routes
.iter()
.map(|x| (x.region.id as RegionNumber, x.leader_peer.clone()))
.map(|x| (x.region.id.region_number(), x.leader_peer.clone()))
.collect::<HashMap<_, _>>();
Self {
@@ -265,13 +265,13 @@ impl TableRoute {
.collect()
}
pub fn find_leader_regions(&self, datanode: &Peer) -> Vec<u32> {
pub fn find_leader_regions(&self, datanode: &Peer) -> Vec<RegionNumber> {
self.region_routes
.iter()
.filter_map(|x| {
if let Some(peer) = &x.leader_peer {
if peer == datanode {
return Some(x.region.id as u32);
return Some(x.region.id.region_number());
}
}
None
@@ -340,7 +340,7 @@ pub struct Region {
impl From<PbRegion> for Region {
fn from(r: PbRegion) -> Self {
Self {
id: r.id,
id: r.id.into(),
name: r.name,
partition: r.partition.map(Into::into),
attrs: r.attrs,
@@ -351,7 +351,7 @@ impl From<PbRegion> for Region {
impl From<Region> for PbRegion {
fn from(region: Region) -> Self {
Self {
id: region.id,
id: region.id.into(),
name: region.name,
partition: region.partition.map(Into::into),
attrs: region.attrs,
@@ -668,7 +668,7 @@ mod tests {
region_routes: vec![
RegionRoute {
region: Region {
id: 1,
id: 1.into(),
name: "r1".to_string(),
partition: None,
attrs: HashMap::new(),
@@ -678,7 +678,7 @@ mod tests {
},
RegionRoute {
region: Region {
id: 2,
id: 2.into(),
name: "r2".to_string(),
partition: None,
attrs: HashMap::new(),