Spring/spring-data-redis
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing.

Browse Source 
Add support for MINID trimming. Add tests. Extract Jedis XAddParams conversion to StreamConverters.

Reorder methods. Simplify StreamRecord creation.

See #2247
This commit is contained in:
Mark Paluch
2022-03-09 09:46:06 +01:00
parent 9b8bca689a
commit c63e2e2900
9 changed files with 220 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/test/java/org/springframework/data/redis/connection/AbstractConnectionIntegrationTests.java
View File

@@ -76,6 +76,7 @@ import org.springframework.data.redis.connection.stream.StreamInfo.XInfoConsumer
import org.springframework.data.redis.connection.stream.StreamInfo.XInfoGroups;
import org.springframework.data.redis.connection.stream.StreamInfo.XInfoStream;
import org.springframework.data.redis.connection.stream.StreamOffset;
import org.springframework.data.redis.connection.stream.StringRecord;
import org.springframework.data.redis.core.Cursor;
import org.springframework.data.redis.core.KeyScanOptions;
import org.springframework.data.redis.core.ScanOptions;
@@ -3602,6 +3603,44 @@ public abstract class AbstractConnectionIntegrationTests {
assertThat(results.get(1)).isEqualTo(DataType.STREAM);
}
@Test // GH-2247
@EnabledOnCommand("XADD")
void xAddShouldTrimStreamExactly() {
RedisStreamCommands.XAddOptions xAddOptions = RedisStreamCommands.XAddOptions.maxlen(1);
actual.add(
connection.xAdd(StringRecord.of(Collections.singletonMap(KEY_2, VALUE_2)).withStreamKey(KEY_1), xAddOptions));
actual.add(
connection.xAdd(StringRecord.of(Collections.singletonMap(KEY_2, VALUE_2)).withStreamKey(KEY_1), xAddOptions));
actual.add(
connection.xAdd(StringRecord.of(Collections.singletonMap(KEY_2, VALUE_2)).withStreamKey(KEY_1), xAddOptions));
actual.add(connection.xLen(KEY_1));
List<Object> results = getResults();
assertThat(results).hasSize(4);
assertThat(((RecordId) results.get(0)).getValue()).contains("-");
assertThat((Long) results.get(3)).isEqualTo(1);
}
@Test // GH-2247
@EnabledOnCommand("XADD")
void xAddShouldTrimStreamApprox() {
RedisStreamCommands.XAddOptions xAddOptions = RedisStreamCommands.XAddOptions.maxlen(1).approximateTrimming(true);
actual.add(
connection.xAdd(StringRecord.of(Collections.singletonMap(KEY_2, VALUE_2)).withStreamKey(KEY_1), xAddOptions));
actual.add(
connection.xAdd(StringRecord.of(Collections.singletonMap(KEY_2, VALUE_2)).withStreamKey(KEY_1), xAddOptions));
actual.add(
connection.xAdd(StringRecord.of(Collections.singletonMap(KEY_2, VALUE_2)).withStreamKey(KEY_1), xAddOptions));
actual.add(connection.xLen(KEY_1));
List<Object> results = getResults();
assertThat(results).hasSize(4);
assertThat(((RecordId) results.get(0)).getValue()).contains("-");
assertThat((Long) results.get(3)).isBetween(1L, 3L);
}
@Test // DATAREDIS-864
@EnabledOnCommand("XADD")
public void xReadShouldReadMessage() {