Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed smg collections within the transaction, added gharial decoding (#8621)

This commit is contained in:
Heiko 2019-03-29 11:10:36 +01:00 committed by Jan
parent 86599ee2fc
commit 6b1d56a62c
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG
View File

@ -1,3 +1,10 @@
v3.4.6 (2019-XX-XX)
-------------------
* fixed internal issue #3815: fixed the removal of connected edges when
removing a vertex graph node in a smart graph environment.
v3.4.5 (2019-03-27) v3.4.5 (2019-03-27)
------------------- -------------------

9
arangod/Graph/GraphOperations.cpp
View File

@ -39,6 +39,7 @@
#include "RestServer/QueryRegistryFeature.h" #include "RestServer/QueryRegistryFeature.h"
#include "Transaction/Methods.h" #include "Transaction/Methods.h"
#include "Transaction/SmartContext.h" #include "Transaction/SmartContext.h"
#include "Utils/CollectionNameResolver.h"
#include "Utils/ExecContext.h" #include "Utils/ExecContext.h"
#include "Utils/OperationOptions.h" #include "Utils/OperationOptions.h"
#include "Utils/SingleCollectionTransaction.h" #include "Utils/SingleCollectionTransaction.h"
@ -776,8 +777,15 @@ OperationResult GraphOperations::removeEdgeOrVertex(const std::string& collectio
trxCollections.emplace_back(collectionName); trxCollections.emplace_back(collectionName);
CollectionNameResolver resolver {_vocbase};
for (auto const& it : edgeCollections) { for (auto const& it : edgeCollections) {
trxCollections.emplace_back(it); trxCollections.emplace_back(it);
auto col = resolver.getCollection(it);
if (col && col->isSmart() && col->type() == TRI_COL_TYPE_EDGE) {
for (auto const& rn : col->realNames()) {
trxCollections.emplace_back(rn);
}
}
} }
for (auto const& it : possibleEdgeCollections) { for (auto const& it : possibleEdgeCollections) {
trxCollections.emplace_back(it); // add to trx collections trxCollections.emplace_back(it); // add to trx collections
@ -787,6 +795,7 @@ OperationResult GraphOperations::removeEdgeOrVertex(const std::string& collectio
transaction::Options trxOptions; transaction::Options trxOptions;
trxOptions.waitForSync = waitForSync; trxOptions.waitForSync = waitForSync;
auto context = ctx(); auto context = ctx();
UserTransaction trx{context, {}, trxCollections, {}, trxOptions}; UserTransaction trx{context, {}, trxCollections, {}, trxOptions};
res = trx.begin(); res = trx.begin();

5
arangod/RestHandler/RestGraphHandler.cpp
View File

@ -27,6 +27,7 @@
#include <utility> #include <utility>
#include "Aql/Query.h" #include "Aql/Query.h"
#include "Basics/StringUtils.h"
#include "Basics/VelocyPackHelper.h" #include "Basics/VelocyPackHelper.h"
#include "Graph/Graph.h" #include "Graph/Graph.h"
#include "Graph/GraphManager.h" #include "Graph/GraphManager.h"
@ -57,7 +58,9 @@ Result RestGraphHandler::executeGharial() {
auto suffix = request()->suffixes().begin(); auto suffix = request()->suffixes().begin();
auto end = request()->suffixes().end(); auto end = request()->suffixes().end();
auto getNextSuffix = [&suffix]() { return *suffix++; }; auto getNextSuffix = [&suffix]() {
return basics::StringUtils::urlDecodePath(*suffix++);
};
auto noMoreSuffixes = [&suffix, &end]() { return suffix == end; }; auto noMoreSuffixes = [&suffix, &end]() { return suffix == end; };