[web-db] choose storage engine depending on whether database is supported or not
ClosedPublic
Actions

Authored by kamil on Apr 27 2023, 7:47 AM.

Details

Reviewers

tomek
michal

Commits

rCOMMfd0203f1c83a: [web-db] choose storage engine depending on whether database is supported or not

Summary

Conditionally use default persist storage API or database depending on whether database is supported or not.

Depends on D7666

Test Plan

Switch to commReduxStorageEngine and test if it works for not supported database

Diff Detail

Repository

rCOMM Comm

Lint

No Lint Coverage

Unit

No Test Coverage

Event Timeline

kamil created this revision.Apr 27 2023, 7:47 AM

kamil held this revision as a draft.

Herald added subscribers: atul, ashoat. · View Herald TranscriptApr 27 2023, 7:47 AM

kamil added a child revision: D7668: [web-db] migrate entire redux-persist storage to SQLite.Apr 27 2023, 7:50 AM

kamil published this revision for review.Apr 27 2023, 8:00 AM

Harbormaster completed remote builds in B18875: Diff 25853.Apr 27 2023, 8:04 AM

Wondering if this is the best solution. How about having two separate storage engines, one with only db and one with redux storage? Then we could conditionally set one or the other, but each of them would be a lot simpler.

This revision is now accepted and ready to land.Apr 28 2023, 4:37 AM

tomek added inline comments.Apr 28 2023, 4:38 AM

web/redux/comm-redux-storage-engine.js
3	Is this the right import? Do we have to include `index` in the path?

ashoat added inline comments.Apr 28 2023, 6:01 AM

web/redux/comm-redux-storage-engine.js
3	We have an ESLint rule that forces this. It can be ignored, but generally prefer to use `index.js` instead. This is the same import path we use in `web/root.js` currently

rebase before landing

Harbormaster completed remote builds in B19275: Diff 26377.May 11 2023, 3:53 AM

Closed by commit rCOMMfd0203f1c83a: [web-db] choose storage engine depending on whether database is supported or not (authored by kamil). · Explain WhyMay 11 2023, 4:03 AM

This revision was automatically updated to reflect the committed changes.

kamil added a commit: rCOMMfd0203f1c83a: [web-db] choose storage engine depending on whether database is supported or not.

Revision Contents
Changeset List

Path

Size

web/

redux/

comm-redux-storage-engine.js

19 lines

Diff 25853

View Options

web/redux/comm-redux-storage-engine.js

Show All 34 Lines	class SendLogReactor : public ServerReadReactorBase<
PersistenceMethod persistenceMethod = PersistenceMethod::UNKNOWN;		PersistenceMethod persistenceMethod = PersistenceMethod::UNKNOWN;
std::string userID;		std::string userID;
std::string backupID;		std::string backupID;
std::string hash;		std::string hash;
// either the value itself which is a dump of a single operation (if		// either the value itself which is a dump of a single operation (if
// `persistedInBlob` is false) or the holder to blob (if `persistedInBlob` is		// `persistedInBlob` is false) or the holder to blob (if `persistedInBlob` is
// true)		// true)
std::string value;		std::string value;
		std::mutex reactorStateMutex;
std::condition_variable waitingForBlobClientCV;		std::condition_variable waitingForBlobClientCV;

std::shared_ptr<reactor::BlobPutClientReactor> putReactor;		std::shared_ptr<reactor::BlobPutClientReactor> putReactor;
ServiceBlobClient blobClient;		ServiceBlobClient blobClient;
void storeInDatabase();		void storeInDatabase();
std::string generateLogID();		std::string generateLogID();
void initializePutReactor();		void initializePutReactor();

Show All 30 Lines	if (this->putReactor == nullptr) {
this->putReactor = std::make_shared<reactor::BlobPutClientReactor>(		this->putReactor = std::make_shared<reactor::BlobPutClientReactor>(
this->value, this->hash, &this->waitingForBlobClientCV);		this->value, this->hash, &this->waitingForBlobClientCV);
this->blobClient.put(this->putReactor);		this->blobClient.put(this->putReactor);
}		}
}		}

std::unique_ptr<grpc::Status>		std::unique_ptr<grpc::Status>
SendLogReactor::readRequest(backup::SendLogRequest request) {		SendLogReactor::readRequest(backup::SendLogRequest request) {
		// we make sure that the blob client's state is flushed to the main memory
		// as there may be multiple threads from the pool taking over here
		const std::lock_guard<std::mutex> lock(this->reactorStateMutex);
switch (this->state) {		switch (this->state) {
case State::USER_ID: {		case State::USER_ID: {
if (!request.has_userid()) {		if (!request.has_userid()) {
throw std::runtime_error("user id expected but not received");		throw std::runtime_error("user id expected but not received");
}		}
this->userID = request.userid();		this->userID = request.userid();
return std::make_unique<grpc::Status>(		return std::make_unique<grpc::Status>(
grpc::Status(grpc::StatusCode::UNIMPLEMENTED, "unimplemented"));		grpc::Status(grpc::StatusCode::UNIMPLEMENTED, "unimplemented"));
Show All 40 Lines	case State::LOG_CHUNK: {
std::cout << "log data received " << chunk->size() << std::endl;		std::cout << "log data received " << chunk->size() << std::endl;
return nullptr;		return nullptr;
};		};
}		}
throw std::runtime_error("send log - invalid state");		throw std::runtime_error("send log - invalid state");
}		}

void SendLogReactor::doneCallback() {		void SendLogReactor::doneCallback() {
		const std::lock_guard<std::mutex> lock(this->reactorStateMutex);
// TODO implement		// TODO implement
std::cout << "receive logs done " << this->status.error_code() << "/"		std::cout << "receive logs done " << this->status.error_code() << "/"
<< this->status.error_message() << std::endl;		<< this->status.error_message() << std::endl;
}		}

} // namespace reactor		} // namespace reactor
} // namespace network		} // namespace network
} // namespace comm		} // namespace comm

[web-db] choose storage engine depending on whether database is supported or notClosedPublicActions