clean up unused flags

arangodb · jsteemann · Sep 20, 2021 · Aug 3, 2021 · Aug 3, 2021 · Aug 3, 2021
commit 7f42f94b80db5ef33677af439dca8c47e5dc19c9
diff --git a/arangod/RestServer/DatabaseFeature.cpp b/arangod/RestServer/DatabaseFeature.cpp
@@ -290,9 +290,6 @@ DatabaseFeature::DatabaseFeature(application_features::ApplicationServer& server
       _checkVersion(false),
       _upgrade(false),
       _extendedNamesForDatabases(false),
-      _extendedNamesForCollections(false),
-      _extendedNamesForViews(false),
-      _extendedNamesForAnalyzers(false),
       _databasesLists(new DatabasesLists()),
       _started(false) {
   setOptional(false);
@@ -338,24 +335,6 @@ void DatabaseFeature::collectOptions(std::shared_ptr<ProgramOptions> options) {
                      arangodb::options::makeDefaultFlags(ara
8000
ngodb::options::Flags::Hidden, arangodb::options::Flags::Experimental))
                      .setIntroducedIn(30900);
 
-  options->addOption("--database.extended-names-collections",
-                     "allow extended characters in collection names",
-                     new BooleanParameter(&_extendedNamesForCollections),
-                     arangodb::options::makeDefaultFlags(arangodb::options::Flags::Hidden, arangodb::options::Flags::Experimental))
-                     .setIntroducedIn(30900);
-
-  options->addOption("--database.extended-names-views",
-                     "allow extended characters in view names",
-                     new BooleanParameter(&_extendedNamesForViews),
-                     arangodb::options::makeDefaultFlags(arangodb::options::Flags::Hidden, arangodb::options::Flags::Experimental))
-                     .setIntroducedIn(30900);
-
-  options->addOption("--database.extended-names-analyzers",
-                     "allow extended characters in analyzer names",
-                     new BooleanParameter(&_extendedNamesForAnalyzers),
-                     arangodb::options::makeDefaultFlags(arangodb::options::Flags::Hidden, arangodb::options::Flags::Experimental))
-                     .setIntroducedIn(30900);
-
   // the following option was obsoleted in 3.9
   options->addObsoleteOption(
       "--database.old-system-collections",
@@ -399,24 +378,6 @@ void DatabaseFeature::validateOptions(std::shared_ptr<ProgramOptions> options) {
            "'--database.auto-upgrade'";
     FATAL_ERROR_EXIT();
   }
-
-  if (_extendedNamesForCollections) {
-    LOG_TOPIC("b3703", FATAL, arangodb::Logger::FIXME)
-        << "extended names for collections are currently unsupported";
-    FATAL_ERROR_EXIT();
-  }
-
-  if (_extendedNamesForViews) {
-    LOG_TOPIC("cdf24", FATAL, arangodb::Logger::FIXME)
-        << "extended names for views are currently unsupported";
-    FATAL_ERROR_EXIT();
-  }
-
-  if (_extendedNamesForAnalyzers) {
-    LOG_TOPIC("29889", FATAL, arangodb::Logger::FIXME)
-        << "extended names for analyzers are currently unsupported";
-    FATAL_ERROR_EXIT();
-  }
 }
 
 void DatabaseFeature::initCalculationVocbase(application_features::ApplicationServer& server) {

diff --git a/arangod/RestServer/DatabaseFeature.h b/arangod/RestServer/DatabaseFeature.h
@@ -140,13 +140,19 @@ class DatabaseFeature : public application_features::ApplicationFeature {
   bool forceSyncProperties() const { return _forceSyncProperties; }
   void forceSyncProperties(bool value) { _forceSyncProperties = value; }
   bool waitForSync() const { return _defaultWaitForSync; }
+
+  /// @brief whether or not extended names for databases can be used
   bool extendedNamesForDatabases() const { return _extendedNamesForDatabases; }
-  bool extendedNamesForCollections() const { return _extendedNamesForCollections; }
-  bool extendedNamesForViews() const { return _extendedNamesForViews; }
-  bool extendedNamesForAnalyzers() const { return _extendedNamesForAnalyzers; }
-  // will be called during startup when reading stored value from storage engine
+  /// @brief will be called only during startup when reading stored value from storage engine
   void extendedNamesForDatabases(bool value) { _extendedNamesForDatabases = value; }
 
+  /// @brief currently always false, until feature is implemented
+  bool extendedNamesForCollections() const { return false; }
+  /// @brief currently always false, until feature is implemented
+  bool extendedNamesForViews() const { return false; }
+  /// @brief currently always false, until feature is implemented
+  bool extendedNamesForAnalyzers() const { return false; }
+
   void enableCheckVersion() { _checkVersion = true; }
   void enableUpgrade() { _upgrade = true; }
   void disableUpgrade() { _upgrade = false; }
@@ -193,10 +199,8 @@ class DatabaseFeature : public application_features::ApplicationFeature {
   bool _checkVersion;
   bool _upgrade;
 
+  /// @brief whether or not the allow extended database names
   bool _extendedNamesForDatabases;
-  bool _extendedNamesForCollections;
-  bool _extendedNamesForViews;
-  bool _extendedNamesForAnalyzers;
 
   std::unique_ptr<DatabaseManagerThread> _databaseManager;