Use new section keys instead of specifiers

Author: Artyom Abakumov

src/common/config/config_file.cpp

@@ -961,3 +961,37 @@ bool ConfigFile::Parameter::asBoolean() const
 		value.equalsNoCase("yes") ||
 		value.equalsNoCase("y");
 }
+
+/******************************************************************************
+ *
+ *	Parse name as a section key
+ */
+
+ConfigFile::SectionType ConfigFile::Parameter::parseSectionKey() const
+{
+	if (name == "database")
+	{
+		return SectionType::DATABASE;
+	}
+	else if (name == "databaseName")
+	{
+		return SectionType::DATABASE_NAME;
+	}
+	else if (name == "databaseRegex")
+	{
+		return SectionType::DATABASE_REGEX;
+	}
+	else if (name == "service")
+	{
+		return SectionType::SERVICE;
+	}
+	else
+	{
+		fatal_exception::raiseFmt("error while parsing trace configuration\n\t"
+			"line %d: wrong section header, \"database\", \"databaseName\", \"databaseRegex\" or \"service\" is expected",
+			line);
+
+		// Return something to calm down the compiler
+		return SectionType::DATABASE;
+	}
+}

src/common/config/config_file.h

@@ -75,6 +75,15 @@ class ConfigFile : public Firebird::AutoStorage, public Firebird::RefCounted
 		virtual const char* getFileName() const = 0;
 	};
 
+	// Possible section types
+	enum class SectionType
+	{
+		DATABASE,
+		DATABASE_NAME,
+		DATABASE_REGEX,
+		SERVICE
+	};
+
 	struct Parameter : public AutoStorage
 	{
 		Parameter(MemoryPool& p, const Parameter& par)
@@ -87,6 +96,7 @@ class ConfigFile : public Firebird::AutoStorage, public Firebird::RefCounted
 
 		SINT64 asInteger() const;
 		bool asBoolean() const;
+		SectionType parseSectionKey() const;
 
 		KeyType name;
 		String value;

src/utilities/ntrace/TraceConfiguration.cpp

@@ -70,15 +70,6 @@ void TraceCfgReader::readTraceConfiguration(const char* text,
 
 #define ERROR_PREFIX "error while parsing trace configuration\n\t"
 
-enum class AliasType
-{
-	DETECT,
-	NAME,
-	REGEX
-};
-inline constexpr std::string_view REGEX_PREFIX = "regex ";
-inline constexpr std::string_view NAME_PREFIX = "name ";
-
 void TraceCfgReader::readConfig()
 {
 	ConfigFile cfgFile(ConfigFile::USE_TEXT, m_text, ConfigFile::HAS_SUB_CONF | ConfigFile::NATIVE_ORDER
@@ -98,12 +89,8 @@ void TraceCfgReader::readConfig()
 	{
 		const ConfigFile::Parameter* section = &params[n];
 
-		const bool isDatabase = (section->name == "database");
-		if (!isDatabase && section->name != "services")
-			//continue;
-			fatal_exception::raiseFmt(ERROR_PREFIX
-				"line %d: wrong section header, \"database\" or \"service\" is expected",
-				section->line);
+		const ConfigFile::SectionType sectionType = section->parseSectionKey();
+		const bool isDatabase = sectionType != ConfigFile::SectionType::SERVICE;
 
 		const ConfigFile::String pattern = section->value;
 		bool match = false;
@@ -136,39 +123,18 @@ void TraceCfgReader::readConfig()
 		}
 		else if (isDatabase && !m_databaseName.empty())
 		{
-			PathName noQuotePattern;
-
-			AliasType specifier = AliasType::DETECT;
-			const std::string_view patternView(pattern.data(), pattern.length());
-
-			// Check for "name" or "regex" specific in the path.
-			// Compare path in both ways if specifier is not specified
-			if (patternView.find_first_of(REGEX_PREFIX) == 0)
-			{
-				noQuotePattern.assign(pattern.data() + REGEX_PREFIX.length());
-				specifier = AliasType::REGEX;
-			}
-			else if (patternView.find_first_of(NAME_PREFIX) == 0)
-			{
-				noQuotePattern.assign(pattern.data() + NAME_PREFIX.length());
-				specifier = AliasType::NAME;
-			}
-			else
-			{
-				noQuotePattern = pattern.ToPathName();
-			}
-
+			PathName noQuotePattern = pattern.ToPathName();
 			noQuotePattern.alltrim(" '\'");
 			PathName expandedName;
 
-			if (specifier != AliasType::REGEX && (m_databaseName == noQuotePattern ||
+			if (sectionType != ConfigFile::SectionType::DATABASE_REGEX && (m_databaseName == noQuotePattern ||
 				(expandDatabaseName(noQuotePattern, expandedName, nullptr),
 				m_databaseName == expandedName) ))
 			{
 				// Compare by name
 				match = exactMatch = true;
 			}
-			else if (specifier != AliasType::NAME)
+			else if (sectionType != ConfigFile::SectionType::DATABASE_NAME)
 			{
 				// Compare by regex
 				bool regExpOk = false;

src/utilities/ntrace/fbtrace.conf

@@ -27,9 +27,9 @@
 #
 # It is also possible to specify exactly what type of database string is expected
 # For example:
-#	database = name /var/dbs/primary-db.fdb
+#	databaseName = /var/dbs/primary-db.fdb
 # type
-#	database = regex (%[\\/](e[[:DIGIT:]]{{2}}).fdb)
+#	databaseRegex = (%[\\/](e[[:DIGIT:]]{{2}}).fdb)
 
 
 database