Skip to content

Fix VSIM single-element query vector missing VALUES num prefix #3863

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
renechoi wants to merge 1 commit into
base: main
Choose a base branch
from
+42 −21
Open

Fix VSIM single-element query vector missing VALUES num prefix #3863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 9 additions & 21 deletions src/main/java/io/lettuce/core/RedisVectorSetCommandBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,13 +392,9 @@ public Command<K, V, List<V>> vsim(K key, VSimArgs vSimArgs, Double[] vectors) {

CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key);

if (vectors.length > 1) {
args.add(CommandKeyword.VALUES);
args.add(vectors.length);
Arrays.stream(vectors).forEach(args::add);
} else {
args.add(vectors[0]);
}
args.add(CommandKeyword.VALUES);
args.add(vectors.length);
Arrays.stream(vectors).forEach(args::add);

if (vSimArgs != null) {
vSimArgs.build(args);
Expand Down Expand Up @@ -472,13 +468,9 @@ public Command<K, V, Map<V, Double>> vsimWithScore(K key, VSimArgs vSimArgs, Dou

CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key);

if (vectors.length > 1) {
args.add(CommandKeyword.VALUES);
args.add(vectors.length);
Arrays.stream(vectors).forEach(args::add);
} else {
args.add(vectors[0]);
}
args.add(CommandKeyword.VALUES);
args.add(vectors.length);
Arrays.stream(vectors).forEach(args::add);

args.add(WITHSCORES);

Expand Down Expand Up @@ -527,13 +519,9 @@ public Command<K, V, Map<V, VSimScoreAttribs>> vsimWithScoreWithAttribs(K key, V

CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key);

if (vectors.length > 1) {
args.add(CommandKeyword.VALUES);
args.add(vectors.length);
Arrays.stream(vectors).forEach(args::add);
} else {
args.add(vectors[0]);
}
args.add(CommandKeyword.VALUES);
args.add(vectors.length);
Arrays.stream(vectors).forEach(args::add);

args.add(WITHSCORES).add(WITHATTRIBS);

Expand Down
33 changes: 33 additions & 0 deletions src/test/java/io/lettuce/core/RedisVectorSetCommandBuilderUnitTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,39 @@ void shouldCorrectlyConstructVsimWithArgsAndScores() {
+ "WITHSCORES\r\n" + "$5\r\n" + "COUNT\r\n" + "$1\r\n" + "5\r\n" + "$5\r\n" + "TRUTH\r\n");
}

@Test
void shouldCorrectlyConstructVsimWithOneVector() {
Command<String, String, List<String>> command = builder.vsim(KEY, new Double[] { 0.1d });
ByteBuf buf = Unpooled.directBuffer();
command.encode(buf);

assertThat(buf.toString(StandardCharsets.UTF_8)).isEqualTo("*5\r\n" + "$4\r\n" + "VSIM\r\n" + "$10\r\n"
+ "vector:set\r\n" + "$6\r\n" + "VALUES\r\n" + "$1\r\n" + "1\r\n" + "$3\r\n" + "0.1\r\n");
}

@Test
void shouldCorrectlyConstructVsimWithScoresWithOneVector() {
Command<String, String, Map<String, Double>> command = builder.vsimWithScore(KEY, new Double[] { 0.1d });
ByteBuf buf = Unpooled.directBuffer();
command.encode(buf);

assertThat(buf.toString(StandardCharsets.UTF_8))
.isEqualTo("*6\r\n" + "$4\r\n" + "VSIM\r\n" + "$10\r\n" + "vector:set\r\n" + "$6\r\n" + "VALUES\r\n" + "$1\r\n"
+ "1\r\n" + "$3\r\n" + "0.1\r\n" + "$10\r\n" + "WITHSCORES\r\n");
}

@Test
void shouldCorrectlyConstructVsimWithScoreWithAttribsWithOneVector() {
Command<String, String, Map<String, VSimScoreAttribs>> command = builder.vsimWithScoreWithAttribs(KEY,
new Double[] { 0.1d });
ByteBuf buf = Unpooled.directBuffer();
command.encode(buf);

assertThat(buf.toString(StandardCharsets.UTF_8))
.isEqualTo("*7\r\n" + "$4\r\n" + "VSIM\r\n" + "$10\r\n" + "vector:set\r\n" + "$6\r\n" + "VALUES\r\n" + "$1\r\n"
+ "1\r\n" + "$3\r\n" + "0.1\r\n" + "$10\r\n" + "WITHSCORES\r\n" + "$11\r\n" + "WITHATTRIBS\r\n");
}

@Test
void epsilonBelowZero_throws() {
VSimArgs args = new VSimArgs();
Expand Down
Loading