thurt
diff --git a/‎arangod/Aql/TraversalBlock.cpp
Lines changed: 8 additions & 1 deletion b/‎arangod/Aql/TraversalBlock.cpp
Lines changed: 8 additions & 1 deletion
diff --git a/‎arangod/V8Server/V8Traverser.cpp
Lines changed: 13 additions & 0 deletions b/‎arangod/V8Server/V8Traverser.cpp
Lines changed: 13 additions & 0 deletions
diff --git a/‎arangod/V8Server/V8Traverser.h
Lines changed: 1 addition & 2 deletions b/‎arangod/V8Server/V8Traverser.h
Lines changed: 1 addition & 2 deletions
@@ -28,10 +28,10 @@
 
 #include "Aql/Ast.h"
 #include "Aql/ExecutionEngine.h"
+#include "Aql/ExecutionNode.h"
 #include "Aql/ExecutionPlan.h"
 #include "Aql/Functions.h"
 #include "Aql/TraversalBlock.h"
-#include "Aql/ExecutionNode.h"
 #include "Basics/ScopeGuard.h"
 #include "Cluster/ClusterTraverser.h"
 #include "V8/v8-globals.h"
@@ -94,6 +94,7 @@ TraversalBlock::TraversalBlock (ExecutionEngine* engine,
   }
 
   _resolver = new CollectionNameResolver(_trx->vocbase());
+
   if (triagens::arango::ServerState::instance()->isCoordinator()) {
     _traverser.reset(new triagens::arango::traverser::ClusterTraverser(
       ep->edgeColls(),
@@ -108,6 +109,11 @@ TraversalBlock::TraversalBlock (ExecutionEngine* engine,
     for (auto const& coll : ep->edgeColls()) {
       TRI_voc_cid_t cid = _resolver->getCollectionId(coll);
       edgeCollections.push_back(_trx->documentCollection(cid));
+  
+      auto trxCollection = _trx->trxCollection(cid);
+      if (trxCollection != nullptr) {
+        _trx->orderDitch(trxCollection);
+      }
     }
     _traverser.reset(new triagens::arango::traverser::DepthFirstTraverser(edgeCollections,
                                                                           opts,
@@ -163,6 +169,7 @@ void TraversalBlock::freeCaches () {
 int TraversalBlock::initialize () {
   int res = ExecutionBlock::initialize();
   auto varInfo = getPlanNode()->getRegisterPlan()->varInfo;
+
   if (usesVertexOutput()) {
     auto it = varInfo.find(_vertexVar->id);
     TRI_ASSERT(it != varInfo.end());
 
@@ -775,6 +775,11 @@ Json* SingleServerTraversalPath::vertexToJson (Transaction* trx,
     if (collection == nullptr) {
       THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_INTERNAL, "collection is a nullptr");
     }
+            
+    auto trxCollection = trx->trxCollection(v.cid);
+    if (trxCollection != nullptr) {
+      trx->orderDitch(trxCollection);
+    }
   }
   TRI_doc_mptr_copy_t mptr;
   int res = trx->readSingle(collection, &mptr, v.key);
@@ -850,6 +855,10 @@ bool DepthFirstTraverser::vertexMatchesConditions (VertexId const& v, size_t dep
             if (collection == nullptr) {
               THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_INTERNAL, "collection is a nullptr");
             }
+            auto trxCollection = _trx->trxCollection(v.cid);
+            if (trxCollection != nullptr) {
+              _trx->orderDitch(trxCollection);
+            }
           }
 
          int res = _trx->readSingle(collection, &mptr, v.key); 
@@ -1057,6 +1066,10 @@ void DepthFirstTraverser::setStartVertex (triagens::arango::traverser::VertexId
               if (collection == nullptr) {
                 THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_INTERNAL, "collection is a nullptr");
               }
+              auto trxCollection = _trx->trxCollection(v.cid);
+              if (trxCollection != nullptr) {
+                _trx->orderDitch(trxCollection);
+              }
             }
 
             int res = _trx->readSingle(collection, &mptr, v.key); 
 
@@ -171,8 +171,6 @@ namespace triagens {
           void addCollectionRestriction (TRI_voc_cid_t cid);
       };
 
-
-
       struct ShortestPathOptions : BasicOptions {
 
         public:
@@ -250,6 +248,7 @@ namespace triagens {
 // -----------------------------------------------------------------------------
 // --SECTION--                                         class DepthFirstTraverser
 // -----------------------------------------------------------------------------
+
       class DepthFirstTraverser : public Traverser {
 
         private:
Original file line number	Diff line number	Diff line change
`@@ -775,6 +775,11 @@ Json* SingleServerTraversalPath::vertexToJson (Transaction* trx,`
`775`	`775`	`if (collection == nullptr) {`
`776`	`776`	`THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_INTERNAL, "collection is a nullptr");`
`777`	`777`	`}`
	`778`	`+`
	`779`	`+ auto trxCollection = trx->trxCollection(v.cid);`
	`780`	`+ if (trxCollection != nullptr) {`
	`781`	`+ trx->orderDitch(trxCollection);`
	`782`	`+ }`
`778`	`783`	`}`
`779`	`784`	`TRI_doc_mptr_copy_t mptr;`
`780`	`785`	`int res = trx->readSingle(collection, &mptr, v.key);`
`@@ -850,6 +855,10 @@ bool DepthFirstTraverser::vertexMatchesConditions (VertexId const& v, size_t dep`
`850`	`855`	`if (collection == nullptr) {`
`851`	`856`	`THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_INTERNAL, "collection is a nullptr");`
`852`	`857`	`}`
	`858`	`+ auto trxCollection = _trx->trxCollection(v.cid);`
	`859`	`+ if (trxCollection != nullptr) {`
	`860`	`+ _trx->orderDitch(trxCollection);`
	`861`	`+ }`
`853`	`862`	`}`
`854`	`863`
`855`	`864`	`int res = _trx->readSingle(collection, &mptr, v.key);`
`@@ -1057,6 +1066,10 @@ void DepthFirstTraverser::setStartVertex (triagens::arango::traverser::VertexId`
`1057`	`1066`	`if (collection == nullptr) {`
`1058`	`1067`	`THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_INTERNAL, "collection is a nullptr");`
`1059`	`1068`	`}`
	`1069`	`+ auto trxCollection = _trx->trxCollection(v.cid);`
	`1070`	`+ if (trxCollection != nullptr) {`
	`1071`	`+ _trx->orderDitch(trxCollection);`
	`1072`	`+ }`
`1060`	`1073`	`}`
`1061`	`1074`
`1062`	`1075`	`int res = _trx->readSingle(collection, &mptr, v.key);`