datastore: drop Ord from BackupGroup
This one is supposed to be linked to a datastore instance, so it won't be Ord for now. Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
parent
db87d93efc
commit
5116453b6d
|
@ -8,20 +8,14 @@ use pbs_api_types::{BackupType, GroupFilter, BACKUP_DATE_REGEX, BACKUP_FILE_REGE
|
||||||
use super::manifest::MANIFEST_BLOB_NAME;
|
use super::manifest::MANIFEST_BLOB_NAME;
|
||||||
|
|
||||||
/// BackupGroup is a directory containing a list of BackupDir
|
/// BackupGroup is a directory containing a list of BackupDir
|
||||||
#[derive(Debug, Eq, PartialEq, Hash, Clone)]
|
#[derive(Debug, PartialEq, Hash, Clone)]
|
||||||
pub struct BackupGroup {
|
pub struct BackupGroup {
|
||||||
group: pbs_api_types::BackupGroup,
|
group: pbs_api_types::BackupGroup,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl std::cmp::Ord for BackupGroup {
|
|
||||||
fn cmp(&self, other: &Self) -> std::cmp::Ordering {
|
|
||||||
self.group.cmp(&other.group)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl std::cmp::PartialOrd for BackupGroup {
|
impl std::cmp::PartialOrd for BackupGroup {
|
||||||
fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
|
fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
|
||||||
Some(self.cmp(other))
|
Some(self.group.cmp(&other.group))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -32,6 +26,12 @@ impl BackupGroup {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Access the underlying [`BackupGroup`](pbs_api_types::BackupGroup).
|
||||||
|
#[inline]
|
||||||
|
pub fn group(&self) -> &pbs_api_types::BackupGroup {
|
||||||
|
&self.group
|
||||||
|
}
|
||||||
|
|
||||||
pub fn backup_type(&self) -> BackupType {
|
pub fn backup_type(&self) -> BackupType {
|
||||||
self.group.ty
|
self.group.ty
|
||||||
}
|
}
|
||||||
|
|
|
@ -410,7 +410,7 @@ fn backup_worker(
|
||||||
|
|
||||||
let mut group_list = datastore.list_backup_groups()?;
|
let mut group_list = datastore.list_backup_groups()?;
|
||||||
|
|
||||||
group_list.sort_unstable();
|
group_list.sort_unstable_by(|a, b| a.group().cmp(b.group()));
|
||||||
|
|
||||||
let (group_list, group_count) = if let Some(group_filters) = &setup.group_filter {
|
let (group_list, group_count) = if let Some(group_filters) = &setup.group_filter {
|
||||||
let filter_fn = |group: &BackupGroup, group_filters: &[GroupFilter]| {
|
let filter_fn = |group: &BackupGroup, group_filters: &[GroupFilter]| {
|
||||||
|
|
|
@ -550,7 +550,7 @@ pub fn verify_all_backups(
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
list.sort_unstable();
|
list.sort_unstable_by(|a, b| a.group().cmp(b.group()));
|
||||||
|
|
||||||
let group_count = list.len();
|
let group_count = list.len();
|
||||||
task_log!(worker, "found {} groups", group_count);
|
task_log!(worker, "found {} groups", group_count);
|
||||||
|
|
Loading…
Reference in New Issue