openharmony/security_asset
1
0
Fork 0
mirror of https://gitee.com/openharmony/security_asset synced 2024-11-27 01:50:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

comment change 9

Browse Source 
Signed-off-by: Cai Xincheng <caixincheng@huawei.com>
Change-Id: I5f908f40b5951676406a4eddeb78e394d31cc9f0
This commit is contained in:
Cai Xincheng 2024-10-16 16:53:42 +08:00
parent 2761228ce7
commit 69cc1e1663
1 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
services/db_operator/src/database.rs
View File

@ -321,26 +321,36 @@ impl Database {
/// Upgrade database to new version.
#[allow(dead_code)]
pub fn upgrade(&mut self, user_id: i32, ver: u32, callback: UpgradeDbCallback) -> Result<()> {
let mut version_old = self.get_db_version()?;
logi!("current database version: {}", version_old);
if version_old >= ver {
pub fn upgrade(&mut self, user_id: i32, target_ver: u32, callback: UpgradeDbCallback) -> Result<()> {
let mut current_ver = self.get_db_version()?;
logi!("current database version: {}", current_ver);
if current_ver >= target_ver {
return Ok(());
}
if version_old == DB_UPGRADE_VERSION_V1 {
self.restore_if_exec_fail(|e: &Table| e.upgrade(DB_UPGRADE_VERSION_V2, UPGRADE_COLUMN_INFO_V2))?;
version_old += 1;
}
if version_old == DB_UPGRADE_VERSION_V2 {
self.restore_if_exec_fail(|e: &Table| e.upgrade(DB_UPGRADE_VERSION_V3, UPGRADE_COLUMN_INFO_V3))?;
version_old += 1;
}
if version_old == DB_UPGRADE_VERSION_V3 && self.upgrade_key_alias(user_id)? {
self.restore_if_exec_fail(|e: &Table| e.upgrade(DB_UPGRADE_VERSION, UPGRADE_COLUMN_INFO))?;
version_old += 1;
while current_ver < target_ver {
match current_ver {
DB_UPGRADE_VERSION_V1 => {
self.restore_if_exec_fail(|e: &Table| e.upgrade(DB_UPGRADE_VERSION_V2, UPGRADE_COLUMN_INFO_V2))?;
current_ver += 1;
},
DB_UPGRADE_VERSION_V2 => {
self.restore_if_exec_fail(|e: &Table| e.upgrade(DB_UPGRADE_VERSION_V3, UPGRADE_COLUMN_INFO_V3))?;
current_ver += 1;
},
DB_UPGRADE_VERSION_V3 => {
if self.upgrade_key_alias(user_id)? {
self.restore_if_exec_fail(|e: &Table| e.upgrade(DB_UPGRADE_VERSION, UPGRADE_COLUMN_INFO))?;
current_ver += 1;
} else {
break;
}
},
_ => (),
}
}
callback(self, version_old, ver)
callback(self, current_ver, target_ver)
}
fn upgrade_key_alias(&mut self, user_id: i32) -> Result<bool> {