Bug fix/begin trx disjoint (#14641) (#14648)

mchacki · KVS85 · web-flow · commit a457b967fb0f · 2021-08-20T15:32:23.000+03:00
* Bug fix/begin trx disjoint (#14641) * Revert JSUnity improvement, testCase names now need to be unique per file again. :sad: (#14659) Co-authored-by: Vadim <vadim@arangodb.com>
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,9 @@
 v3.8.1 (XXXX-XX-XX)
 -------------------
 
+* Fixed: _api/transaction/begin called on edge collections of disjoint
+  SmartGraphs falsely returned CollectionNotFound errors.
+
 * Bug-Fix: In more complex queries there was a code-path where a (Disjoint-)
   Smart graph access was not properly optimized.
 
diff --git a/arangod/Transaction/Manager.cpp b/arangod/Transaction/Manager.cpp
@@ -489,15 +489,17 @@ Result Manager::lockCollections(TRI_vocbase_t& vocbase,
               if (res.fail()) {
                 return false;
               }
-              res.reset(state->addCollection(theEdge->getFromCid(), "_from_" + cname,
-                                             mode, /*lockUsage*/ false));
-              if (res.fail()) {
-                return false;
-              }
-              res.reset(state->addCollection(theEdge->getToCid(), "_to_" + cname,
-                                             mode, /*lockUsage*/ false));
-              if (res.fail()) {
-                return false;
+              if (!col->isDisjoint()) {
+                res.reset(state->addCollection(theEdge->getFromCid(), "_from_" + cname,
+                                               mode, /*lockUsage*/ false));
+                if (res.fail()) {
+                  return false;
+                }
+                res.reset(state->addCollection(theEdge->getToCid(), "_to_" + cname,
+                                               mode, /*lockUsage*/ false));
+                if (res.fail()) {
+                  return false;
+                }
               }
             }
           } catch (basics::Exception const& ex) {
