8000 Fuerte simplify by graetzer · Pull Request #12270 · arangodb/arangodb · GitHub
[go: up one dir, main page]
Skip to content

Fuerte simplify #12270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 31 commits into from
Aug 24, 2020
Merged

Fuerte simplify #12270

Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
2c04571
Simplify fuerte code
graetzer Jun 26, 2020
24c1529
fix #warning
graetzer Jun 26, 2020
3412930
Merge branch 'devel' of github.com:arangodb/arangodb into feature/fue…
graetzer Jun 29, 2020
002412b
change defaults
graetzer Jun 29, 2020
0a9ac62
slight fixes
graetzer Jun 30, 2020
95e2e4b
slight adjustments
graetzer Jul 1, 2020
9aa85fa
Starting HTTP/2 with Prior Knowledge
graetzer Jul 3, 2020
efa00a3
make consistent
graetzer Jul 3, 2020
46cb4a8
Merge branch 'feature/http2-prior-knowledge' into feature/fuerte-simp…
graetzer Jul 3, 2020
528a0f6
fix some requests
graetzer Jul 8, 2020
3fa1586
fix architectire
graetzer Jul 13, 2020
da6c3e4
Merge branch 'devel' of github.com:arangodb/arangodb into feature/fue…
graetzer Jul 13, 2020
a5e1da2
fix stuff
graetzer Jul 13, 2020
1426f9b
Properly cancel broken connections
graetzer Jul 14, 2020
e070136
remove extra log statements
graetzer Jul 14, 2020
05c578a
Merge branch 'devel' of github.com:arangodb/arangodb into feature/fue…
graetzer Jul 21, 2020
931c22e
remove unused code
graetzer Jul 21, 2020
a7bd312
some changes to vst
graetzer Jul 21, 2020
56e3a53
adjust TLA+ pluscal models
graetzer Jul 22, 2020
50da56c
Merge branch 'devel' of github.com:arangodb/arangodb into feature/fue…
graetzer Jul 22, 2020
b9208ea
fix some stuff
graetzer Jul 22, 2020
088a759
fix mistake
graetzer Jul 22, 2020
92a050f
fixing VST connection
graetzer Jul 23, 2020
67faddb
Merge remote-tracking branch 'origin/devel' into feature/fuerte-s 8000 implify
neunhoef Aug 20, 2020
b25c331
Correct mode: we call shutdownConnection when it is time.
neunhoef Aug 21, 2020
439abaa
File no longer necessary.
neunhoef Aug 21, 2020
17df268
Comment fixes.
neunhoef Aug 21, 2020
e4e9d4d
Add a forgotten alarm cancellation to model.
neunhoef Aug 21, 2020
092e27c
Fix cancellation in model.
neunhoef Aug 21, 2020
57e1777
Take latest transaction.
neunhoef Aug 21, 2020
d09a0a8
This is a sub-PR to suggest some changes. (#12495)
neunhoef Aug 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove extra log statements
  • Loading branch information
@graetzer
graetzer committed Jul 14, 2020
commit e0701361443a90b47b264e31a2076efec69ada7b
10 changes: 0 additions & 10 deletions arangod/Network/Methods.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,6 @@ Result Response::combinedResult() const {
auto prepareRequest(RestVerb type, std::string path, VPackBufferUInt8 payload,
RequestOptions const& options, Headers headers,
std::chrono::duration<double> timeout) {
#ifdef ARANGODB_ENABLE_MAINTAINER_MODE
if (path.find("/_db/") != std::string::npos ||
path.find('?') != std::string::npos) {
LOG_DEVEL << path;
}
#endif
TRI_ASSERT(path.find("/_db/") == std::string::npos);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks dangerous to me. Why would this never show up in an path of a URL? Granted, it is only an assertion and so it would only impact us in the tests, but still. I would like to understand the rationale behind this.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, I think I understand, one is supposed to use the database option. Maybe only assert that the path does not begin with /_db/?

TRI_ASSERT(path.find('?') == std::string::npos);

Expand Down Expand Up @@ -272,10 +266,6 @@ class RequestsState final : public std::enable_shared_from_this<RequestsState> {
}
TRI_ASSERT(t.count() > 0);

LOG_DEVEL
<< "request to '" << _destination
<< "' '" << fuerte::to_string(_type) << " " << _path << "' using " << spec.endpoint;

auto conn = _pool->leaseConnection(spec.endpoint);
auto req = prepareRequest(_type, _path, _payload, _options, _headers, t);
conn->sendRequest(std::move(req),
Expand Down
0