diff --git a/native/cpp/CommonCpp/DatabaseManagers/DatabaseManager.h b/native/cpp/CommonCpp/DatabaseManagers/DatabaseManager.h --- a/native/cpp/CommonCpp/DatabaseManagers/DatabaseManager.h +++ b/native/cpp/CommonCpp/DatabaseManagers/DatabaseManager.h @@ -65,7 +65,7 @@ const std::string &backupLogDataKey); // Backup methods - static void captureBackupLogs(); + static void captureBackupLogForLastOperation(); static void triggerBackupFileUpload(); static void createMainCompaction( std::string backupID, diff --git a/native/cpp/CommonCpp/DatabaseManagers/DatabaseManager.cpp b/native/cpp/CommonCpp/DatabaseManagers/DatabaseManager.cpp --- a/native/cpp/CommonCpp/DatabaseManagers/DatabaseManager.cpp +++ b/native/cpp/CommonCpp/DatabaseManagers/DatabaseManager.cpp @@ -254,7 +254,7 @@ connectionManager->setNewKeys(backupDataKey, backupLogDataKey); } -void DatabaseManager::captureBackupLogs() { +void DatabaseManager::captureBackupLogForLastOperation() { if (!ServicesUtils::fullBackupSupport) { return; } @@ -273,7 +273,7 @@ } bool newLogCreated = - DatabaseManager::mainConnectionManager->captureLogs(backupID, logID); + DatabaseManager::mainConnectionManager->captureNextLog(backupID, logID); if (!newLogCreated) { return; } diff --git a/native/cpp/CommonCpp/DatabaseManagers/NativeSQLiteConnectionManager.h b/native/cpp/CommonCpp/DatabaseManagers/NativeSQLiteConnectionManager.h --- a/native/cpp/CommonCpp/DatabaseManagers/NativeSQLiteConnectionManager.h +++ b/native/cpp/CommonCpp/DatabaseManagers/NativeSQLiteConnectionManager.h @@ -40,7 +40,7 @@ const std::string &backupLogDataKey); void setLogsMonitoring(bool enabled); bool getLogsMonitoring(); - bool captureLogs(std::string backupID, std::string logID); + bool captureNextLog(std::string backupID, std::string logID); void restoreFromBackupLog(const std::vector &backupLog) override; }; diff --git a/native/cpp/CommonCpp/DatabaseManagers/NativeSQLiteConnectionManager.cpp b/native/cpp/CommonCpp/DatabaseManagers/NativeSQLiteConnectionManager.cpp --- a/native/cpp/CommonCpp/DatabaseManagers/NativeSQLiteConnectionManager.cpp +++ b/native/cpp/CommonCpp/DatabaseManagers/NativeSQLiteConnectionManager.cpp @@ -233,7 +233,7 @@ detachSession(); } -bool NativeSQLiteConnectionManager::captureLogs( +bool NativeSQLiteConnectionManager::captureNextLog( std::string backupID, std::string logID) { int patchsetSize; diff --git a/native/cpp/CommonCpp/NativeModules/CommCoreModule.cpp b/native/cpp/CommonCpp/NativeModules/CommCoreModule.cpp --- a/native/cpp/CommonCpp/NativeModules/CommCoreModule.cpp +++ b/native/cpp/CommonCpp/NativeModules/CommCoreModule.cpp @@ -478,7 +478,7 @@ DatabaseManager::getQueryExecutor().addOutboundP2PMessages( messages); } - DatabaseManager::captureBackupLogs(); + DatabaseManager::captureBackupLogForLastOperation(); DatabaseManager::getQueryExecutor().commitTransaction(); } catch (std::system_error &e) { error = e.what(); diff --git a/native/cpp/CommonCpp/NativeModules/PersistentStorageUtilities/DataStores/BaseDataStore.h b/native/cpp/CommonCpp/NativeModules/PersistentStorageUtilities/DataStores/BaseDataStore.h --- a/native/cpp/CommonCpp/NativeModules/PersistentStorageUtilities/DataStores/BaseDataStore.h +++ b/native/cpp/CommonCpp/NativeModules/PersistentStorageUtilities/DataStores/BaseDataStore.h @@ -51,7 +51,7 @@ for (const auto &operation : storeOps) { operation->execute(DatabaseIdentifier::MAIN); } - DatabaseManager::captureBackupLogs(); + DatabaseManager::captureBackupLogForLastOperation(); DatabaseManager::getQueryExecutor().commitTransaction(); } catch (const std::exception &e) { error = e.what();