V8Traverser now uses fast path in trx document.

arangod/V8Server/V8Traverser.cpp

@@ -76,34 +76,33 @@ VPackSlice ShortestPathOptions::getEnd() const {
 ///        On all other cases this function throws.
 ////////////////////////////////////////////////////////////////////////////////
 
-static OperationResult FetchDocumentById(arangodb::Transaction* trx,
+static int FetchDocumentById(arangodb::Transaction* trx,
-                                         std::string const& id,
+                             std::string const& id,
-                                         VPackBuilder& builder,
+                             VPackBuilder& builder,
-                                         OperationOptions& options) {
+                             VPackBuilder& result) {
   size_t pos = id.find('/');
   if (pos == std::string::npos) {
     TRI_ASSERT(false);
-    return OperationResult(TRI_ERROR_INTERNAL);
+    return TRI_ERROR_INTERNAL;
   }
   if (id.find('/', pos + 1) != std::string::npos) {
     TRI_ASSERT(false);
-    return OperationResult(TRI_ERROR_INTERNAL);
+    return TRI_ERROR_INTERNAL;
   }
 
   std::string col = id.substr(0, pos);
   trx->addCollectionAtRuntime(col);
   builder.clear();
   builder.openObject();
-  builder.add(VPackValue(StaticStrings::KeyString));
+  builder.add(StaticStrings::KeyString, VPackValue(id.substr(pos + 1)));
-  builder.add(VPackValue(id.substr(pos + 1)));
   builder.close();
 
-  OperationResult opRes = trx->document(col, builder.slice(), options);
+  int res = trx->documentFastPath(col, builder.slice(), result);
-  // TODO Operation Result is very expensive find a faster alternative
+
-  if (opRes.failed() && opRes.code != TRI_ERROR_ARANGO_DOCUMENT_NOT_FOUND) {
+  if (res != TRI_ERROR_NO_ERROR && res != TRI_ERROR_ARANGO_DOCUMENT_NOT_FOUND) {
-    THROW_ARANGO_EXCEPTION(opRes.code);
+    THROW_ARANGO_EXCEPTION(res);
   }
-  return opRes;
+  return res;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -556,16 +555,17 @@ bool NeighborsOptions::matchesVertex(std::string const& id) const {
     }
   }
   std::string key = id.substr(pos + 1);
-  VPackBuilder tmp;
+  TransactionBuilderLeaser tmp(_trx);
-  tmp.openObject();
+  tmp->openObject();
-  tmp.add(StaticStrings::KeyString, VPackValue(key));
+  tmp->add(StaticStrings::KeyString, VPackValue(key));
-  tmp.close();
+  tmp->close();
-  OperationOptions opOpts;
+
-  OperationResult opRes = _trx->document(col, tmp.slice(), opOpts);
+  TransactionBuilderLeaser result(_trx);
-  if (opRes.failed()) {
+  int res = _trx->documentFastPath(col, tmp->slice(), *(result.get()));
+  if (res != TRI_ERROR_NO_ERROR) {
     return false;
   }
-  return BasicOptions::matchesVertex(col, key, opRes.slice());
+  return BasicOptions::matchesVertex(col, key, result->slice());
 }
 
 
@@ -892,16 +892,10 @@ void TRI_RunNeighborsSearch(std::vector<EdgeCollectionInfo*> const& collectionIn
 void SingleServerTraversalPath::getDocumentByIdentifier(Transaction* trx,
                                                         std::string const& identifier,
                                                         VPackBuilder& result) {
-  // TODO Check if we can get away with using ONLY VPackSlices referencing externals instead of std::string.
+  int res = FetchDocumentById(trx, identifier, _searchBuilder, result);
-  // I am afaid that they may run out of scope.
+  if (res != TRI_ERROR_NO_ERROR) {
-  OperationOptions options;
+    THROW_ARANGO_EXCEPTION(res);
-  OperationResult opRes = FetchDocumentById(trx, identifier, _searchBuilder, options);
-
-  if (opRes.failed()) {
-    THROW_ARANGO_EXCEPTION(opRes.code);
   }
-
-  result.add(opRes.slice());
 }
 
 void SingleServerTraversalPath::pathToVelocyPack(Transaction* trx,
@@ -997,17 +991,17 @@ std::shared_ptr<VPackBuffer<uint8_t>> DepthFirstTraverser::fetchVertexData(
     std::string const& id) {
   auto it = _vertices.find(id);
   if (it == _vertices.end()) {
-    OperationResult opRes =
+    VPackBuilder tmp;
-        FetchDocumentById(_trx, id, _builder, _operationOptions);
+    int res = FetchDocumentById(_trx, id, _builder, tmp);
     ++_readDocuments;
-    if (opRes.failed()) {
+    if (res != TRI_ERROR_NO_ERROR) {
-      TRI_ASSERT(opRes.code == TRI_ERROR_ARANGO_DOCUMENT_NOT_FOUND);
+      TRI_ASSERT(res == TRI_ERROR_ARANGO_DOCUMENT_NOT_FOUND);
-      VPackBuilder tmp;
       tmp.add(VPackValue(VPackValueType::Null));
       return tmp.steal();
     }
-    _vertices.emplace(id, opRes.buffer);
+    auto shared_buffer = tmp.steal();
-    return opRes.buffer;
+    _vertices.emplace(id, shared_buffer);
+    return shared_buffer;
   }
   return it->second;
 }
@@ -1046,14 +1040,15 @@ void DepthFirstTraverser::setStartVertex(std::string const& v) {
         if (!exp->isEdgeAccess) {
           if (fetchVertex) {
             fetchVertex = false;
-            OperationResult result = FetchDocumentById(_trx, v, _builder, _operationOptions);
+            VPackBuilder tmp;
+            int result = FetchDocumentById(_trx, v, _builder, tmp);
             ++_readDocuments;
-            if (result.failed()) {
+            if (result != TRI_ERROR_NO_ERROR) {
               // Vertex does not exist
               _done = true;
               return;
             }
-            vertex = result.buffer;
+            vertex = tmp.steal();
             _vertices.emplace(v, vertex);
           }
           if (!exp->matchesCheck(_trx, VPackSlice(vertex->data()))) {

arangod/V8Server/V8Traverser.h

@@ -333,12 +333,6 @@ class DepthFirstTraverser : public Traverser {
 
   arangodb::velocypack::Builder _builder;
 
-  //////////////////////////////////////////////////////////////////////////////
-  /// @brief Shared operation Options
-  //////////////////////////////////////////////////////////////////////////////
-
-  arangodb::OperationOptions _operationOptions;
-
   //////////////////////////////////////////////////////////////////////////////
   //////////////////////////////////////////////////////////////////////////////
   /// @brief internal function to define the _getVertex and _getEdge functions

arangod/V8Server/v8-vocbase.cpp

@@ -1711,6 +1711,7 @@ static v8::Handle<v8::Value> VertexIdToData(v8::Isolate* isolate,
   builder->add(StaticStrings::KeyString, VPackValue(vertexId.substr(pos + 1)));
   builder->close();
 
+  OperationOptions options;
   OperationResult opRes = trx->document(vertexId.substr(0, pos), builder->slice(), options);
 
   if (opRes.failed()) {