@@ -94,36 +94,37 @@ pub(crate) async fn get(ctx: Context, req: pm::GetNodesRequest) -> Result<pm::Ge
9494 )
9595 . optional ( ) ?;
9696
97- let ( meta_root_node, meta_root_buddy_group) = if let Some ( ( uid, alias, num_id, bg_num_id, bg_uid, bg_alias) ) = maybe_row {
98- let meta_root_node = Some ( EntityIdSet {
99- uid,
100- alias : alias. try_into ( ) ?,
101- legacy_id : LegacyId {
102- node_type : NodeType :: Meta ,
103- num_id,
104- } ,
105- } ) ;
106-
107- let meta_root_buddy_group = if let ( Some ( num_id) , Some ( uid) , Some ( alias) ) =
108- ( bg_num_id, bg_uid, bg_alias)
109- {
110- Some ( EntityIdSet {
97+ let ( meta_root_node, meta_root_buddy_group) =
98+ if let Some ( ( uid, alias, num_id, bg_num_id, bg_uid, bg_alias) ) = maybe_row {
99+ let meta_root_node = Some ( EntityIdSet {
111100 uid,
112101 alias : alias. try_into ( ) ?,
113102 legacy_id : LegacyId {
114103 node_type : NodeType :: Meta ,
115104 num_id,
116105 } ,
117- } )
106+ } ) ;
107+
108+ let meta_root_buddy_group = if let ( Some ( num_id) , Some ( uid) , Some ( alias) ) =
109+ ( bg_num_id, bg_uid, bg_alias)
110+ {
111+ Some ( EntityIdSet {
112+ uid,
113+ alias : alias. try_into ( ) ?,
114+ legacy_id : LegacyId {
115+ node_type : NodeType :: Meta ,
116+ num_id,
117+ } ,
118+ } )
119+ } else {
120+ None
121+ } ;
122+
123+ ( meta_root_node, meta_root_buddy_group)
118124 } else {
119- None
125+ ( None , None )
120126 } ;
121127
122- ( meta_root_node, meta_root_buddy_group)
123- } else {
124- ( None , None )
125- } ;
126-
127128 let fs_uuid = db:: config:: get ( tx, db:: config:: Config :: FsUuid )
128129 . context ( "Could not read file system UUID from database" ) ?;
129130
0 commit comments