Skip to content

Fix HGETDEL, HGETEX and HSETEX pipeline and transaction integration tests. #3246

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

Closed
wants to merge 2 commits into from
Closed

Fix HGETDEL, HGETEX and HSETEX pipeline and transaction integration tests. #3246

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5054de
Fix HGETDEL, HGETEX and HSETEX pipeline and transaction integration t…
viktoriya-kutsarova Oct 24, 2025
aabf688
Increase expiration timeout for HSETEX integration test.
viktoriya-kutsarova Oct 24, 2025
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
63 changes: 29 additions & 34 deletions ...st/java/org/springframework/data/redis/connection/AbstractConnectionIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3729,62 +3729,57 @@ public void hTtlReturnsMinusTwoWhenFieldOrKeyMissing() {
@EnabledOnCommand("HGETDEL")
public void hGetDelWorksAsExpected() {

connection.hSet("hash-hgetdel", "field-1", "value-1");
connection.hSet("hash-hgetdel", "field-2", "value-2");
connection.hSet("hash-hgetdel", "field-3", "value-3");
actual.add(connection.hSet("hash-hgetdel", "field-1", "value-1"));
actual.add(connection.hSet("hash-hgetdel", "field-2", "value-2"));
actual.add(connection.hSet("hash-hgetdel", "field-3", "value-3"));

// hgetdel first 2 fields
assertThat(connection.hGetDel("hash-hgetdel", "field-1", "field-2")).containsExactly("value-1", "value-2");
assertThat(connection.hExists("hash-hgetdel", "field-1")).isFalse();
assertThat(connection.hExists("hash-hgetdel", "field-2")).isFalse();
actual.add(connection.hGetDel("hash-hgetdel", "field-1", "field-2"));
actual.add(connection.hExists("hash-hgetdel", "field-1"));
actual.add(connection.hExists("hash-hgetdel", "field-2"));

// hgetdel non-existent field returns null
assertThat(connection.hGetDel("hash-hgetdel", "field-1")).containsExactly(null);
actual.add(connection.hGetDel("hash-hgetdel", "field-1"));

// hgetdel last field
assertThat(connection.hGetDel("hash-hgetdel", "field-3")).containsExactly("value-3");
assertThat(connection.hExists("hash-hgetdel", "field-3")).isFalse();
assertThat(connection.exists("hash-hgetdel")).isFalse();
actual.add(connection.hGetDel("hash-hgetdel", "field-3"));
actual.add(connection.hExists("hash-hgetdel", "field-3"));
actual.add(connection.exists("hash-hgetdel"));

// hgetdel non-existent hash returns null
assertThat(connection.hGetDel("hash-hgetdel", "field-1")).containsExactly(null);
actual.add(connection.hGetDel("hash-hgetdel", "field-1"));

verifyResults(Arrays.asList(Boolean.TRUE, Boolean.TRUE, Boolean.TRUE,
Arrays.asList("value-1", "value-2"), Boolean.FALSE, Boolean.FALSE,
Collections.singletonList(null), Arrays.asList("value-3"), Boolean.FALSE, Boolean.FALSE,
Collections.singletonList(null)));
}

@Test // GH-3211
@EnabledOnCommand("HGETEX")
@LongRunningTest
public void hGetExWorksAsExpected() {

connection.hSet("hash-hgetex", "field-1", "value-1");
connection.hSet("hash-hgetex", "field-2", "value-2");
connection.hSet("hash-hgetex", "field-3", "value-3");
actual.add(connection.hSet("hash-hgetex", "field-1", "value-1"));
actual.add(connection.hSet("hash-hgetex", "field-2", "value-2"));
actual.add(connection.hSet("hash-hgetex", "field-3", "value-3"));

assertThat(connection.hGetEx("hash-hgetex", Expiration.seconds(2), "field-1", "field-2")).containsExactly("value-1",
"value-2");
actual.add(connection.hGetEx("hash-hgetex", Expiration.seconds(2), "field-1", "field-2"));

// non-existent field returns null
assertThat(connection.hGetEx("hash-hgetex", null, "no-such-field")).containsExactly(null);
actual.add(connection.hGetEx("hash-hgetex", null, "no-such-field"));

// non-existent hash returns null
assertThat(connection.hGetEx("no-such-key", null, "field-1")).containsExactly(null);
actual.add(connection.hGetEx("no-such-key", null, "field-1"));

await().atMost(Duration.ofMillis(3000L))
.until(() -> !connection.hExists("hash-getex", "field-1") && !connection.hExists("hash-getex", "field-2"));
verifyResults(Arrays.asList(Boolean.TRUE, "value-1", "value-2"));
}

@Test // GH-3211
@EnabledOnCommand("HSETEX")
@LongRunningTest
public void hSetExWorksAsExpected() {

Map<String, String> fieldMap = Map.of("field-1", "value-1", "field-2", "value-2");
assertThat(connection.hSetEx("hash-hsetex", fieldMap, RedisHashCommands.HashFieldSetOption.upsert(),
Expiration.seconds(2))).isTrue();
assertThat(connection.hGet("hash-hsetex", "field-1")).isEqualTo("value-1");
assertThat(connection.hGet("hash-hsetex", "field-2")).isEqualTo("value-2");
actual.add(connection.hSetEx("hash-hsetex", fieldMap, RedisHashCommands.HashFieldSetOption.upsert(),
Expiration.seconds(2)));
Copy link
Member

@mp911de mp911de Oct 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you use higher timeout values? CI sometimes needs a longer time and two seconds are a bit tight. Something like 30 seconds should be sufficient.

Copy link
Contributor Author

@viktoriya-kutsarova viktoriya-kutsarova Oct 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Of course.

actual.add(connection.hGet("hash-hsetex", "field-1"));
actual.add(connection.hGet("hash-hsetex", "field-2"));

await().atMost(Duration.ofMillis(3000L))
.until(() -> !connection.hExists("hash-getex", "field-1") && !connection.hExists("hash-getex", "field-2"));
verifyResults(Arrays.asList(Boolean.TRUE, Boolean.TRUE, Boolean.TRUE,
Arrays.asList("value-1", "value-2"), Collections.singletonList(null), Collections.singletonList(null)));
}

@Test // GH-3211
Expand Down