8000 Enforce stricter transaction limits (#9740) · arangodb/arangodb@6235acb · GitHub
[go: up one dir, main page]
Skip to content

Commit 6235acb

Browse files
graetzergraetzer
committed
Enforce stricter transaction limits (#9740)
1 parent 6f112d2 commit 6235acb

File tree

7 files changed

+212
-139
lines changed

7 files changed

+212
-139
lines changed

‎arangod/ClusterEngine/ClusterTransactionCollection.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ ClusterTransactionCollection::ClusterTransactionCollection(TransactionState* trx
3535
TRI_voc_cid_t cid,
3636
AccessMode::Type accessType,
3737
int nestingLevel)
38-
: TransactionCollection(trx, cid, accessType, nestingLevel),
39-
_lockType(AccessMode::Type::NONE) {}
38+
: TransactionCollection(trx, cid, accessType, nestingLevel) {}
4039

4140
ClusterTransactionCollection::~ClusterTransactionCollection() {}
4241

‎arangod/ClusterEngine/ClusterTransactionCollection.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,6 @@ class ClusterTransactionCollection final : public TransactionCollection {
6060

6161
/// @brief request an unlock for a collection
6262
int doUnlock(AccessMode::Type, int nestingLevel) override;
63-
64-
private:
65-
AccessMode::Type _lockType; // collection lock type, used for exclusive locks
6663
};
6764
} // namespace arangodb
6865

‎arangod/RestHandler/RestTransactionHandler.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ void RestTransactionHandler::executeBegin() {
166166

167167

168168
bool parseSuccess = false;
169-
VPackSlice body = parseVPackBody(parseSuccess);
169+
VPackSlice slice = parseVPackBody(parseSuccess);
170170
if (!parseSuccess) {
171171
// error message generated in parseVPackBody
172172
return;
@@ -175,7 +175,7 @@ void RestTransactionHandler::executeBegin() {
175175
transaction::Manager* mgr = transaction::ManagerFeature::manager();
176176
TRI_ASSERT(mgr != nullptr);
177177

178-
Result res = mgr->createManagedTrx(_vocbase, tid, body);
178+
Result res = mgr->createManagedTrx(_vocbase, tid, slice);
179179
if (res.fail()) {
180180
generateError(res);
181181
} else {

0 commit comments

Comments
 (0)
0