8000 remove remainders of allowDirectExecution (#10872) · waveray/arangodb@375cf59 · GitHub
[go: up one dir, main page]
Skip to content

Commit 375cf59

Browse files
jsteemannjsteemann
authored
remove remainders of allowDirectExecution (arangodb#10872)
1 parent 844809e commit 375cf59

11 files changed

+9
-48
lines changed

‎arangod/Cluster/RestClusterHandler.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,7 @@ using namespace arangodb::rest;
4242

4343
RestClusterHandler::RestClusterHandler(application_features::ApplicationServer& server,
4444
GeneralRequest* request, GeneralResponse* response)
45-
: RestBaseHandler(server, request, response) {
46-
std::vector<std::string> const& suffixes = _request->suffixes();
47-
_allowDirectExecution = !suffixes.empty() && suffixes[0] == "endpoints";
48-
}
45+
: RestBaseHandler(server, request, response) {}
4946

5047
RestStatus RestClusterHandler::execute() {
5148
if (_request->requestType() != RequestType::GET) {

‎arangod/GeneralServer/RestHandler.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,6 @@ class RestHandler : public std::enable_shared_from_this<RestHandler> {
109109
// what lane to use for this request
110110
virtual RequestLane lane() const = 0;
111111

112-
// return true if direct handler execution is allowed
113-
bool allowDirectExecution() const { return _allowDirectExecution; }
114-
115112
RequestLane getRequestLane() {
116113
bool found;
117114
_request->header(StaticStrings::XArangoFrontend, found);
@@ -219,8 +216,6 @@ class RestHandler : public std::enable_shared_from_this<RestHandler> {
219216

220217
protected:
221218
std::atomic<bool> _canceled;
222-
223-
bool _allowDirectExecution = false;
224219
};
225220

226221
} // namespace rest

‎arangod/RestHandler/RestAdminLogHandler.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@ using namespace arangodb::rest;
3939

4040
RestAdminLogHandler::RestAdminLogHandler(application_features::ApplicationServer& server,
4141
GeneralRequest* request, GeneralResponse* response)
42-
: RestBaseHandler(server, request, response) {
43-
_allowDirectExecution = true;
44-
}
42+
: RestBaseHandler(server, request, response) {}
4543

4644
RestStatus RestAdminLogHandler::execute() {
4745
ServerSecurityFeature& security = server().getFeature<ServerSecurityFeature>();

‎arangod/RestHandler/RestAdminServerHandler.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,7 @@ using namespace arangodb::rest;
4040
RestAdminServerHandler::RestAdminServerHandler(application_features::ApplicationServer& server,
4141
GeneralRequest* request,
4242
GeneralResponse* response)
43-
: RestBaseHandler(server, request, response) {
44-
_allowDirectExecution = true;
45-
}
43+
: RestBaseHandler(server, request, response) {}
4644

4745
RestStatus RestAdminServerHandler::execute() {
4846
std::vector<std::string> const& suffixes = _request->suffixes();

‎arangod/RestHandler/RestDocumentHandler.cpp

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -47,23 +47,7 @@ using namespace arangodb::rest;
4747

4848
RestDocumentHandler::RestDocumentHandler(application_features::ApplicationServer& server,
4949
GeneralRequest* request, GeneralResponse* response)
50-
: RestVocbaseBaseHandler(server, request, response) {
51-
52-
if (!ServerState::instance()->isClusterRole()) {
53-
// in the cluster we will have (blocking) communication, so we only
54-
// want the request to be executed directly when we are on a single server.
55-
auto const type = _request->requestType();
56-
if ((type == rest::RequestType::GET ||
57-
type == rest::RequestType::POST ||
58-
type == rest::RequestType::PUT ||
59-
type == rest::RequestType::PATCH ||
60-
type == rest::RequestType::DELETE_REQ) &&
61-
request->contentLength() <= 1024) {
62-
// only allow direct execution if we don't have huge payload
63-
_allowDirectExecution = true;
64-
}
65-
}
66-
}
50+
: RestVocbaseBaseHandler(server, request, response) {}
6751

6852
RestDocumentHandler::~RestDocumentHandler() = default;
6953

‎arangod/RestHandler/RestEngineHandler.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,7 @@ using namespace arangodb::rest;
3737

3838
RestEngineHandler::RestEngineHandler(application_features::ApplicationServer& server,
3939
GeneralRequest* request, GeneralResponse* response)
40-
: RestBaseHandler(server, request, response) {
41-
_allowDirectExecution = true;
42-
}
40+
: RestBaseHandler(server, request, response) {}
4341

4442
RestStatus RestEngineHandler::execute() {
4543
// extract the sub-request type

‎arangod/RestHandler/RestJobHandler.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ RestJobHandler::RestJobHandler(application_features::ApplicationServer& server,
4444
AsyncJobManager* jobManager)
4545
: RestBaseHandler(server, request, response), _jobManager(jobManager) {
4646
TRI_ASSERT(jobManager != nullptr);
47-
_allowDirectExecution = true;
4847
}
4948

5049
RestStatus RestJobHandler::execute() {

‎arangod/RestHandler/RestPleaseUpgradeHandler.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,7 @@ using velocypack::StringRef;
3131
RestPleaseUpgradeHandler::RestPleaseUpgradeHandler(application_features::ApplicationServer& server,
3232
GeneralRequest* request,
3333
GeneralResponse* response)
34-
: RestHandler(server, request, response) {
35-
_allowDirectExecution = true;
36-
}
34+
: RestHandler(server, request, response) {}
3735

3836
RestStatus RestPleaseUpgradeHandler::execute() {
3937
resetResponse(rest::ResponseCode::OK);

‎arangod/RestHandler/RestShutdownHandler.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@ using namespace arangodb::rest;
3939

4040
RestShutdownHandler::RestShutdownHandler(application_features::ApplicationServer& server,
4141
GeneralRequest* request, GeneralResponse* response)
42-
: RestBaseHandler(server, request, response) {
43-
_allowDirectExecution = true;
44-
}
42+
: RestBaseHandler(server, request, response) {}
4543

4644
////////////////////////////////////////////////////////////////////////////////
4745
/// @brief was docuBlock JSF_get_api_initiate

‎arangod/RestHandler/RestStatusHandler.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,7 @@ using namespace arangodb::rest;
4949

5050
RestStatusHandler::RestStatusHandler(application_features::ApplicationServer& server,
5151
GeneralRequest* request, GeneralResponse* response)
52-
: RestBaseHandler(server, request, response) {
53-
_allowDirectExecution = true;
54-
}
52+
: RestBaseHandler(server, request, response) {}
5553

5654
RestStatus RestStatusHandler::execute() {
5755
ServerSecurityFeature& security = server().getFeature<ServerSecurityFeature>();

0 commit comments

Comments
 (0)
0