Page MenuHomePhabricator
Differential D8459

[blob-service] Delete old database code from http module
ClosedPublic
Actions

Authored by bartek on Jul 9 2023, 2:07 PM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Mar 18, 1:03 AM
Unknown Object (File)
Mon, Mar 17, 12:27 AM
Unknown Object (File)
Sun, Mar 9, 12:31 PM
Unknown Object (File)
Fri, Mar 7, 6:07 PM
Unknown Object (File)
Fri, Mar 7, 6:07 PM
Unknown Object (File)
Fri, Mar 7, 6:07 PM
Unknown Object (File)
Fri, Mar 7, 6:06 PM
Unknown Object (File)
Fri, Mar 7, 6:01 PM
View All Files
Subscribers
ashoat
tomek

Details

Reviewers
michal
varun
• patryk
• jon
Commits
rCOMM013d700586f9: [blob-service] Delete old database code from http module
Summary

Part of ENG-4269.

Removed all code related to the old database from the HTTP server part of the service. (gRPC still uses it).

Renamed http/context.rs to http/errors.rs because the only code left there is error handling.

Depends on D8458.

Test Plan

Blob service builds and runs, integration tests pass

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
services/
blob/
src/
database/
8 lines
http/
errors.rs
context.rs
66 lines
handlers/
10 lines
20 lines
2 lines

Diff 28998

View Options

services/blob/src/database/client.rs

  • This file was added.
#pragma once
#include <grpcpp/grpcpp.h>
#include <iostream>
#include <memory>
#include <string>
namespace comm {
namespace network {
namespace reactor {
struct ServerBidiReactorStatus {
grpc::Status status = grpc::Status::OK;
bool sendLastResponse = false;
ServerBidiReactorStatus(
grpc::Status status = grpc::Status::OK,
bool sendLastResponse = false)
: status(status), sendLastResponse(sendLastResponse) {
}
};
template <class Request, class Response>
class ServerBidiReactorBase
: public grpc::ServerBidiReactor<Request, Response> {
Request request;
Response response;
protected:
ServerBidiReactorStatus status;
bool readingAborted = false;
public:
ServerBidiReactorBase();
void OnDone() override;
void OnReadDone(bool ok) override;
void OnWriteDone(bool ok) override;
void terminate(ServerBidiReactorStatus status);
virtual std::unique_ptr<ServerBidiReactorStatus>
handleRequest(Request request, Response *response) = 0;
virtual void initialize(){};
virtual void doneCallback(){};
};
template <class Request, class Response>
ServerBidiReactorBase<Request, Response>::ServerBidiReactorBase() {
this->initialize();
this->StartRead(&this->request);
}
template <class Request, class Response>
void ServerBidiReactorBase<Request, Response>::OnDone() {
this->doneCallback();
delete this;
}
template <class Request, class Response>
void ServerBidiReactorBase<Request, Response>::terminate(
ServerBidiReactorStatus status) {
this->status = status;
if (this->status.sendLastResponse) {
this->StartWriteAndFinish(
&this->response, grpc::WriteOptions(), this->status.status);
} else {
this->Finish(this->status.status);
}
}
template <class Request, class Response>
void ServerBidiReactorBase<Request, Response>::OnReadDone(bool ok) {
if (!ok) {
this->readingAborted = true;
this->terminate(ServerBidiReactorStatus(
grpc::Status(grpc::StatusCode::ABORTED, "no more reads")));
return;
}
try {
this->response = Response();
std::unique_ptr<ServerBidiReactorStatus> status =
this->handleRequest(this->request, &this->response);
if (status != nullptr) {
this->terminate(*status);
return;
}
this->StartWrite(&this->response);
} catch (std::runtime_error &e) {
this->terminate(ServerBidiReactorStatus(
grpc::Status(grpc::StatusCode::INTERNAL, e.what())));
}
}
template <class Request, class Response>
void ServerBidiReactorBase<Request, Response>::OnWriteDone(bool ok) {
if (!ok) {
this->terminate(ServerBidiReactorStatus(
grpc::Status(grpc::StatusCode::ABORTED, "write failed")));
return;
}
this->StartRead(&this->request);
}
} // namespace reactor
} // namespace network
} // namespace comm
View Options

services/blob/src/http/context.rs

  • This file was added.
