services/backup/docker-server/contents/server/src/DatabaseManager.cpp
106–109 ↗	(On Diff #10881)	If `assignItemFromDatabaseUserIDCreatedIndex` is really needed, then it makes sense. But we should clarify in D3584 if that's the case
132–136 ↗	(On Diff #10881)	This change seem to be unrelated - it makes sense but shouldn't be a part of the diff where we `use index in DatabaseManager`

This revision is now accepted and ready to land.Apr 6 2022, 11:56 PM

• karol edited the summary of this revision. (Show Details)Apr 7 2022, 5:37 AM

• karol added a parent revision: D3583: [services] Backup - fix handling reading done in client reactors.

remove index

• karol requested review of this revision.Apr 7 2022, 5:40 AM

• karol retitled this revision from [services] Backup - use index in DatabaseManager to [services] Backup - mind empty attachment holders.

Harbormaster completed remote builds in B7964: Diff 11168.Apr 7 2022, 8:20 AM

tomek accepted this revision.Apr 8 2022, 1:04 AM

This revision is now accepted and ready to land.Apr 8 2022, 1:04 AM

update

Harbormaster completed remote builds in B8145: Diff 11382.Apr 13 2022, 1:12 AM

Closed by commit rCOMMc59027f71a32: [services] Backup - mind empty attachment holders (authored by • karol). · Explain WhyApr 13 2022, 4:04 AM

This revision was automatically updated to reflect the committed changes.

• karol added a commit: rCOMMc59027f71a32: [services] Backup - mind empty attachment holders.

Revision Contents
Changeset List

Path

Size

services/

backup/

docker-server/

contents/

server/

src/

DatabaseManager.cpp

8 lines

Diff 11168

View Options

services/backup/docker-server/contents/server/src/DatabaseManager.cpp

Show First 20 Lines • Show All 1,529 Lines • ▼ Show 20 Lines	throw std::system_error(
std::generic_category(),		std::generic_category(),
"Multiple records found for the olm_persist_account table");		"Multiple records found for the olm_persist_account table");
}		}
return (result.size() == 0)		return (result.size() == 0)
? std::nullopt		? std::nullopt
: std::optional<std::string>(result[0].account_data);		: std::optional<std::string>(result[0].account_data);
}		}

void SQLiteQueryExecutor::storeOlmPersistData(crypto::Persist persist) const {		void SQLiteQueryExecutor::storeOlmPersistAccount(
		const std::string &accountData) const {
static std::string replaceOlmPersistAccountSQL =		static std::string replaceOlmPersistAccountSQL =
"REPLACE INTO olm_persist_account (id, account_data) "		"REPLACE INTO olm_persist_account (id, account_data) "
"VALUES (?, ?);";		"VALUES (?, ?);";
static std::string replaceOlmPersistSessionSQL =
"REPLACE INTO olm_persist_sessions (target_user_id, session_data) "
"VALUES (?, ?);";

OlmPersistAccount persistAccount = {		OlmPersistAccount persistAccount = {ACCOUNT_ID, accountData};
ACCOUNT_ID, std::string(persist.account.begin(), persist.account.end())};
replaceEntity<OlmPersistAccount>(		replaceEntity<OlmPersistAccount>(
SQLiteQueryExecutor::getConnection(),		SQLiteQueryExecutor::getConnection(),
replaceOlmPersistAccountSQL,		replaceOlmPersistAccountSQL,
persistAccount);		persistAccount);
		}

		void SQLiteQueryExecutor::storeOlmPersistSession(
		const OlmPersistSession &session) const {
		static std::string replaceOlmPersistSessionSQL =
		"REPLACE INTO olm_persist_sessions (target_user_id, session_data) "
		"VALUES (?, ?);";

for (auto it = persist.sessions.begin(); it != persist.sessions.end(); it++) {
OlmPersistSession persistSession = {
it->first, std::string(it->second.begin(), it->second.end())};
replaceEntity<OlmPersistSession>(		replaceEntity<OlmPersistSession>(
SQLiteQueryExecutor::getConnection(),		SQLiteQueryExecutor::getConnection(),
replaceOlmPersistSessionSQL,		replaceOlmPersistSessionSQL,
persistSession);		session);
		}

		void SQLiteQueryExecutor::storeOlmPersistData(crypto::Persist persist) const {
		std::string accountData =
		std::string(persist.account.begin(), persist.account.end());

		for (auto it = persist.sessions.begin(); it != persist.sessions.end(); it++) {
		OlmPersistSession persistSession = {
		it->first, std::string(it->second.begin(), it->second.end())};
		this->storeOlmPersistSession(persistSession);
}		}
}		}

void SQLiteQueryExecutor::setNotifyToken(std::string token) const {		void SQLiteQueryExecutor::setNotifyToken(std::string token) const {
this->setMetadata("notify_token", token);		this->setMetadata("notify_token", token);
}		}

void SQLiteQueryExecutor::clearNotifyToken() const {		void SQLiteQueryExecutor::clearNotifyToken() const {
▲ Show 20 Lines • Show All 51 Lines • ▼ Show 20 Lines	for (const auto &thread : threads) {
webThreads.emplace_back(thread);		webThreads.emplace_back(thread);
}		}
return webThreads;		return webThreads;
};		};

void SQLiteQueryExecutor::replaceThreadWeb(const WebThread &thread) const {		void SQLiteQueryExecutor::replaceThreadWeb(const WebThread &thread) const {
this->replaceThread(thread.toThread());		this->replaceThread(thread.toThread());
};		};

		std::vector<MessageWithMedias> SQLiteQueryExecutor::getAllMessagesWeb() const {
		auto allMessages = this->getAllMessages();

		std::vector<MessageWithMedias> allMessageWithMedias;
		for (auto &messageWitMedia : allMessages) {
		allMessageWithMedias.push_back(
		{std::move(messageWitMedia.first), messageWitMedia.second});
		}

		return allMessageWithMedias;
		}

		void SQLiteQueryExecutor::replaceMessageWeb(const WebMessage &message) const {
		this->replaceMessage(message.toMessage());
		};

		NullableString SQLiteQueryExecutor::getOlmPersistAccountDataWeb() const {
		std::optional<std::string> accountData = this->getOlmPersistAccountData();
		if (!accountData.has_value()) {
		return NullableString();
		}
		return std::make_unique<std::string>(accountData.value());
		}
#else		#else
void SQLiteQueryExecutor::clearSensitiveData() {		void SQLiteQueryExecutor::clearSensitiveData() {
SQLiteQueryExecutor::closeConnection();		SQLiteQueryExecutor::closeConnection();
if (file_exists(SQLiteQueryExecutor::sqliteFilePath) &&		if (file_exists(SQLiteQueryExecutor::sqliteFilePath) &&
std::remove(SQLiteQueryExecutor::sqliteFilePath.c_str())) {		std::remove(SQLiteQueryExecutor::sqliteFilePath.c_str())) {
std::ostringstream errorStream;		std::ostringstream errorStream;
errorStream << "Failed to delete database file. Details: "		errorStream << "Failed to delete database file. Details: "
<< strerror(errno);		<< strerror(errno);
▲ Show 20 Lines • Show All 215 Lines • Show Last 20 Lines

[services] Backup - mind empty attachment holdersClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 11168

services/backup/docker-server/contents/server/src/DatabaseManager.cpp

[services] Backup - mind empty attachment holders
ClosedPublic
Actions

Revision Contents
Changeset List