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

fix: use RegionId region number instead (#2273)

Browse Source
This commit is contained in:
Weny Xu
2023-08-29 10:52:24 +08:00
committed by GitHub
parent ef75e8f7c3
commit 22dea02485
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontend/src/instance/distributed.rs
View File

@@ -745,7 +745,7 @@ fn create_partitions_stmt(partitions: Vec<PartitionInfo>) -> Result<Option<Parti
.into_iter()
.map(|info| {
// Generated the partition name from id
let name = &format!("r{}", info.id.as_u64());
let name = &format!("r{}", info.id.region_number());
let bounds = info.partition.partition_bounds();
let value_list = bounds
.iter()

2
src/meta-srv/src/procedure/region_failover/update_metadata.rs
View File

@@ -72,7 +72,7 @@ impl UpdateRegionMetadata {
let mut new_region_routes = table_route_value.region_routes.clone();
for region_route in new_region_routes.iter_mut() {
if region_route.region.id == failed_region.region_number as u64 {
if region_route.region.id.region_number() == failed_region.region_number {
region_route.leader_peer = Some(self.candidate.clone());
break;
}

6
src/meta-srv/src/service/ddl.rs
View File

@@ -178,8 +178,8 @@ async fn handle_create_region_routes(
// If the peers are not enough, some peers will be used for multiple partitions.
peers.truncate(partitions.len());
let id = table_id_sequence.next().await?;
table_info.ident.table_id = id as u32;
let table_id = table_id_sequence.next().await? as u32;
table_info.ident.table_id = table_id;
ensure!(
partitions.len() <= MAX_REGION_SEQ as usize,
@@ -191,7 +191,7 @@ async fn handle_create_region_routes(
.enumerate()
.map(|(i, partition)| {
let region = Region {
id: RegionId::from_u64(i as u64),
id: RegionId::new(table_id, i as u32),
partition: Some(partition.into()),
..Default::default()
};