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

DATAREDIS-1119 - Support XINFO via ReactiveStreamCommands.

Browse Source 
Original pull request: #519.
This commit is contained in:
Christoph Strobl
2020-03-27 08:47:27 +01:00
committed by Mark Paluch
parent c010472c42
commit 3f5533ea9a
7 changed files with 335 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3246,7 +3246,7 @@ public abstract class AbstractConnectionIntegrationTests {
assertThat(claimed).containsAll(messages);
}
@Test // DATAREDIS-1084
@Test // DATAREDIS-1119
@IfProfileValue(name = "redisVersion", value = "5.0")
@WithRedisDriver({ RedisDriver.LETTUCE })
public void xinfo() {
@@ -3274,7 +3274,7 @@ public abstract class AbstractConnectionIntegrationTests {
assertThat(info.lastEntryId()).isEqualTo(lastRecord.getValue());
}
@Test // DATAREDIS-1084
@Test // DATAREDIS-1119
@IfProfileValue(name = "redisVersion", value = "5.0")
@WithRedisDriver({ RedisDriver.LETTUCE })
public void xinfoNoGroup() {
@@ -3299,7 +3299,7 @@ public abstract class AbstractConnectionIntegrationTests {
assertThat(info.lastEntryId()).isEqualTo(lastRecord.getValue());
}
@Test // DATAREDIS-1084
@Test // DATAREDIS-1119
@IfProfileValue(name = "redisVersion", value = "5.0")
@WithRedisDriver({ RedisDriver.LETTUCE })
public void xinfoGroups() {
@@ -3324,7 +3324,7 @@ public abstract class AbstractConnectionIntegrationTests {
assertThat(info.get(0).lastDeliveredId()).isEqualTo(lastRecord.getValue());
}
@Test // DATAREDIS-1084
@Test // DATAREDIS-1119
@IfProfileValue(name = "redisVersion", value = "5.0")
@WithRedisDriver({ RedisDriver.LETTUCE })
public void xinfoGroupsNoGroup() {
@@ -3342,7 +3342,7 @@ public abstract class AbstractConnectionIntegrationTests {
}
@Test // DATAREDIS-1084
@Test // DATAREDIS-1119
@IfProfileValue(name = "redisVersion", value = "5.0")
@WithRedisDriver({ RedisDriver.LETTUCE })
public void xinfoGroupsNoConsumer() {
@@ -3365,7 +3365,7 @@ public abstract class AbstractConnectionIntegrationTests {
assertThat(info.get(0).lastDeliveredId()).isEqualTo("0-0");
}
@Test // DATAREDIS-1084
@Test // DATAREDIS-1119
@IfProfileValue(name = "redisVersion", value = "5.0")
@WithRedisDriver({ RedisDriver.LETTUCE })
public void xinfoConsumers() {
@@ -3389,7 +3389,7 @@ public abstract class AbstractConnectionIntegrationTests {
assertThat(info.get(0).idleTimeMs()).isCloseTo(1L, Offset.offset(200L));
}
@Test // DATAREDIS-1084
@Test // DATAREDIS-1119
@IfProfileValue(name = "redisVersion", value = "5.0")
@WithRedisDriver({ RedisDriver.LETTUCE })
public void xinfoConsumersNoConsumer() {

113
src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveStreamCommandsTests.java
View File

@@ -24,6 +24,7 @@ import reactor.test.StepVerifier;
import java.time.Duration;
import java.util.Collections;
import org.assertj.core.data.Offset;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
@@ -40,6 +41,7 @@ import org.springframework.data.redis.connection.stream.StreamOffset;
* Integration tests for {@link LettuceReactiveStreamCommands}.
*
* @author Mark Paluch
* @author Christoph Strobl
*/
public class LettuceReactiveStreamCommandsTests extends LettuceReactiveCommandsTestsBase {
@@ -361,4 +363,115 @@ public class LettuceReactiveStreamCommandsTests extends LettuceReactiveCommandsT
.verifyComplete();
}
@Test // DATAREDIS-1119
public void xinfo() {
String firstRecord = nativeCommands.xadd(KEY_1, KEY_2, VALUE_2);
String lastRecord = nativeCommands.xadd(KEY_1, KEY_3, VALUE_3);
nativeCommands.xgroupCreate(XReadArgs.StreamOffset.from(KEY_1, "0"), "my-group");
nativeCommands.xreadgroup(io.lettuce.core.Consumer.from("my-group", "my-consumer"),
XReadArgs.StreamOffset.from(KEY_1, ">"));
connection.streamCommands().xInfo(KEY_1_BBUFFER).as(StepVerifier::create) //
.consumeNextWith(info -> {
assertThat(info.streamLength()).isEqualTo(2L);
assertThat(info.radixTreeKeySize()).isOne();
assertThat(info.radixTreeNodesSize()).isEqualTo(2L);
assertThat(info.groupCount()).isOne();
assertThat(info.lastGeneratedId()).isEqualTo(lastRecord);
assertThat(info.firstEntryId()).isEqualTo(firstRecord);
assertThat(info.lastEntryId()).isEqualTo(lastRecord);
}).verifyComplete();
}
@Test // DATAREDIS-1119
public void xinfoNoGroup() {
String firstRecord = nativeCommands.xadd(KEY_1, KEY_2, VALUE_2);
String lastRecord = nativeCommands.xadd(KEY_1, KEY_3, VALUE_3);
connection.streamCommands().xInfo(KEY_1_BBUFFER).as(StepVerifier::create) //
.consumeNextWith(info -> {
assertThat(info.streamLength()).isEqualTo(2L);
assertThat(info.radixTreeKeySize()).isOne();
assertThat(info.radixTreeNodesSize()).isEqualTo(2L);
assertThat(info.groupCount()).isZero();
assertThat(info.lastGeneratedId()).isEqualTo(lastRecord);
assertThat(info.firstEntryId()).isEqualTo(firstRecord);
assertThat(info.lastEntryId()).isEqualTo(lastRecord);
}).verifyComplete();
}
@Test // DATAREDIS-1119
public void xinfoGroups() {
nativeCommands.xadd(KEY_1, KEY_2, VALUE_2);
String lastRecord = nativeCommands.xadd(KEY_1, KEY_3, VALUE_3);
nativeCommands.xgroupCreate(XReadArgs.StreamOffset.from(KEY_1, "0"), "my-group");
nativeCommands.xreadgroup(io.lettuce.core.Consumer.from("my-group", "my-consumer"),
XReadArgs.StreamOffset.from(KEY_1, ">"));
connection.streamCommands().xInfoGroups(KEY_1_BBUFFER).as(StepVerifier::create) //
.consumeNextWith(info -> {
assertThat(info.groupName()).isEqualTo("my-group");
assertThat(info.consumerCount()).isEqualTo(1L);
assertThat(info.pendingCount()).isEqualTo(2L);
assertThat(info.lastDeliveredId()).isEqualTo(lastRecord);
}).verifyComplete();
}
@Test // DATAREDIS-1119
public void xinfoGroupsNoGroup() {
nativeCommands.xadd(KEY_1, KEY_2, VALUE_2);
String lastRecord = nativeCommands.xadd(KEY_1, KEY_3, VALUE_3);
connection.streamCommands().xInfoGroups(KEY_1_BBUFFER).as(StepVerifier::create) //
.verifyComplete();
}
@Test // DATAREDIS-1119
public void xinfoGroupsNoConsumer() {
nativeCommands.xadd(KEY_1, KEY_2, VALUE_2);
String lastRecord = nativeCommands.xadd(KEY_1, KEY_3, VALUE_3);
nativeCommands.xgroupCreate(XReadArgs.StreamOffset.from(KEY_1, "0"), "my-group");
connection.streamCommands().xInfoGroups(KEY_1_BBUFFER).as(StepVerifier::create) //
.consumeNextWith(info -> {
assertThat(info.groupName()).isEqualTo("my-group");
assertThat(info.consumerCount()).isZero();
assertThat(info.pendingCount()).isZero();
assertThat(info.lastDeliveredId()).isEqualTo("0-0");
}).verifyComplete();
}
@Test // DATAREDIS-1119
public void xinfoConsumers() {
nativeCommands.xadd(KEY_1, KEY_2, VALUE_2);
nativeCommands.xadd(KEY_1, KEY_3, VALUE_3);
nativeCommands.xgroupCreate(XReadArgs.StreamOffset.from(KEY_1, "0"), "my-group");
nativeCommands.xreadgroup(io.lettuce.core.Consumer.from("my-group", "my-consumer"),
XReadArgs.StreamOffset.from(KEY_1, ">"));
connection.streamCommands().xInfoConsumers(KEY_1_BBUFFER, "my-group").as(StepVerifier::create) //
.consumeNextWith(info -> {
assertThat(info.groupName()).isEqualTo("my-group");
assertThat(info.consumerName()).isEqualTo("my-consumer");
assertThat(info.pendingCount()).isEqualTo(2L);
assertThat(info.idleTimeMs()).isCloseTo(1L, Offset.offset(200L));
}).verifyComplete();
}
@Test // DATAREDIS-1119
public void xinfoConsumersNoConsumer() {
nativeCommands.xadd(KEY_1, KEY_2, VALUE_2);
nativeCommands.xadd(KEY_1, KEY_3, VALUE_3);
nativeCommands.xgroupCreate(XReadArgs.StreamOffset.from(KEY_1, "0"), "my-group");
connection.streamCommands().xInfoConsumers(KEY_1_BBUFFER, "my-group").as(StepVerifier::create).verifyComplete();
}
}