fix startup

arangod/StorageEngine/EngineSelectorFeature.cpp

@@ -46,24 +46,24 @@ void EngineSelectorFeature::collectOptions(std::shared_ptr<ProgramOptions> optio
 
   options->addHiddenOption("--server.storage-engine", 
                            "storage engine type",
-                           new DiscreteValuesParameter<StringParameter>(&_engine, availableEngines()));
+                           new DiscreteValuesParameter<StringParameter>(&_engine, availableEngineNames()));
 }
 
 void EngineSelectorFeature::prepare() {
   // deactivate all engines but the selected one
-  for (auto& engine : availableEngines()) {
+  for (auto const& engine : availableEngines()) {
-    StorageEngine* e = application_features::ApplicationServer::getFeature<StorageEngine>(engine);
+    StorageEngine* e = application_features::ApplicationServer::getFeature<StorageEngine>(engine.second);
 
-    if (engine == _engine) {
+    if (engine.first == _engine) {
       // this is the selected engine
-      LOG_TOPIC(TRACE, Logger::STARTUP) << "using storage engine " << engine;
+      LOG_TOPIC(TRACE, Logger::STARTUP) << "using storage engine " << engine.first;
       e->enable();
 
       // register storage engine
       ENGINE = e;
     } else {
       // turn off all other storage engines
-      LOG_TOPIC(TRACE, Logger::STARTUP) << "disabling storage engine " << engine;
+      LOG_TOPIC(TRACE, Logger::STARTUP) << "disabling storage engine " << engine.first;
       e->disable();
     }
   }
@@ -76,9 +76,19 @@ void EngineSelectorFeature::unprepare() {
   ENGINE = nullptr;
 }
 
+// return the names of all available storage engines
+std::unordered_set<std::string> EngineSelectorFeature::availableEngineNames() {
+  std::unordered_set<std::string> result;
+  for (auto const& it : availableEngines()) {
+    result.emplace(it.first);
+  }
+  return result; 
+}
+
 // return all available storage engines
-std::unordered_set<std::string> EngineSelectorFeature::availableEngines() { 
+std::unordered_map<std::string, std::string> EngineSelectorFeature::availableEngines() { 
-  return std::unordered_set<std::string>{
+  return std::unordered_map<std::string, std::string>{
-    MMFilesEngine::EngineName, RocksDBEngine::EngineName 
+    {MMFilesEngine::EngineName, MMFilesEngine::FeatureName},
+    {RocksDBEngine::EngineName, RocksDBEngine::FeatureName}
   };
 }

arangod/StorageEngine/EngineSelectorFeature.h

@@ -39,7 +39,10 @@ class EngineSelectorFeature final : public application_features::ApplicationFeat
   void unprepare() override final;
   
   // return the names of all available storage engines
-  static std::unordered_set<std::string> availableEngines();
+  static std::unordered_set<std::string> availableEngineNames();
+
+  // return all available storage engines
+  static std::unordered_map<std::string, std::string> availableEngines(); 
   
  public:
   // selected storage engine. this will contain a pointer to the storage engine after

arangod/StorageEngine/MMFilesEngine.cpp

@@ -115,11 +115,12 @@ struct DatabaseIdStringComparator {
 
 }
 
-std::string const MMFilesEngine::EngineName("MMFiles");
+std::string const MMFilesEngine::EngineName("mmfiles");
+std::string const MMFilesEngine::FeatureName("MMFilesEngine");
 
 // create the storage engine
 MMFilesEngine::MMFilesEngine(application_features::ApplicationServer* server)
-    : StorageEngine(server, EngineName),
+    : StorageEngine(server, EngineName, FeatureName),
       _isUpgrade(false),
       _maxTick(0) {
 }

arangod/StorageEngine/MMFilesEngine.h

@@ -330,6 +330,7 @@ class MMFilesEngine final : public StorageEngine {
 
  public:
   static std::string const EngineName;
+  static std::string const FeatureName;
 
  private:
   std::string _basePath;

arangod/StorageEngine/RocksDBEngine.cpp

@@ -47,11 +47,12 @@
 using namespace arangodb;
 using namespace arangodb::basics;
 
-std::string const RocksDBEngine::EngineName("RocksDB");
+std::string const RocksDBEngine::EngineName("rocksdb");
+std::string const RocksDBEngine::FeatureName("RocksDBEngine");
 
 // create the storage engine
 RocksDBEngine::RocksDBEngine(application_features::ApplicationServer* server)
-    : StorageEngine(server, EngineName) {
+    : StorageEngine(server, EngineName, FeatureName) {
 }
 
 RocksDBEngine::~RocksDBEngine() {

arangod/StorageEngine/RocksDBEngine.h

@@ -238,6 +238,7 @@ class RocksDBEngine final : public StorageEngine {
   
  public:
   static std::string const EngineName;
+  static std::string const FeatureName;
 
  private:
   std::string _basePath;

arangod/StorageEngine/StorageEngine.h

@@ -42,9 +42,9 @@ class StorageEngine : public application_features::ApplicationFeature {
  public:
 
   // create the storage engine
-  StorageEngine(application_features::ApplicationServer* server, std::string const& name) 
+  StorageEngine(application_features::ApplicationServer* server, std::string const& engineName, std::string const& featureName) 
-      : application_features::ApplicationFeature(server, name), _typeName(name) {
+      : application_features::ApplicationFeature(server, featureName), _typeName(engineName) {
- 
+
     // each specific storage engine feature is optional. the storage engine selection feature
     // will make sure that exactly one engine is selected at startup 
     setOptional(true);

arangod/V8Server/v8-collection.cpp

@@ -2816,6 +2816,7 @@ static void JS_DatafilesVocbaseCol(
 
   TRI_THROW_SHARDING_COLLECTION_NOT_YET_IMPLEMENTED(collection);
 
+  // TODO: move this into engine
   StorageEngine* engine = EngineSelectorFeature::ENGINE;
   if (std::string(engine->typeName()) != MMFilesEngine::EngineName) {
     TRI_V8_THROW_EXCEPTION_MESSAGE(TRI_ERROR_INTERNAL, "operation only supported in MMFiles engine");
@@ -2827,7 +2828,7 @@ static void JS_DatafilesVocbaseCol(
     TRI_V8_THROW_EXCEPTION(TRI_ERROR_ARANGO_COLLECTION_NOT_UNLOADED);
   }
 
-  MMFilesEngineCollectionFiles structure= dynamic_cast<MMFilesEngine*>(engine)->scanCollectionDirectory(collection->path());
+  MMFilesEngineCollectionFiles structure = dynamic_cast<MMFilesEngine*>(engine)->scanCollectionDirectory(collection->path());
 
   // build result
   v8::Handle<v8::Object> result = v8::Object::New(isolate);

arangod/Wal/LogfileManager.cpp

@@ -116,7 +116,7 @@ LogfileManager::LogfileManager(ApplicationServer* server)
   startsAfter("RevisionCache");
 
   for (auto const& it : EngineSelectorFeature::availableEngines()) {
-    startsAfter(it);
+    startsAfter(it.second);
   }
 }