#pragma once
#include <grpcpp/grpcpp.h>
#include <iostream>
#include <memory>
#include <string>
namespace comm {
namespace network {
namespace reactor {
struct ServerBidiReactorStatus {
grpc::Status status = grpc::Status::OK;
bool sendLastResponse = false;
ServerBidiReactorStatus(
grpc::Status status = grpc::Status::OK,
bool sendLastResponse = false)
: status(status), sendLastResponse(sendLastResponse) {
}
};
template <class Request, class Response>
class ServerBidiReactorBase
: public grpc::ServerBidiReactor<Request, Response> {
Request request;
Response response;
protected:
ServerBidiReactorStatus status;
bool readingAborted = false;
public:
ServerBidiReactorBase();
void OnDone() override;
void OnReadDone(bool ok) override;
void OnWriteDone(bool ok) override;
void terminate(ServerBidiReactorStatus status);
virtual std::unique_ptr<ServerBidiReactorStatus>
handleRequest(Request request, Response *response) = 0;
virtual void initialize(){};
virtual void doneCallback(){};
};
template <class Request, class Response>
ServerBidiReactorBase<Request, Response>::ServerBidiReactorBase() {
this->initialize();
this->StartRead(&this->request);
}
template <class Request, class Response>
void ServerBidiReactorBase<Request, Response>::OnDone() {
this->doneCallback();
delete this;
}
template <class Request, class Response>
void ServerBidiReactorBase<Request, Response>::terminate(
ServerBidiReactorStatus status) {
this->status = status;
if (this->status.sendLastResponse) {
this->StartWriteAndFinish(
&this->response, grpc::WriteOptions(), this->status.status);
} else {
this->Finish(this->status.status);
}
}
template <class Request, class Response>
void ServerBidiReactorBase<Request, Response>::OnReadDone(bool ok) {
if (!ok) {
this->readingAborted = true;
this->terminate(ServerBidiReactorStatus(
grpc::Status(grpc::StatusCode::ABORTED, "no more reads")));
return;
}
try {
this->response = Response();
std::unique_ptr<ServerBidiReactorStatus> status =
this->handleRequest(this->request, &this->response);
if (status != nullptr) {
this->terminate(*status);
return;
}
this->StartWrite(&this->response);
} catch (std::runtime_error &e) {
this->terminate(ServerBidiReactorStatus(
grpc::Status(grpc::StatusCode::INTERNAL, e.what())));
}
}
template <class Request, class Response>
void ServerBidiReactorBase<Request, Response>::OnWriteDone(bool ok) {
if (!ok) {
this->terminate(ServerBidiReactorStatus(
grpc::Status(grpc::StatusCode::ABORTED, "write failed")));
return;
}
this->StartRead(&this->request);
}
} // namespace reactor
} // namespace network
} // namespace comm
View Options

services/blob/src/http/errors.rs

  • This file was added.
#pragma once
#include <grpcpp/grpcpp.h>
#include <iostream>
#include <memory>
#include <string>
namespace comm {
namespace network {
namespace reactor {
struct ServerBidiReactorStatus {
grpc::Status status = grpc::Status::OK;
bool sendLastResponse = false;
ServerBidiReactorStatus(
grpc::Status status = grpc::Status::OK,
bool sendLastResponse = false)
: status(status), sendLastResponse(sendLastResponse) {
}
};
template <class Request, class Response>
class ServerBidiReactorBase
: public grpc::ServerBidiReactor<Request, Response> {
Request request;
Response response;
protected:
ServerBidiReactorStatus status;
bool readingAborted = false;
public:
ServerBidiReactorBase();
void OnDone() override;
void OnReadDone(bool ok) override;
void OnWriteDone(bool ok) override;
void terminate(ServerBidiReactorStatus status);
virtual std::unique_ptr<ServerBidiReactorStatus>
handleRequest(Request request, Response *response) = 0;
virtual void initialize(){};
virtual void doneCallback(){};
};
template <class Request, class Response>
ServerBidiReactorBase<Request, Response>::ServerBidiReactorBase() {
this->initialize();
this->StartRead(&this->request);
}
template <class Request, class Response>
void ServerBidiReactorBase<Request, Response>::OnDone() {
this->doneCallback();
delete this;
}
template <class Request, class Response>
void ServerBidiReactorBase<Request, Response>::terminate(
ServerBidiReactorStatus status) {
this->status = status;
if (this->status.sendLastResponse) {
this->StartWriteAndFinish(
&this->response, grpc::WriteOptions(), this->status.status);
} else {
this->Finish(this->status.status);
}
}
template <class Request, class Response>
void ServerBidiReactorBase<Request, Response>::OnReadDone(bool ok) {
if (!ok) {
this->readingAborted = true;
this->terminate(ServerBidiReactorStatus(
grpc::Status(grpc::StatusCode::ABORTED, "no more reads")));
return;
}
try {
this->response = Response();
std::unique_ptr<ServerBidiReactorStatus> status =
this->handleRequest(this->request, &this->response);
if (status != nullptr) {
this->terminate(*status);
return;
}
this->StartWrite(&this->response);
} catch (std::runtime_error &e) {
this->terminate(ServerBidiReactorStatus(
grpc::Status(grpc::StatusCode::INTERNAL, e.what())));
}
}
template <class Request, class Response>
void ServerBidiReactorBase<Request, Response>::OnWriteDone(bool ok) {
if (!ok) {
this->terminate(ServerBidiReactorStatus(
grpc::Status(grpc::StatusCode::ABORTED, "write failed")));
return;
}
this->StartRead(&this->request);
}
} // namespace reactor
} // namespace network
} // namespace comm
View Options

