db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2024-12-04 09:43:08 +02:00
Code Issues Releases Activity

Improve command/role parsing.

Browse Source 
Reduce redundancy by improving cfgParseCommandId() to work when a command role is present. This way the function does not need to be called twice.

Also, remove the use of StringList in cfgParse() since checking for a colon is faster and saves memory allocations. Modify cfgParseCommandRoleEnum() to accept char * since a String is no longer produced for the role name.
This commit is contained in:
David Steele 2024-07-09 16:07:40 +07:00
parent ccae609402
commit d295156dd3
2 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/config/parse.c
View File

@ -380,14 +380,22 @@ cfgParseCommandId(const char *const commandName)
ASSERT(commandName != NULL);
// If command has a colon only search part before the colon
const char *const colonPtr = strchr(commandName, ':');
const size_t commandSize = colonPtr == NULL ? (size_t)strlen(commandName) : (size_t)(colonPtr - commandName);
// Get command
ConfigCommand commandId;
for (commandId = 0; commandId < CFG_COMMAND_TOTAL; commandId++)
{
if (strcmp(commandName, parseRuleCommand[commandId].name) == 0)
if (strncmp(commandName, parseRuleCommand[commandId].name, commandSize) == 0)
break;
}
if (commandId == CFG_COMMAND_TOTAL)
THROW_FMT(CommandInvalidError, "invalid command '%s'", commandName);
FUNCTION_TEST_RETURN(ENUM, commandId);
}
@ -412,22 +420,22 @@ STRING_STATIC(CONFIG_COMMAND_ROLE_LOCAL_STR, CONFIG_COMMA
STRING_STATIC(CONFIG_COMMAND_ROLE_REMOTE_STR, CONFIG_COMMAND_ROLE_REMOTE);
static ConfigCommandRole
cfgParseCommandRoleEnum(const String *const commandRole)
cfgParseCommandRoleEnum(const char *const commandRole)
{
FUNCTION_TEST_BEGIN();
FUNCTION_TEST_PARAM(STRING, commandRole);
FUNCTION_TEST_PARAM(STRINGZ, commandRole);
FUNCTION_TEST_END();
if (commandRole == NULL)
FUNCTION_TEST_RETURN(ENUM, cfgCmdRoleMain);
else if (strEq(commandRole, CONFIG_COMMAND_ROLE_ASYNC_STR))
else if (strEqZ(CONFIG_COMMAND_ROLE_ASYNC_STR, commandRole))
FUNCTION_TEST_RETURN(ENUM, cfgCmdRoleAsync);
else if (strEq(commandRole, CONFIG_COMMAND_ROLE_LOCAL_STR))
else if (strEqZ(CONFIG_COMMAND_ROLE_LOCAL_STR, commandRole))
FUNCTION_TEST_RETURN(ENUM, cfgCmdRoleLocal);
else if (strEq(commandRole, CONFIG_COMMAND_ROLE_REMOTE_STR))
else if (strEqZ(CONFIG_COMMAND_ROLE_REMOTE_STR, commandRole))
FUNCTION_TEST_RETURN(ENUM, cfgCmdRoleRemote);
THROW_FMT(CommandInvalidError, "invalid command role '%s'", strZ(commandRole));
THROW_FMT(CommandInvalidError, "invalid command role '%s'", commandRole);
}
FN_EXTERN const String *
@ -1810,39 +1818,29 @@ cfgParse(const Storage *const storage, const unsigned int argListSize, const cha
{
// Try getting the command from the valid command list
config->command = cfgParseCommandId(arg);
config->commandRole = cfgCmdRoleMain;
// If not successful then a command role may be appended
if (config->command == cfgCmdNone)
{
const StringList *commandPart = strLstNewSplitZ(STR(arg), ":");
if (strLstSize(commandPart) == 2)
{
// Get command id
config->command = cfgParseCommandId(strZ(strLstGet(commandPart, 0)));
// If command id is valid then get command role id
if (config->command != cfgCmdNone)
config->commandRole = cfgParseCommandRoleEnum(strLstGet(commandPart, 1));
}
}
// Error when command does not exist
if (config->command == cfgCmdNone)
THROW_FMT(CommandInvalidError, "invalid command '%s'", arg);
// Error when role is not valid for the command
if (!(parseRuleCommand[config->command].commandRoleValid & ((unsigned int)1 << config->commandRole)))
THROW_FMT(CommandInvalidError, "invalid command/role combination '%s'", arg);
// Set help if help command
if (config->command == cfgCmdHelp && !config->help)
{
config->command = cfgCmdNone;
config->help = true;
}
// Else parse command role if appended
else
{
const char *const colonPtr = strchr(arg, ':');
if (colonPtr != NULL)
config->commandRole = cfgParseCommandRoleEnum(colonPtr + 1);
else
config->commandRole = cfgCmdRoleMain;
// Error when role is not valid for the command
if (!(parseRuleCommand[config->command].commandRoleValid & ((unsigned int)1 << config->commandRole)))
THROW_FMT(CommandInvalidError, "invalid command/role combination '%s'", arg);
commandSet = true;
}
}
// Additional arguments are command arguments
else

4
test/src/module/config/parseTest.c
View File

@ -1690,7 +1690,7 @@ testRun(void)
TEST_RESULT_BOOL(cfgLockRemoteRequired(), true, "backup command requires remote lock");
TEST_RESULT_STRLST_Z(cfgCommandParam(), NULL, "check command arguments");
TEST_RESULT_UINT(cfgParseCommandRoleEnum(NULL), cfgCmdRoleMain, "command role main enum");
TEST_ERROR(cfgParseCommandRoleEnum(STRDEF("bogus")), CommandInvalidError, "invalid command role 'bogus'");
TEST_ERROR(cfgParseCommandRoleEnum("bogus"), CommandInvalidError, "invalid command role 'bogus'");
TEST_RESULT_INT(cfgCommandRole(), cfgCmdRoleMain, "command role is main");
TEST_RESULT_STR_Z(cfgCommandRoleName(), "backup", "command/role name is backup");
TEST_RESULT_STR_Z(cfgParseCommandRoleStr(cfgCmdRoleMain), NULL, "main role name is NULL");
@ -1920,7 +1920,7 @@ testRun(void)
// -------------------------------------------------------------------------------------------------------------------------
TEST_TITLE("set command to expire");
TEST_RESULT_VOID(cfgCommandSet(cfgCmdExpire, cfgParseCommandRoleEnum(STRDEF("async"))), "set command");
TEST_RESULT_VOID(cfgCommandSet(cfgCmdExpire, cfgParseCommandRoleEnum("async")), "set command");
TEST_RESULT_STR_Z(cfgCommandRoleName(), "expire:async", "command/role name is expire:async");
// -------------------------------------------------------------------------------------------------------------------------