implement repair procedure to fix inconsistent bucket aliases

src/model/helper/locked.rs

@@ -492,11 +492,9 @@ impl<'a> LockedHelper<'a> {
 			// 2. List all aliases declared in bucket_alias_table and key_table
 			//    Take note of aliases that point to non-existing buckets
 			let mut global_aliases: HashMap<String, Uuid> = HashMap::new();
-			let mut local_aliases: HashMap<(String, String), Uuid> = HashMap::new();
 
+			{
 				let mut delete_global = vec![];
-			let mut delete_local = vec![];
-
 				for item in tx.range::<&[u8], _>(&self.0.bucket_alias_table.data.store, ..)? {
 					let mut alias = self
 						.0
@@ -505,7 +503,7 @@ impl<'a> LockedHelper<'a> {
 						.decode_entry(&(item?.1))
 						.map_err(db::TxError::Abort)?;
 					if let Some(id) = alias.state.get() {
-					if all_buckets.contains(&id) {
+						if all_buckets.contains(id) {
 							// keep aliases
 							global_aliases.insert(alias.name().to_string(), *id);
 						} else {
@@ -521,6 +519,20 @@ impl<'a> LockedHelper<'a> {
 					}
 				}
 
+				info!("number of global aliases: {}", global_aliases.len());
+
+				info!("global alias table: {} entries fixed", delete_global.len());
+				for ga in delete_global {
+					debug!("Enqueue update to global alias table: {:?}", ga);
+					self.0.bucket_alias_table.queue_insert(tx, &ga)?;
+				}
+			}
+
+			let mut local_aliases: HashMap<(String, String), Uuid> = HashMap::new();
+
+			{
+				let mut delete_local = vec![];
+
 				for item in tx.range::<&[u8], _>(&self.0.key_table.data.store, ..)? {
 					let mut key = self
 						.0
@@ -551,21 +563,14 @@ impl<'a> LockedHelper<'a> {
 					}
 				}
 
-			info!("number of global aliases: {}", global_aliases.len());
 				info!("number of local aliases: {}", local_aliases.len());
 
-			// 3. Enqueue non-existing aliases for deletion
-			info!("global alias table: {} entries fixed", delete_global.len());
-			for ga in delete_global {
-				debug!("Enqueue update to global alias table: {:?}", ga);
-				self.0.bucket_alias_table.queue_insert(tx, &ga)?;
-			}
-
 				info!("local alias table: {} entries fixed", delete_local.len());
 				for la in delete_local {
 					debug!("Enqueue update to local alias table: {:?}", la);
 					self.0.key_table.queue_insert(tx, &la)?;
 				}
+			}
 
 			// 4. Reverse the alias maps to determine the aliases per-bucket
 			let mut bucket_global: HashMap<Uuid, Vec<String>> = HashMap::new();
@@ -594,6 +599,7 @@ impl<'a> LockedHelper<'a> {
 				};
 
 				// fix global aliases
+				{
 					let ga = bucket_global.remove(&bucket.id).unwrap_or_default();
 					for (name, _, active) in param.aliases.items().to_vec() {
 						if active && !ga.contains(&name) {
@@ -607,8 +613,10 @@ impl<'a> LockedHelper<'a> {
 							param.aliases.update_in_place(name.to_string(), true);
 						}
 					}
+				}
 
 				// fix local aliases
+				{
 					let la = bucket_local.remove(&bucket.id).unwrap_or_default();
 					for (pair, _, active) in param.local_aliases.items().to_vec() {
 						if active && !la.contains(&pair) {
@@ -622,6 +630,7 @@ impl<'a> LockedHelper<'a> {
 							param.local_aliases.update_in_place(pair.clone(), true);
 						}
 					}
+				}
 
 				if bucket2 != bucket {
 					bucket_updates.push(bucket2);