8000 Cleanup in preparation for Replication 2.0 transaction handling (try #2) by goedderz · Pull Request #14907 · arangodb/arangodb · GitHub
[go: up one dir, main page]
Skip to content

Cleanup in preparation for Replication 2.0 transaction handling (try #2) #14907

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 18 commits into from
Nov 4, 2021
Merged

Cleanup in preparation for Replication 2.0 transaction handling (try #2) #14907

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
2b27872
Took over some refactoring from a previous branches
goedderz Oct 14, 2021
4fdfde9
Took over some more changes
goedderz Oct 14, 2021
a0933e1
Fixes
goedderz Oct 14, 2021
4f0766c
Fixed catchToResultT
goedderz Oct 14, 2021
c56cca9
Re-added missing function
goedderz Oct 14, 2021
75462d9
Moved default initializations
goedderz Oct 14, 2021
a468a55
Merge branch 'devel' of github.com:arangodb/arangodb into feature/cle…
goedderz Oct 18, 2021
5a0c2cb
Merge branch 'devel' of github.com:arangodb/arangodb into feature/cle…
goedderz Oct 21, 2021
391c7bf
Fixed C++ tests
goedderz Oct 21, 2021
a77d0fa
Improved the assertion on single server a little
goedderz Oct 21, 2021
5853ec0
Suppressed warning
goedderz Oct 21, 2021
9b89cf3
Merge branch 'devel' of github.com:arangodb/arangodb into feature/cle…
goedderz Oct 25, 2021
871357f
Fixed remaining merge conflicts
goedderz Oct 26, 2021
cea7b78
Added comments, assertions, and moved initializations in transaction:…
goedderz Oct 28, 2021
d4963ff
Fixed compile error
goedderz Oct 28, 2021
39db310
[WIP] Try to fix google test error
goedderz Oct 28, 2021
a9718ff
Fix test
mpoeter Oct 29, 2021
66a8cd5
Fix non-maintainer build.
mpoeter Nov 2, 2021
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
Improved the assertion on single server a little
  • Loading branch information
@goedderz
goedderz committed Oct 21, 2021
commit a77d0fa82d285f4ac99c65d3aad70ee975db385b
2 changes: 1 addition & 1 deletion arangod/Transaction/Manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ ResultT<TransactionId> Manager::createManagedTrx(TRI_vocbase_t& vocbase, VPackSl

Result Manager::ensureManagedTrx(TRI_vocbase_t& vocbase, TransactionId tid,
VPackSlice trxOpts, bool isFollowerTransaction) {
TRI_ASSERT(ServerState::instance()->isSingleServer() ||
TRI_ASSERT(ServerState::instance()->isSingleServer() && !isFollowerTransaction ||
tid.isFollowerTransactionId() == isFollowerTransaction);
transaction::Options options;
std::vector<std::string> reads, writes, exclusives;
Expand Down
0