LCS: get rid of STOREIDX option. Fix get keys helper.

2 files changed, 20 insertions, 21 deletions

diff --git a/src/db.c b/src/db.c
index bfa39564e..e9e10aeeb 100644
--- a/src/db.c
+++ b/src/db.c
@@ -1554,30 +1554,30 @@ int *georadiusGetKeys(struct redisCommand *cmd, robj **argv, int argc, int *numk
     return keys;
 }
 
-/* LCS ... [STOREIDX <key>] ... */
+/* LCS ... [KEYS <key1> <key2>] ... */
 int *lcsGetKeys(struct redisCommand *cmd, robj **argv, int argc, int *numkeys)
 {
     int i;
-    int *keys;
+    int *keys = getKeysTempBuffer;
     UNUSED(cmd);
 
     /* We need to parse the options of the command in order to check for the
-     * "STOREIDX" argument before the STRINGS argument. */
+     * "KEYS" argument before the "STRINGS" argument. */
     for (i = 1; i < argc; i++) {
         char *arg = argv[i]->ptr;
         int moreargs = (argc-1) - i;
 
         if (!strcasecmp(arg, "strings")) {
             break;
-        } else if (!strcasecmp(arg, "storeidx") && moreargs) {
-            keys = getKeysTempBuffer;
+        } else if (!strcasecmp(arg, "keys") && moreargs >= 2) {
             keys[0] = i+1;
-            *numkeys = 1;
+            keys[1] = i+2;
+            *numkeys = 2;
             return keys;
         }
     }
     *numkeys = 0;
-    return NULL;
+    return keys;
 }
 
 /* Helper function to extract keys from memory command.
diff --git a/src/t_string.c b/src/t_string.c
index 80cdbb5e1..deba22253 100644
--- a/src/t_string.c
+++ b/src/t_string.c
@@ -482,14 +482,13 @@ void strlenCommand(client *c) {
 
 /* LCS -- Longest common subsequence.
  *
- * LCS [IDX] [STOREIDX <key>] [MINMATCHLEN <len>]
+ * LCS [IDX] [MINMATCHLEN <len>]
  *     STRINGS <string> <string> | KEYS <keya> <keyb> */
 void lcsCommand(client *c) {
     uint32_t i, j;
     long long minmatchlen = 0;
     sds a = NULL, b = NULL;
     int getlen = 0, getidx = 0, withmatchlen = 0;
-    robj *idxkey = NULL; /* STOREIDX will set this and getidx to 1. */
     robj *obja = NULL, *objb = NULL;
 
     for (j = 1; j < (uint32_t)c->argc; j++) {
@@ -502,17 +501,16 @@ void lcsCommand(client *c) {
             getlen = 1;
         } else if (!strcasecmp(opt,"WITHMATCHLEN")) {
             withmatchlen = 1;
-        } else if (!strcasecmp(opt,"STOREIDX") && moreargs) {
-            getidx = 1;
-            idxkey = c->argv[j+1];
-            j++;
         } else if (!strcasecmp(opt,"MINMATCHLEN") && moreargs) {
             if (getLongLongFromObjectOrReply(c,c->argv[j+1],&minmatchlen,NULL)
                 != C_OK) return;
             if (minmatchlen < 0) minmatchlen = 0;
             j++;
         } else if (!strcasecmp(opt,"STRINGS")) {
-            if (moreargs != 2) {
+            if (a != NULL) {
+                addReplyError(c,"Either use STRINGS or KEYS");
+                return;
+            } else if (moreargs != 2) {
                 addReplyError(c,"LCS requires exactly two strings");
                 return;
             }
@@ -520,7 +518,10 @@ void lcsCommand(client *c) {
             b = c->argv[j+2]->ptr;
             j += 2;
         } else if (!strcasecmp(opt,"KEYS")) {
-            if (moreargs != 2) {
+            if (a != NULL) {
+                addReplyError(c,"Either use STRINGS or KEYS");
+                return;
+            } else if (moreargs != 2) {
                 addReplyError(c,"LCS requires exactly two keys");
                 return;
             }
@@ -542,12 +543,10 @@ void lcsCommand(client *c) {
         addReplyError(c,"Please specify two strings: "
                         "STRINGS or KEYS options are mandatory");
         return;
-    } else if (getlen && (getidx && idxkey == NULL)) {
+    } else if (getlen && getidx) {
         addReplyError(c,
-            "If you want both the LEN and indexes, please "
-            "store the indexes into a key with STOREIDX. However note "
-            "that the IDX output also includes both the LCS string and "
-            "its length");
+            "If you want both the length and indexes, please "
+            "just use IDX.");
         return;
     }
 
@@ -602,7 +601,7 @@ void lcsCommand(client *c) {
 
     /* Start with a deferred array if we have to emit the ranges. */
     uint32_t arraylen = 0;  /* Number of ranges emitted in the array. */
-    if (getidx && idxkey == NULL) {
+    if (getidx) {
         addReplyMapLen(c,2);
         addReplyBulkCString(c,"matches");
         arraylenptr = addReplyDeferredLen(c);