added basic implementation of type detection in edge definitions

arangodb · mchacki · Apr 22, 2021 · Apr 16, 2021 · Apr 19, 2021 · Apr 20, 2021
commit d5bc06b7d0015b26a9e24e8ec7fd6b0bd2cbcd04
diff --git a/arangod/Graph/Graph.cpp b/arangod/Graph/Graph.cpp
@@ -425,7 +425,7 @@ void EdgeDefinition::toVelocyPack(VPackBuilder& builder) const {
   builder.add("type", VPackValue(getType()));
 }
 
-ResultT<EdgeDefinition> EdgeDefinition::createFromVelocypack(VPackSlice edgeDefinition) {
+ResultT<EdgeDefinition> EdgeDefinition::createFromVelocypack(VPackSlice edgeDefinition, std::set<std::string> const& satCollections) {
   Result res = EdgeDefinition::validateEdgeDefinition(edgeDefinition);
   if (res.fail()) {
     return res;
@@ -436,15 +436,40 @@ ResultT<EdgeDefinition> EdgeDefinition::createFromVelocypack(VPackSlice edgeDefi
 
   std::set<std::string> fromSet;
   std::set<std::string> toSet;
+  EdgeDefinitionType type = EdgeDefinitionType::DEFAULT;
+  bool foundFromSat = false;
+  bool foundToSat = false;
 
   // duplicates in from and to shouldn't occur, but are safely ignored here
   for (VPackSlice it : VPackArrayIterator(from)) {
+    TRI_ASSERT(it.isString());
+    if (satCollections.find(it.copyString()) != satCollections.end()) {
+      // found a sat collection defined in from's
+      foundFromSat = true;
+    }
+
     fromSet.emplace(it.copyString());
   }
   for (VPackSlice it : VPackArrayIterator(to)) {
+    TRI_ASSERT(it.isString());
+    if (satCollections.find(it.copyString()) != satCollections.end()) {
+      // found a sat collection defined in to's
+      foundToSat = true;
+    }
+
     toSet.emplace(it.copyString());
   }
 
+  if (foundFromSat && !foundToSat) {
+    type = EdgeDefinitionType::SATTOSMART;
+  } else if (!foundFromSat && foundToSat) {
+    type = EdgeDefinitionType::SMARTTOSAT;
+  }  else if (foundFromSat && foundToSat) {
+    type = EdgeDefinitionType::SATTOSAT;
+  } else if (!foundFromSat && !foundToSat) {
+    type = EdgeDefinitionType::SMARTTOSMART;
+  }
+
   // We do not allow creating an edge definition with either an empty from
   // or an empty to set
   if (fromSet.size() == 0 || toSet.size() == 0) {
@@ -609,7 +634,7 @@ ResultT<EdgeDefinition const*> Graph::addEdgeDefinition(EdgeDefinition const& ed
 }
 
 ResultT<EdgeDefinition const*> Graph::addEdgeDefinition(VPackSlice const& edgeDefinitionSlice) {
-  auto res = EdgeDefinition::createFromVelocypack(edgeDefinitionSlice);
+  auto res = EdgeDefinition::createFromVelocypack(edgeDefinitionSlice, satelliteCollections());
 
   if (res.fail()) {
     return std::move(res).result();

diff --git a/arangod/Graph/Graph.h b/arangod/Graph/Graph.h
@@ -81,7 +81,7 @@ class EdgeDefinition {
   /// types of values.
   static Result validateEdgeDefinition(const velocypack::Slice& edgeDefinition);
 
-  static ResultT<EdgeDefinition> createFromVelocypack(velocypack::Slice edgeDefinition);
+  static ResultT<EdgeDefinition> createFromVelocypack(velocypack::Slice edgeDefinition, std::set<std::string> const& satCollections);
 
   void toVelocyPack(velocypack::Builder&) const;
 

diff --git a/arangod/Graph/GraphOperations.cpp b/arangod/Graph/GraphOperations.cpp
@@ -226,7 +226,7 @@ OperationResult GraphOperations::editEdgeDefinition(VPackSlice edgeDefinitionSli
                                                     bool waitForSync,
                                                     std::string const& edgeDefinitionName) {
   OperationOptions options(ExecContext::current());
-  auto maybeEdgeDef = EdgeDefinition::createFromVelocypack(edgeDefinitionSlice);
+  auto maybeEdgeDef = EdgeDefinition::createFromVelocypack(edgeDefinitionSlice, graph().satelliteCollections());
   if (!maybeEdgeDef) {
     return OperationResult{std::move(maybeEdgeDef).result(), options};
   }