services/blob/src/http/handlers/blob.rs

  • This file was added.
#pragma once
#include <grpcpp/grpcpp.h>
#include <iostream>
#include <memory>
#include <string>
namespace comm {
namespace network {
namespace reactor {
struct ServerBidiReactorStatus {
grpc::Status status = grpc::Status::OK;
bool sendLastResponse = false;
ServerBidiReactorStatus(
grpc::Status status = grpc::Status::OK,
bool sendLastResponse = false)
: status(status), sendLastResponse(sendLastResponse) {
}
};
template <class Request, class Response>
class ServerBidiReactorBase
: public grpc::ServerBidiReactor<Request, Response> {
Request request;
Response response;
protected:
ServerBidiReactorStatus status;
bool readingAborted = false;
public:
ServerBidiReactorBase();
void OnDone() override;
void OnReadDone(bool ok) override;
void OnWriteDone(bool ok) override;
void terminate(ServerBidiReactorStatus status);
virtual std::unique_ptr<ServerBidiReactorStatus>
handleRequest(Request request, Response *response) = 0;
virtual void initialize(){};
virtual void doneCallback(){};
};
template <class Request, class Response>
ServerBidiReactorBase<Request, Response>::ServerBidiReactorBase() {
this->initialize();
this->StartRead(&this->request);
}
template <class Request, class Response>
void ServerBidiReactorBase<Request, Response>::OnDone() {
this->doneCallback();
delete this;
}
template <class Request, class Response>
void ServerBidiReactorBase<Request, Response>::terminate(
ServerBidiReactorStatus status) {
this->status = status;
if (this->status.sendLastResponse) {
this->StartWriteAndFinish(
&this->response, grpc::WriteOptions(), this->status.status);
} else {
this->Finish(this->status.status);
}
}
template <class Request, class Response>
void ServerBidiReactorBase<Request, Response>::OnReadDone(bool ok) {
if (!ok) {
this->readingAborted = true;
this->terminate(ServerBidiReactorStatus(
grpc::Status(grpc::StatusCode::ABORTED, "no more reads")));
return;
}
try {
this->response = Response();
std::unique_ptr<ServerBidiReactorStatus> status =
this->handleRequest(this->request, &this->response);
if (status != nullptr) {
this->terminate(*status);
return;
}
this->StartWrite(&this->response);
} catch (std::runtime_error &e) {
this->terminate(ServerBidiReactorStatus(
grpc::Status(grpc::StatusCode::INTERNAL, e.what())));
}
}
template <class Request, class Response>
void ServerBidiReactorBase<Request, Response>::OnWriteDone(bool ok) {
if (!ok) {
this->terminate(ServerBidiReactorStatus(
grpc::Status(grpc::StatusCode::ABORTED, "write failed")));
return;
}
this->StartRead(&this->request);
}
} // namespace reactor
} // namespace network
} // namespace comm
View Options

services/blob/src/http/mod.rs

Loading...
View Options

services/blob/src/main.rs

Loading...