summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--plugins/Dbx_mdbx/src/dbcheck.cpp3
-rw-r--r--plugins/Dbx_mdbx/src/dbcontacts.cpp22
-rw-r--r--plugins/Dbx_mdbx/src/dbcrypt.cpp9
-rw-r--r--plugins/Dbx_mdbx/src/dbevents.cpp9
-rw-r--r--plugins/Dbx_mdbx/src/dbintf.cpp3
-rw-r--r--plugins/Dbx_mdbx/src/dbmodulechain.cpp2
-rw-r--r--plugins/Dbx_mdbx/src/dbsettings.cpp13
-rw-r--r--plugins/Dbx_mdbx/src/dbutils.cpp5
-rw-r--r--plugins/Dbx_mdbx/src/stdafx.h2
9 files changed, 4 insertions, 64 deletions
diff --git a/plugins/Dbx_mdbx/src/dbcheck.cpp b/plugins/Dbx_mdbx/src/dbcheck.cpp
index 6b031f5a8f..55b448a909 100644
--- a/plugins/Dbx_mdbx/src/dbcheck.cpp
+++ b/plugins/Dbx_mdbx/src/dbcheck.cpp
@@ -52,7 +52,6 @@ int CDbxMDBX::CheckEvents1(void)
}
}
- trnlck.Commit();
return 0;
}
@@ -74,7 +73,6 @@ int CDbxMDBX::CheckEvents2(void)
}
}
- trnlck.Commit();
return 0;
}
@@ -100,6 +98,5 @@ int CDbxMDBX::CheckEvents3(void)
}
}
- trnlck.Commit();
return 0;
}
diff --git a/plugins/Dbx_mdbx/src/dbcontacts.cpp b/plugins/Dbx_mdbx/src/dbcontacts.cpp
index 1ae91069b2..47a23254c4 100644
--- a/plugins/Dbx_mdbx/src/dbcontacts.cpp
+++ b/plugins/Dbx_mdbx/src/dbcontacts.cpp
@@ -68,9 +68,6 @@ LONG CDbxMDBX::DeleteContact(MCONTACT contactID)
mdbx_del(trnlck, m_dbEvents, &key2, nullptr);
}
}
-
- if (trnlck.Commit() != MDBX_SUCCESS)
- return 1;
}
// remove all contact's settings
@@ -90,9 +87,6 @@ LONG CDbxMDBX::DeleteContact(MCONTACT contactID)
if (mdbx_cursor_del(cursor, MDBX_UPSERT) != MDBX_SUCCESS)
return 1;
}
-
- if (trnlck.Commit() != MDBX_SUCCESS)
- return 1;
}
// finally remove the contact itself
@@ -102,8 +96,6 @@ LONG CDbxMDBX::DeleteContact(MCONTACT contactID)
txn_ptr trnlck(this);
if (mdbx_del(trnlck, m_dbContacts, &key, nullptr) != MDBX_SUCCESS)
return 1;
- if (trnlck.Commit() != MDBX_SUCCESS)
- return 1;
}
// free cache item
@@ -124,8 +116,6 @@ MCONTACT CDbxMDBX::AddContact()
txn_ptr trnlck(this);
if (mdbx_put(trnlck, m_dbContacts, &key, &data, MDBX_UPSERT) != MDBX_SUCCESS)
return 0;
- if (trnlck.Commit() != MDBX_SUCCESS)
- return 0;
}
DBFlush();
@@ -171,9 +161,6 @@ BOOL CDbxMDBX::MetaMergeHistory(DBCachedContact *ccMeta, DBCachedContact *ccSub)
if (mdbx_put(trnlck, m_dbEventsSort, &key, &data, MDBX_UPSERT) != MDBX_SUCCESS)
return 1;
- if (trnlck.Commit() != MDBX_SUCCESS)
- return 1;
-
ccMeta->dbc.dwEventCount++;
}
{
@@ -182,8 +169,6 @@ BOOL CDbxMDBX::MetaMergeHistory(DBCachedContact *ccMeta, DBCachedContact *ccSub)
txn_ptr trnlck(this);
if (mdbx_put(trnlck, m_dbContacts, &keyc, &datac, MDBX_UPSERT) != MDBX_SUCCESS)
return 1;
- if (trnlck.Commit() != MDBX_SUCCESS)
- return 1;
}
DBFlush();
@@ -203,8 +188,6 @@ BOOL CDbxMDBX::MetaSplitHistory(DBCachedContact *ccMeta, DBCachedContact *ccSub)
MDBX_val key = { &insVal, sizeof(insVal) };
if (mdbx_del(trnlck, m_dbEventsSort, &key, nullptr) != MDBX_SUCCESS)
return 1;
- if (trnlck.Commit() != MDBX_SUCCESS)
- return 1;
ccMeta->dbc.dwEventCount--;
}
@@ -213,8 +196,6 @@ BOOL CDbxMDBX::MetaSplitHistory(DBCachedContact *ccMeta, DBCachedContact *ccSub)
MDBX_val keyc = { &ccMeta->contactID, sizeof(MCONTACT) }, datac = { &ccMeta->dbc, sizeof(ccMeta->dbc) };
if (mdbx_put(trnlck, m_dbContacts, &keyc, &datac, MDBX_UPSERT) != MDBX_SUCCESS)
return 1;
- if (trnlck.Commit() != MDBX_SUCCESS)
- return 1;
}
DBFlush();
@@ -246,9 +227,6 @@ BOOL CDbxMDBX::MetaRemoveSubHistory(DBCachedContact *ccSub)
if (mdbx_del(trnlck, m_dbEventsSort, &key, nullptr) != MDBX_SUCCESS)
return 1;
}
-
- if (trnlck.Commit() != MDBX_SUCCESS)
- return 1;
}
DBFlush();
diff --git a/plugins/Dbx_mdbx/src/dbcrypt.cpp b/plugins/Dbx_mdbx/src/dbcrypt.cpp
index e88e253b7d..2f8f10ce7e 100644
--- a/plugins/Dbx_mdbx/src/dbcrypt.cpp
+++ b/plugins/Dbx_mdbx/src/dbcrypt.cpp
@@ -109,9 +109,6 @@ CRYPTO_PROVIDER* CDbxMDBX::SelectProvider()
key.iov_len = sizeof(DBKey_Crypto_IsEncrypted); key.iov_base = DBKey_Crypto_IsEncrypted; value.iov_len = sizeof(bool); value.iov_base = &bTotalCrypt;
if (mdbx_put(trnlck, m_dbCrypto, &key, &value, MDBX_UPSERT) != MDBX_SUCCESS)
return nullptr;
-
- if (trnlck.Commit() != MDBX_SUCCESS)
- return nullptr;
}
DBFlush();
@@ -264,8 +261,6 @@ void CDbxMDBX::StoreKey()
txn_ptr trnlck(this);
MDBX_val key = { DBKey_Crypto_Key, sizeof(DBKey_Crypto_Key) }, value = { pKey, iKeyLength };
int rc = mdbx_put(trnlck, m_dbCrypto, &key, &value, MDBX_UPSERT);
- if (rc == MDBX_SUCCESS)
- rc = trnlck.Commit();
/* FIXME: throw an exception */
assert(rc == MDBX_SUCCESS);
UNREFERENCED_PARAMETER(rc);
@@ -358,8 +353,6 @@ int CDbxMDBX::EnableEncryption(bool bEncrypted)
}
lstEvents.erase(lstEvents.begin(), lstEvents.begin()+portion);
- if (trnlck.Commit() != MDBX_SUCCESS)
- return 1;
}
while (lstEvents.size() > 0);
@@ -368,8 +361,6 @@ int CDbxMDBX::EnableEncryption(bool bEncrypted)
MDBX_val key = { DBKey_Crypto_IsEncrypted, sizeof(DBKey_Crypto_IsEncrypted) }, value = { &bEncrypted, sizeof(bool) };
if (mdbx_put(trnlck, m_dbCrypto, &key, &value, MDBX_UPSERT) != MDBX_SUCCESS)
return 1;
- if (trnlck.Commit() != MDBX_SUCCESS)
- return 1;
}
DBFlush();
diff --git a/plugins/Dbx_mdbx/src/dbevents.cpp b/plugins/Dbx_mdbx/src/dbevents.cpp
index 8bc97e9ece..bc16f4f460 100644
--- a/plugins/Dbx_mdbx/src/dbevents.cpp
+++ b/plugins/Dbx_mdbx/src/dbevents.cpp
@@ -128,9 +128,6 @@ BOOL CDbxMDBX::DeleteEvent(MEVENT hDbEvent)
key.iov_len = sizeof(MEVENT); key.iov_base = &hDbEvent;
if (mdbx_del(trnlck, m_dbEvents, &key, nullptr) != MDBX_SUCCESS)
return 1;
-
- if (trnlck.Commit() != MDBX_SUCCESS)
- return 1;
}
DBFlush();
@@ -268,9 +265,6 @@ bool CDbxMDBX::EditEvent(MCONTACT contactID, MEVENT hDbEvent, const DBEVENTINFO
if (mdbx_put(trnlck, m_dbEventIds, &keyid, &dataid, MDBX_UPSERT) != MDBX_SUCCESS)
return false;
}
-
- if (trnlck.Commit() != MDBX_SUCCESS)
- return false;
}
DBFlush();
@@ -438,9 +432,6 @@ BOOL CDbxMDBX::MarkEventRead(MCONTACT contactID, MEVENT hDbEvent)
if (mdbx_put(trnlck, m_dbContacts, &key, &data, MDBX_UPSERT) != MDBX_SUCCESS)
return -1;
}
-
- if (trnlck.Commit() != MDBX_SUCCESS)
- return -1;
}
DBFlush();
diff --git a/plugins/Dbx_mdbx/src/dbintf.cpp b/plugins/Dbx_mdbx/src/dbintf.cpp
index 3af7d73757..6dbd2454a4 100644
--- a/plugins/Dbx_mdbx/src/dbintf.cpp
+++ b/plugins/Dbx_mdbx/src/dbintf.cpp
@@ -88,9 +88,6 @@ LBL_Fail:
}
CloseHandle(pFile);
-
- txn_ptr trnlck(this);
- trnlck.Commit();
return 0;
}
diff --git a/plugins/Dbx_mdbx/src/dbmodulechain.cpp b/plugins/Dbx_mdbx/src/dbmodulechain.cpp
index 10bb0f90e6..237a13ade3 100644
--- a/plugins/Dbx_mdbx/src/dbmodulechain.cpp
+++ b/plugins/Dbx_mdbx/src/dbmodulechain.cpp
@@ -49,8 +49,6 @@ uint32_t CDbxMDBX::GetModuleID(const char *szName)
txn_ptr trnlck(this);
if (mdbx_put(trnlck, m_dbModules, &key, &data, MDBX_UPSERT) != MDBX_SUCCESS)
return -1;
- if (trnlck.Commit() != MDBX_SUCCESS)
- return -1;
}
m_Modules[iHash] = szName;
diff --git a/plugins/Dbx_mdbx/src/dbsettings.cpp b/plugins/Dbx_mdbx/src/dbsettings.cpp
index ba8804afdc..523d7a4801 100644
--- a/plugins/Dbx_mdbx/src/dbsettings.cpp
+++ b/plugins/Dbx_mdbx/src/dbsettings.cpp
@@ -353,9 +353,6 @@ BOOL CDbxMDBX::WriteContactSetting(MCONTACT contactID, DBCONTACTWRITESETTING *db
txn_ptr trnlck(this);
if (mdbx_put(trnlck, m_dbSettings, &key, &data, MDBX_UPSERT) != MDBX_SUCCESS)
return 1;
-
- if (trnlck.Commit() != MDBX_SUCCESS)
- return 1;
}
// notify
@@ -377,8 +374,8 @@ BOOL CDbxMDBX::DeleteContactSetting(MCONTACT contactID, LPCSTR szModule, LPCSTR
mir_cslock lck(m_csDbAccess);
char *szCachedSettingName = m_cache->GetCachedSetting(szModule, szSetting, moduleNameLen, settingNameLen);
- if (szCachedSettingName[-1] == 0) // it's not a resident variable
- {
+ // it's not a resident variable, delete it from database too
+ if (szCachedSettingName[-1] == 0) {
DBSettingKey *keyVal = (DBSettingKey*)_alloca(sizeof(DBSettingKey) + settingNameLen);
keyVal->hContact = contactID;
keyVal->dwModuleId = GetModuleID(szModule);
@@ -388,15 +385,13 @@ BOOL CDbxMDBX::DeleteContactSetting(MCONTACT contactID, LPCSTR szModule, LPCSTR
MDBX_val key = { keyVal, sizeof(DBSettingKey) + settingNameLen };
if (mdbx_del(trnlck, m_dbSettings, &key, nullptr) != MDBX_SUCCESS)
return 1;
- if (trnlck.Commit() != MDBX_SUCCESS)
- return 1;
+ DBFlush();
}
+ // and don't forget to remove it from cache
m_cache->GetCachedValuePtr(contactID, szCachedSettingName, -1);
}
- DBFlush();
-
// notify
DBCONTACTWRITESETTING dbcws = { 0 };
dbcws.szModule = szModule;
diff --git a/plugins/Dbx_mdbx/src/dbutils.cpp b/plugins/Dbx_mdbx/src/dbutils.cpp
index 472628bf0a..daf9fe2f3a 100644
--- a/plugins/Dbx_mdbx/src/dbutils.cpp
+++ b/plugins/Dbx_mdbx/src/dbutils.cpp
@@ -68,8 +68,3 @@ txn_ptr::~txn_ptr()
{
pDb->m_csDbAccess.Unlock();
}
-
-int txn_ptr::Commit()
-{
- return MDBX_SUCCESS;
-}
diff --git a/plugins/Dbx_mdbx/src/stdafx.h b/plugins/Dbx_mdbx/src/stdafx.h
index 6904e319d6..dfd811681c 100644
--- a/plugins/Dbx_mdbx/src/stdafx.h
+++ b/plugins/Dbx_mdbx/src/stdafx.h
@@ -90,8 +90,6 @@ public:
~txn_ptr();
__forceinline operator MDBX_txn*() const { return txn; }
-
- int Commit();
};
#include "resource.h"
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-28 20:56:11 +0000