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

LCS: other fixes to range emission.

Browse Source
This commit is contained in:
antirez 2020-04-01 17:36:32 +02:00
parent 2b67b6b87e
commit 4aa24e62a4
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/t_string.c
View File

@ -584,12 +584,13 @@ void lcsCommand(client *c) {
i = alen, j = blen; i = alen, j = blen;
while (computelcs && i > 0 && j > 0) { while (computelcs && i > 0 && j > 0) {
int emit_range = 0;
if (a[i-1] == b[j-1]) { if (a[i-1] == b[j-1]) {
/* If there is a match, store the character and reduce /* If there is a match, store the character and reduce
* the indexes to look for a new match. */ * the indexes to look for a new match. */
result[idx-1] = a[i-1]; result[idx-1] = a[i-1];
/* Track the current range. */ /* Track the current range. */
int emit_range = 0;
if (arange_start == alen) { if (arange_start == alen) {
arange_start = i-1; arange_start = i-1;
arange_end = i-1; arange_end = i-1;
@ -605,22 +606,9 @@ void lcsCommand(client *c) {
emit_range = 1; emit_range = 1;
} }
} }
/* Emit the range if we matched with the first byte of
* one of the two strings. We'll exit the loop ASAP. */
if (arange_start == 0 || brange_start == 0) emit_range = 1; if (arange_start == 0 || brange_start == 0) emit_range = 1;
/* Emit the current range if needed. */
if (emit_range) {
if (arraylenptr) {
addReplyArrayLen(c,2);
addReplyArrayLen(c,2);
addReplyLongLong(c,arange_start);
addReplyLongLong(c,arange_end);
addReplyArrayLen(c,2);
addReplyLongLong(c,brange_start);
addReplyLongLong(c,brange_end);
}
arange_start = alen; /* Restart at the next match. */
arraylen++;
}
idx--; i--; j--; idx--; i--; j--;
} else { } else {
/* Otherwise reduce i and j depending on the largest /* Otherwise reduce i and j depending on the largest
@ -631,6 +619,22 @@ void lcsCommand(client *c) {
i--; i--;
else else
j--; j--;
if (arange_start != alen) emit_range = 1;
}
/* Emit the current range if needed. */
if (emit_range) {
if (arraylenptr) {
addReplyArrayLen(c,2);
addReplyArrayLen(c,2);
addReplyLongLong(c,arange_start);
addReplyLongLong(c,arange_end);
addReplyArrayLen(c,2);
addReplyLongLong(c,brange_start);
addReplyLongLong(c,brange_end);
}
arange_start = alen; /* Restart at the next match. */
arraylen++;
} }
} }