gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

redis-cli add control on raw format line delimiter (#7841)

Browse Source 
Adding -D option for redis-cli to control newline between command
responses in raw mode.

Also removing cleanup code before calling exit, just in order
to avoid adding more adding more cleanup code (redis doesn't
bother to release allocations before exit anyway)

Co-authored-by: Oran Agra <oran@redislabs.com>
(cherry picked from commit 6418d767e86b6fd98ba79253108b2e53966a04b3)
This commit is contained in:
DvirDukhan 2020-10-04 17:18:17 +03:00 committed by Oran Agra
parent 12055ed8c2
commit 93b4c6b31e
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/redis-cli.c
View File

@ -237,6 +237,7 @@ static struct config {
char *user; char *user;
int output; /* output mode, see OUTPUT_* defines */ int output; /* output mode, see OUTPUT_* defines */
sds mb_delim; sds mb_delim;
sds cmd_delim;
char prompt[128]; char prompt[128];
char *eval; char *eval;
int eval_ldb; int eval_ldb;
@ -1251,7 +1252,7 @@ static int cliReadReply(int output_raw_strings) {
} else { } else {
if (config.output == OUTPUT_RAW) { if (config.output == OUTPUT_RAW) {
out = cliFormatReplyRaw(reply); out = cliFormatReplyRaw(reply);
out = sdscat(out,"\n"); out = sdscatsds(out, config.cmd_delim);
} else if (config.output == OUTPUT_STANDARD) { } else if (config.output == OUTPUT_STANDARD) {
out = cliFormatReplyTTY(reply,""); out = cliFormatReplyTTY(reply,"");
} else if (config.output == OUTPUT_CSV) { } else if (config.output == OUTPUT_CSV) {
@ -1533,6 +1534,9 @@ static int parseOptions(int argc, char **argv) {
} else if (!strcmp(argv[i],"-d") && !lastarg) { } else if (!strcmp(argv[i],"-d") && !lastarg) {
sdsfree(config.mb_delim); sdsfree(config.mb_delim);
config.mb_delim = sdsnew(argv[++i]); config.mb_delim = sdsnew(argv[++i]);
} else if (!strcmp(argv[i],"-D") && !lastarg) {
sdsfree(config.cmd_delim);
config.cmd_delim = sdsnew(argv[++i]);
} else if (!strcmp(argv[i],"--verbose")) { } else if (!strcmp(argv[i],"--verbose")) {
config.verbose = 1; config.verbose = 1;
} else if (!strcmp(argv[i],"--cluster") && !lastarg) { } else if (!strcmp(argv[i],"--cluster") && !lastarg) {
@ -1726,7 +1730,8 @@ static void usage(void) {
" -n <db> Database number.\n" " -n <db> Database number.\n"
" -3 Start session in RESP3 protocol mode.\n" " -3 Start session in RESP3 protocol mode.\n"
" -x Read last argument from STDIN.\n" " -x Read last argument from STDIN.\n"
" -d <delimiter> Multi-bulk delimiter in for raw formatting (default: \\n).\n" " -d <delimiter> Delimiter between response bulks for raw formatting (default: \\n).\n"
" -D <delimiter> Delimiter between responses for raw formatting (default: \\n).\n"
" -c Enable cluster mode (follow -ASK and -MOVED redirections).\n" " -c Enable cluster mode (follow -ASK and -MOVED redirections).\n"
#ifdef USE_OPENSSL #ifdef USE_OPENSSL
" --tls Establish a secure TLS connection.\n" " --tls Establish a secure TLS connection.\n"
@ -5360,8 +5365,6 @@ static void clusterManagerMode(clusterManagerCommandProc *proc) {
exit(0); exit(0);
cluster_manager_err: cluster_manager_err:
freeClusterManager(); freeClusterManager();
sdsfree(config.hostip);
sdsfree(config.mb_delim);
exit(1); exit(1);
} }
@ -8118,6 +8121,7 @@ int main(int argc, char **argv) {
else else
config.output = OUTPUT_STANDARD; config.output = OUTPUT_STANDARD;
config.mb_delim = sdsnew("\n"); config.mb_delim = sdsnew("\n");
config.cmd_delim = sdsnew("\n");
firstarg = parseOptions(argc,argv); firstarg = parseOptions(argc,argv);
argc -= firstarg; argc -= firstarg;
@ -8141,8 +8145,6 @@ int main(int argc, char **argv) {
if (CLUSTER_MANAGER_MODE()) { if (CLUSTER_MANAGER_MODE()) {
clusterManagerCommandProc *proc = validateClusterManagerCommand(); clusterManagerCommandProc *proc = validateClusterManagerCommand();
if (!proc) { if (!proc) {
sdsfree(config.hostip);
sdsfree(config.mb_delim);
exit(1); exit(1);
} }
clusterManagerMode(proc); clusterManagerMode(proc);