caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-23 08:38:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add --user argument to redis-benchmark.c (ACL)

Browse Source
This commit is contained in:
Benjamin Sergeant 2020-05-04 08:09:21 -07:00 committed by GitHub
parent 70a80ef3ad
commit 538c2b2d8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/redis-benchmark.c
View File

@ -94,6 +94,7 @@ static struct config {
sds dbnumstr; sds dbnumstr;
char *tests; char *tests;
char *auth; char *auth;
const char *user;
int precision; int precision;
int num_threads; int num_threads;
struct benchmarkThread **threads; struct benchmarkThread **threads;
@ -258,7 +259,10 @@ static redisConfig *getRedisConfig(const char *ip, int port,
if(config.auth) { if(config.auth) {
void *authReply = NULL; void *authReply = NULL;
redisAppendCommand(c, "AUTH %s", config.auth); if (config.user == NULL)
redisAppendCommand(c, "AUTH %s", config.auth);
else
redisAppendCommand(c, "AUTH %s %s", config.user, config.auth);
if (REDIS_OK != redisGetReply(c, &authReply)) goto fail; if (REDIS_OK != redisGetReply(c, &authReply)) goto fail;
if (reply) freeReplyObject(reply); if (reply) freeReplyObject(reply);
reply = ((redisReply *) authReply); reply = ((redisReply *) authReply);
@ -628,7 +632,12 @@ static client createClient(char *cmd, size_t len, client from, int thread_id) {
c->prefix_pending = 0; c->prefix_pending = 0;
if (config.auth) { if (config.auth) {
char *buf = NULL; char *buf = NULL;
int len = redisFormatCommand(&buf, "AUTH %s", config.auth); int len;
if (config.user == NULL)
len = redisFormatCommand(&buf, "AUTH %s", config.auth);
else
len = redisFormatCommand(&buf, "AUTH %s %s",
config.user, config.auth);
c->obuf = sdscatlen(c->obuf, buf, len); c->obuf = sdscatlen(c->obuf, buf, len);
free(buf); free(buf);
c->prefix_pending++; c->prefix_pending++;
@ -1299,6 +1308,9 @@ int parseOptions(int argc, const char **argv) {
} else if (!strcmp(argv[i],"-a") ) { } else if (!strcmp(argv[i],"-a") ) {
if (lastarg) goto invalid; if (lastarg) goto invalid;
config.auth = strdup(argv[++i]); config.auth = strdup(argv[++i]);
} else if (!strcmp(argv[i],"--user")) {
if (lastarg) goto invalid;
config.user = argv[++i];
} else if (!strcmp(argv[i],"-d")) { } else if (!strcmp(argv[i],"-d")) {
if (lastarg) goto invalid; if (lastarg) goto invalid;
config.datasize = atoi(argv[++i]); config.datasize = atoi(argv[++i]);
@ -1385,6 +1397,7 @@ usage:
" -p <port> Server port (default 6379)\n" " -p <port> Server port (default 6379)\n"
" -s <socket> Server socket (overrides host and port)\n" " -s <socket> Server socket (overrides host and port)\n"
" -a <password> Password for Redis Auth\n" " -a <password> Password for Redis Auth\n"
" --user <username> Used to send ACL style 'AUTH username pass'. Needs -a.\n"
" -c <clients> Number of parallel connections (default 50)\n" " -c <clients> Number of parallel connections (default 50)\n"
" -n <requests> Total number of requests (default 100000)\n" " -n <requests> Total number of requests (default 100000)\n"
" -d <size> Data size of SET/GET value in bytes (default 3)\n" " -d <size> Data size of SET/GET value in bytes (default 3)\n"