rust/greptimedb
1
0
Fork 0
mirror of https://github.com/GreptimeTeam/greptimedb.git synced 2026-06-01 12:50:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: remove unnecessary result wrappings (#3084)

Browse Source 
patch: remove unnecessary result wrappings

Signed-off-by: 蔡略 <cailue@bupt.edu.cn>
This commit is contained in:
ClSlaid
2024-01-03 18:20:33 +08:00
committed by GitHub
parent b2b752337b
commit 5c66ce6e88
6 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/meta/src/key.rs
View File

@@ -427,7 +427,7 @@ impl TableMetadataManager {
&region_storage_path,
region_options,
region_wal_options,
region_distribution(&x.region_routes)?,
region_distribution(&x.region_routes),
)?;
txn = txn.merge(create_datanode_table_txn);
}
@@ -483,7 +483,7 @@ impl TableMetadataManager {
.build_delete_txn(table_id, table_info_value)?;
// Deletes datanode table key value pairs.
let distribution = region_distribution(table_route_value.region_routes()?)?;
let distribution = region_distribution(table_route_value.region_routes()?);
let delete_datanode_txn = self
.datanode_table_manager()
.build_delete_txn(table_id, distribution)?;
@@ -608,8 +608,8 @@ impl TableMetadataManager {
) -> Result<()> {
// Updates the datanode table key value pairs.
let current_region_distribution =
region_distribution(current_table_route_value.region_routes()?)?;
let new_region_distribution = region_distribution(&new_region_routes)?;
region_distribution(current_table_route_value.region_routes()?);
let new_region_distribution = region_distribution(&new_region_routes);
let update_datanode_table_txn = self.datanode_table_manager().build_update_txn(
table_id,
@@ -1191,7 +1191,7 @@ mod tests {
table_id: u32,
region_routes: &[RegionRoute],
) {
let region_distribution = region_distribution(region_routes).unwrap();
let region_distribution = region_distribution(region_routes);
for (datanode, regions) in region_distribution {
let got = table_metadata_manager
.datanode_table_manager()

2
src/common/meta/src/key/table_route.rs
View File

@@ -376,7 +376,7 @@ impl TableRouteManager {
) -> Result<Option<RegionDistribution>> {
self.get(table_id)
.await?
.map(|table_route| region_distribution(table_route.region_routes()?))
.map(|table_route| Ok(region_distribution(table_route.region_routes()?)))
.transpose()
}
}

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

@@ -30,7 +30,7 @@ use crate::peer::Peer;
use crate::table_name::TableName;
use crate::DatanodeId;
pub fn region_distribution(region_routes: &[RegionRoute]) -> Result<RegionDistribution> {
pub fn region_distribution(region_routes: &[RegionRoute]) -> RegionDistribution {
let mut regions_id_map = RegionDistribution::new();
for route in region_routes.iter() {
if let Some(peer) = route.leader_peer.as_ref() {
@@ -42,7 +42,7 @@ pub fn region_distribution(region_routes: &[RegionRoute]) -> Result<RegionDistri
// id asc
regions.sort()
}
Ok(regions_id_map)
regions_id_map
}
#[derive(Debug, Clone, Deserialize, Serialize, PartialEq)]

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

@@ -423,7 +423,7 @@ mod tests {
.unwrap()
.into_inner();
let map = region_distribution(table_route_value.region_routes().unwrap()).unwrap();
let map = region_distribution(table_route_value.region_routes().unwrap());
assert_eq!(map.len(), 2);
assert_eq!(map.get(&2), Some(&vec![1, 3]));
assert_eq!(map.get(&3), Some(&vec![2, 4]));

1
tests-integration/src/grpc.rs
View File

@@ -526,7 +526,6 @@ CREATE TABLE {table_name} (
.region_routes()
.expect("physical table route"),
)
.unwrap()
.iter()
.map(|(k, v)| (v[0], *k))
.collect::<HashMap<u32, u64>>();

1
tests-integration/src/instance.rs
View File

@@ -221,7 +221,6 @@ mod tests {
.region_routes()
.expect("region routes should be physical"),
)
.unwrap()
.iter()
.map(|(k, v)| (v[0], *k))
.collect::<HashMap<u32, u64>>();