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

Add NOMKSTREAM option to XADD command.

Browse Source 
Closes #2047
Original pull request: #2118.
This commit is contained in:
Mark John Moreno
2021-07-13 22:40:29 +08:00
committed by Mark Paluch
parent 39d3b7c76a
commit f3f0c11f06
6 changed files with 116 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/main/java/org/springframework/data/redis/connection/ReactiveStreamCommands.java
View File

@@ -58,6 +58,7 @@ import org.springframework.util.StringUtils;
* @author Christoph Strobl
* @author Tugdual Grall
* @author Dengliming
* @author Mark John Moreno
* @since 2.2
*/
public interface ReactiveStreamCommands {
@@ -199,12 +200,14 @@ public interface ReactiveStreamCommands {
private final ByteBufferRecord record;
private final @Nullable Long maxlen;
private final boolean nomkstream;
private AddStreamRecord(ByteBufferRecord record, @Nullable Long maxlen) {
private AddStreamRecord(ByteBufferRecord record, @Nullable Long maxlen, boolean nomkstream) {
super(record.getStream());
this.record = record;
this.maxlen = maxlen;
this.nomkstream = nomkstream;
}
/**
@@ -217,7 +220,7 @@ public interface ReactiveStreamCommands {
Assert.notNull(record, "Record must not be null!");
return new AddStreamRecord(record, null);
return new AddStreamRecord(record, null, false);
}
/**
@@ -230,7 +233,7 @@ public interface ReactiveStreamCommands {
Assert.notNull(body, "Body must not be null!");
return new AddStreamRecord(StreamRecords.rawBuffer(body), null);
return new AddStreamRecord(StreamRecords.rawBuffer(body), null, false);
}
/**
@@ -240,7 +243,7 @@ public interface ReactiveStreamCommands {
* @return a new {@link ReactiveGeoCommands.GeoAddCommand} with {@literal key} applied.
*/
public AddStreamRecord to(ByteBuffer key) {
return new AddStreamRecord(record.withStreamKey(key), maxlen);
return new AddStreamRecord(record.withStreamKey(key), maxlen, false);
}
/**
@@ -249,7 +252,28 @@ public interface ReactiveStreamCommands {
* @return new instance of {@link AddStreamRecord}.
*/
public AddStreamRecord maxlen(long maxlen) {
return new AddStreamRecord(record, maxlen);
return new AddStreamRecord(record, maxlen, false);
}
/**
* Disable creation of stream if it does not already exist.
*
* @return new instance of {@link AddStreamRecord}.
* @since 2.6
*/
public AddStreamRecord makeNoStream() {
return new AddStreamRecord(record, maxlen, true);
}
/**
* Disable creation of stream if it does not already exist.
*
* @param makeNoStream {@code true} to not create a stream if it does not already exist.
* @return new instance of {@link AddStreamRecord}.
* @since 2.6
*/
public AddStreamRecord makeNoStream(boolean makeNoStream) {
return new AddStreamRecord(record, maxlen, makeNoStream);
}
/**
@@ -281,6 +305,14 @@ public interface ReactiveStreamCommands {
public boolean hasMaxlen() {
return maxlen != null && maxlen > 0;
}
/**
* @return {@literal true} if {@literal NOMKSTREAM} is set.
* @since 2.6
*/
public boolean isNoMkStream() {
return nomkstream;
}
}
/**

45
src/main/java/org/springframework/data/redis/connection/RedisStreamCommands.java
View File

@@ -41,6 +41,7 @@ import org.springframework.util.StringUtils;
* @author Christoph Strobl
* @author Tugdual Grall
* @author Dengliming
* @author Mark John Moreno
* @see <a href="https://redis.io/topics/streams-intro">Redis Documentation - Streams</a>
* @since 2.2
*/
@@ -116,16 +117,19 @@ public interface RedisStreamCommands {
* Additional options applicable for {@literal XADD} command.
*
* @author Christoph Strobl
* @author Mark John Moreno
* @since 2.3
*/
class XAddOptions {
private static final XAddOptions NONE = new XAddOptions(null);
private static final XAddOptions NONE = new XAddOptions(null, false);
private final @Nullable Long maxlen;
private final boolean nomkstream;
private XAddOptions(@Nullable Long maxlen) {
private XAddOptions(@Nullable Long maxlen, boolean nomkstream) {
this.maxlen = maxlen;
this.nomkstream = nomkstream;
}
/**
@@ -141,7 +145,28 @@ public interface RedisStreamCommands {
* @return new instance of {@link XAddOptions}.
*/
public static XAddOptions maxlen(long maxlen) {
return new XAddOptions(maxlen);
return new XAddOptions(maxlen, false);
}
/**
* Disable creation of stream if it does not already exist.
*
* @return new instance of {@link XAddOptions}.
* @since 2.6
*/
public static XAddOptions makeNoStream() {
return new XAddOptions(null, true);
}
/**
* Disable creation of stream if it does not already exist.
*
* @param makeNoStream {@code true} to not create a stream if it does not already exist.
* @return new instance of {@link XAddOptions}.
* @since 2.6
*/
public static XAddOptions makeNoStream(boolean makeNoStream) {
return new XAddOptions(null, makeNoStream);
}
/**
@@ -161,6 +186,14 @@ public interface RedisStreamCommands {
return maxlen != null && maxlen > 0;
}
/**
* @return {@literal true} if {@literal NOMKSTREAM} is set.
* @since 2.6
*/
public boolean isNoMkStream() {
return nomkstream;
}
@Override
public boolean equals(Object o) {
if (this == o) {
@@ -169,14 +202,16 @@ public interface RedisStreamCommands {
if (o == null || getClass() != o.getClass()) {
return false;
}
XAddOptions that = (XAddOptions) o;
if (this.nomkstream != that.nomkstream) return false;
return ObjectUtils.nullSafeEquals(this.maxlen, that.maxlen);
}
@Override
public int hashCode() {
return ObjectUtils.nullSafeHashCode(this.maxlen);
int result = ObjectUtils.nullSafeHashCode(this.maxlen);
result = 31 * result + ObjectUtils.nullSafeHashCode(this.nomkstream);
return result;
}
}

2
src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveStreamCommands.java
View File

@@ -55,6 +55,7 @@ import org.springframework.util.Assert;
* @author Mark Paluch
* @author Tugdual Grall
* @author Dengliming
* @author Mark John Moreno
* @since 2.2
*/
class LettuceReactiveStreamCommands implements ReactiveStreamCommands {
@@ -110,6 +111,7 @@ class LettuceReactiveStreamCommands implements ReactiveStreamCommands {
if (command.hasMaxlen()) {
args.maxlen(command.getMaxlen());
}
args.nomkstream(command.isNoMkStream());
return cmd.xadd(command.getKey(), args, command.getBody())
.map(value -> new CommandResponse<>(command, RecordId.of(value)));

2
src/main/java/org/springframework/data/redis/connection/lettuce/LettuceStreamCommands.java
View File

@@ -49,6 +49,7 @@ import org.springframework.util.Assert;
* @author Tugdual Grall
* @author Dejan Jankov
* @author Dengliming
* @author Mark John Moreno
* @since 2.2
*/
class LettuceStreamCommands implements RedisStreamCommands {
@@ -90,6 +91,7 @@ class LettuceStreamCommands implements RedisStreamCommands {
if (options.hasMaxlen()) {
args.maxlen(options.getMaxlen());
}
args.nomkstream(options.isNoMkStream());
return connection.invoke().from(RedisStreamAsyncCommands::xadd, record.getStream(), args, record.getValue())
.get(RecordId::of);