Skip to content

BZPOPMAX returns minimum value when called with a Duration #2323

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

Merged
merged 1 commit into from
Sep 16, 2022
Merged

BZPOPMAX returns minimum value when called with a Duration #2323

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
2 changes: 1 addition & 1 deletion src/main/java/org/springframework/data/redis/core/ZSetOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@ default TypedTuple<V> popMax(K key, Duration timeout) {
Assert.notNull(timeout, "Timeout must not be null");
Assert.isTrue(!timeout.isNegative(), "Timeout must not be negative");

return popMin(key, TimeoutUtils.toSeconds(timeout), TimeUnit.SECONDS);
return popMax(key, TimeoutUtils.toSeconds(timeout), TimeUnit.SECONDS);
}

/**
Expand Down
7 changes: 7 additions & 0 deletions src/test/java/org/springframework/data/redis/core/DefaultZSetOperationsIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import static org.assertj.core.data.Offset.offset;

import java.io.IOException;
import java.time.Duration;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
Expand Down Expand Up @@ -138,16 +139,19 @@ void testLexCountBounded() {
void testPopMin() {

K key = keyFactory.instance();
V value0 = valueFactory.instance();
V value1 = valueFactory.instance();
V value2 = valueFactory.instance();
V value3 = valueFactory.instance();
V value4 = valueFactory.instance();

zSetOps.add(key, value0, 0);
zSetOps.add(key, value1, 1);
zSetOps.add(key, value2, 2);
zSetOps.add(key, value3, 3);
zSetOps.add(key, value4, 4);

assertThat(zSetOps.popMin(key, Duration.ofSeconds(1))).isEqualTo(new DefaultTypedTuple<>(value0, 0d));
assertThat(zSetOps.popMin(key)).isEqualTo(new DefaultTypedTuple<>(value1, 1d));
assertThat(zSetOps.popMin(key, 2)).containsExactly(new DefaultTypedTuple<>(value2, 2d),
new DefaultTypedTuple<>(value3, 3d));
Expand All @@ -163,12 +167,15 @@ void testPopMax() {
V value2 = valueFactory.instance();
V value3 = valueFactory.instance();
V value4 = valueFactory.instance();
V value5 = valueFactory.instance();

zSetOps.add(key, value1, 1);
zSetOps.add(key, value2, 2);
zSetOps.add(key, value3, 3);
zSetOps.add(key, value4, 4);
zSetOps.add(key, value5, 5);

assertThat(zSetOps.popMax(key, Duration.ofSeconds(1))).isEqualTo(new DefaultTypedTuple<>(value5, 5d));
assertThat(zSetOps.popMax(key)).isEqualTo(new DefaultTypedTuple<>(value4, 4d));
assertThat(zSetOps.popMax(key, 2)).containsExactly(new DefaultTypedTuple<>(value3, 3d),
new DefaultTypedTuple<>(value2, 2d));
Expand Down