attempt to make use of single server sg collection creation

arangodb · mchacki · Nov 17, 2021 · Sep 15, 2021 · Sep 15, 2021 · Sep 15, 2021
commit 98ec561ad858f25c03fa480dbf0dea907a2f3458
diff --git a/arangod/Graph/GraphManager.cpp b/arangod/Graph/GraphManager.cpp
@@ -632,7 +632,12 @@ Result GraphManager::ensureCollections(
   std::vector<std::shared_ptr<LogicalCollection>> created;
   OperationOptions opOptions(ExecContext::current());
 
+#ifdef USE_ENTERPRISE
   const bool sssg = ServerState::instance()->isSingleServer() && graph.isSmart();
+#else
+  const bool sssg = false;
+#endif
+
 
   Result finalResult = methods::Collections::create(ctx()->vocbase(), opOptions,
                                                     collectionsToCreate.get(), waitForSync,

diff --git a/arangod/VocBase/Methods/Collections.cpp b/arangod/VocBase/Methods/Collections.cpp
@@ -65,6 +65,10 @@
 #include <velocypack/Iterator.h>
 #include <velocypack/velocypack-aliases.h>
 
+#ifdef USE_ENTERPRISE
+#include "Enterprise/VocBase/Methods/CollectionValidatorEE.h"
+#endif
+
 #include <unordered_set>
 
 using namespace arangodb;
@@ -436,7 +440,25 @@ Result Collections::create(TRI_vocbase_t& vocbase, OperationOptions const& optio
         return Result(TRI_ERROR_INTERNAL, "createCollectionsOnCoordinator");
       }
     } else if (isSingleServerSmartGraph) {
+#ifdef USE_ENTERPRISE
       // todo: add comment to describe that section && implement
+      TRI_ASSERT(ServerState::instance()->isSingleServer());
+      TRI_ASSERT(infoSlice.isArray());
+
+      auto res =
+          enterprise::CollectionValidatorEE::createLogicalCollections(infoSlice, collections,
+                                                                      vocbase);
+      if (res.fail()) {
+        THROW_ARANGO_EXCEPTION(res);
+      }
+
+      for (auto& col : collections) {
+        TRI_ASSERT(col != nullptr);
+        vocbase.persistCollection(col);
+      }
+#else
+      THROW_ARANGO_EXCEPTION(TRI_ERROR_NOT_IMPLEMENTED);
+#endif
     } else {
       TRI_ASSERT(ServerState::instance()->isSingleServer());
       // Here we do have a single server setup. In that case, we're not batching collection creating.
@@ -761,7 +783,7 @@ Result Collections::rename(LogicalCollection& collection,
                               "non-system collection name or vice versa");
     }
 
-    bool extendedNames = collection.vocbase().server().getFea
9E12
ture<DatabaseFeature>().extendedNamesForCollections(); 
+    bool extendedNames = collection.vocbase().server().getFeature<DatabaseFeature>().extendedNamesForCollections();
     if (!CollectionNameValidator::isAllowedName(isSystem, extendedNames, newName)) {
       return TRI_ERROR_ARANGO_ILLEGAL_NAME;
     }
@@ -839,9 +861,9 @@ static Result DropVocbaseColCoordinator(arangodb::LogicalCollection* collection,
     res = coll.vocbase().dropCollection(coll.id(), allowDropSystem, timeout);
   }
 
-  LOG_TOPIC_IF("1bf4d", WARN, Logger::ENGINES, 
-               res.fail() && 
-               res.isNot(TRI_ERROR_FORBIDDEN) && 
+  LOG_TOPIC_IF("1bf4d", WARN, Logger::ENGINES,
+               res.fail() &&
+               res.isNot(TRI_ERROR_FORBIDDEN) &&
                res.isNot(TRI_ERROR_ARANGO_DATA_SOURCE_NOT_FOUND) &&
                res.isNot(TRI_ERROR_ARANGO_DATABASE_NOT_FOUND))
     << "error while dropping collection: '" << collName

diff --git a/arangod/VocBase/vocbase.cpp b/arangod/VocBase/vocbase.cpp
@@ -566,6 +566,7 @@ bool TRI_vocbase_t::unregisterView(arangodb::LogicalView const& view) {
 
 /// @brief creates a new collection, worker function
 std::shared_ptr<arangodb::LogicalCollection> TRI_vocbase_t::createCollectionWorker(VPackSlice parameters) {
+  // todo: validate collection name properly (!)
   std::string const name =
       arangodb::basics::VelocyPackHelper::getStringValue(parameters, StaticStrings::DataSourceName, "");
   TRI_ASSERT(!name.empty());
@@ -574,13 +575,17 @@ std::shared_ptr<arangodb::LogicalCollection> TRI_vocbase_t::createCollectionWork
   auto collection =
       std::make_shared<arangodb::LogicalCollection>(*this, parameters, false);
 
+  return persistCollection(collection);
+}
+
+std::shared_ptr<arangodb::LogicalCollection> TRI_vocbase_t::persistCollection(std::shared_ptr<arangodb::LogicalCollection>& collection){
   RECURSIVE_WRITE_LOCKER(_dataSourceLock, _dataSourceLockWriteOwner);
 
   // reserve room for the new collection
   arangodb::containers::Helpers::reserveSpace(_collections, 8);
   arangodb::containers::Helpers::reserveSpace(_deadCollections, 8);
 
-  auto it = _dataSourceByName.find(name);
+  auto it = _dataSourceByName.find(collection->name());
 
   if (it != _dataSourceByName.end()) {
     THROW_ARANGO_EXCEPTION(TRI_ERROR_ARANGO_DUPLICATE_NAME);

diff --git a/arangod/VocBase/vocbase.h b/arangod/VocBase/vocbase.h
@@ -367,6 +367,8 @@ struct TRI_vocbase_t {
   typedef std::function<bool(arangodb::LogicalDataSource& dataSource)> dataSourceVisitor;
   bool visitDataSources(dataSourceVisitor const& visitor);
 
+  std::shared_ptr<arangodb::LogicalCollection> persistCollection(std::shared_ptr<arangodb::LogicalCollection>& collection);
+
  private:
   /// @brief callback for collection dropping
   static bool dropCollectionCallback(arangodb::LogicalCollection& collection);