Skip to content

Commit

Permalink
Some json command assume optional path while it's not (#3198) (#3201)
Browse files Browse the repository at this point in the history
  • Loading branch information
@tishun
tishun authored Feb 28, 2025
1 parent 18d2925 commit c60960b
Show file tree
Hide file tree
Showing 2 changed files with 236 additions and 38 deletions.
53 changes: 22 additions & 31 deletions src/main/java/io/lettuce/core/RedisJsonCommandBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ Command<K, V, List<Long>> jsonArrappend(K key, JsonPath jsonPath, JsonValue... j
CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key);

if (jsonPath != null && !jsonPath.isRootPath()) {
// OPTIONAL as per API
args.add(jsonPath.toString());
}

Expand All @@ -62,10 +63,7 @@ Command<K, V, List<Long>> jsonArrindex(K key, JsonPath jsonPath, JsonValue value

CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key);

if (jsonPath != null && !jsonPath.isRootPath()) {
args.add(jsonPath.toString());
}

args.add(jsonPath.toString());
args.add(value.asByteBuffer().array());

if (range != null) {
Expand All @@ -81,10 +79,7 @@ Command<K, V, List<Long>> jsonArrinsert(K key, JsonPath jsonPath, int index, Jso

CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key);

if (jsonPath != null && !jsonPath.isRootPath()) {
args.add(jsonPath.toString());
}

args.add(jsonPath.toString());
args.add(index);

for (JsonValue value : values) {
Expand All @@ -100,6 +95,7 @@ Command<K, V, List<Long>> jsonArrlen(K key, JsonPath jsonPath) {
CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key);

if (jsonPath != null && !jsonPath.isRootPath()) {
// OPTIONAL as per API
args.add(jsonPath.toString());
}
return createCommand(JSON_ARRLEN, (CommandOutput) new ArrayOutput<>(codec), args);
Expand All @@ -110,10 +106,12 @@ Command<K, V, List<JsonValue>> jsonArrpop(K key, JsonPath jsonPath, int index) {

CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key);

if (jsonPath != null) {
if (jsonPath != null && !jsonPath.isRootPath()) {
// OPTIONAL as per API
args.add(jsonPath.toString());

if (index != -1) {
// OPTIONAL as per API
args.add(index);
}
}
Expand All @@ -126,10 +124,7 @@ Command<K, V, List<Long>> jsonArrtrim(K key, JsonPath jsonPath, JsonRangeArgs ra
notNullKey(key);

CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key);

if (jsonPath != null && !jsonPath.isRootPath()) {
args.add(jsonPath.toString());
}
args.add(jsonPath.toString());

if (range != null) {
range.build(args);
Expand All @@ -144,6 +139,7 @@ Command<K, V, Long> jsonClear(K key, JsonPath jsonPath) {
CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key);

if (jsonPath != null && !jsonPath.isRootPath()) {
// OPTIONAL as per API
args.add(jsonPath.toString());
}

Expand All @@ -156,10 +152,12 @@ Command<K, V, List<JsonValue>> jsonGet(K key, JsonGetArgs options, JsonPath... j
CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key);

if (options != null) {
// OPTIONAL as per API
options.build(args);
}

if (jsonPaths != null) {
// OPTIONAL as per API
for (JsonPath jsonPath : jsonPaths) {
if (jsonPath != null) {
args.add(jsonPath.toString());
Expand All @@ -175,11 +173,7 @@ Command<K, V, String> jsonMerge(K key, JsonPath jsonPath, JsonValue value) {
notNullKey(key);

CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key);

if (jsonPath != null && !jsonPath.isRootPath()) {
args.add(jsonPath.toString());
}

args.add(jsonPath.toString());
args.add(value.asByteBuffer().array());

return createCommand(JSON_MERGE, new StatusOutput<>(codec), args);
Expand All @@ -189,10 +183,7 @@ Command<K, V, List<JsonValue>> jsonMGet(JsonPath jsonPath, K... keys) {
notEmpty(keys);

CommandArgs<K, V> args = new CommandArgs<>(codec).addKeys(keys);

if (jsonPath != null) {
args.add(jsonPath.toString());
}
args.add(jsonPath.toString());

return createCommand(JSON_MGET, new JsonValueListOutput<>(codec, parser.get()), args);
}
Expand All @@ -214,11 +205,7 @@ Command<K, V, List<Number>> jsonNumincrby(K key, JsonPath jsonPath, Number numbe
notNullKey(key);

CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key);

if (jsonPath != null && !jsonPath.isRootPath()) {
args.add(jsonPath.toString());
}

args.add(jsonPath.toString());
args.add(number.toString());

return createCommand(JSON_NUMINCRBY, new NumberListOutput<>(codec), args);
Expand All @@ -230,6 +217,7 @@ Command<K, V, List<V>> jsonObjkeys(K key, JsonPath jsonPath) {
CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key);

if (jsonPath != null && !jsonPath.isRootPath()) {
// OPTIONAL as per API
args.add(jsonPath.toString());
}

Expand All @@ -243,6 +231,7 @@ Command<K, V, List<Long>> jsonObjlen(K key, JsonPath jsonPath) {
CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key);

if (jsonPath != null && !jsonPath.isRootPath()) {
// OPTIONAL as per API
args.add(jsonPath.toString());
}

Expand All @@ -259,6 +248,7 @@ Command<K, V, String> jsonSet(K key, JsonPath jsonPath, JsonValue value, JsonSet
args.add(value.asByteBuffer().array());

if (options != null) {
// OPTIONAL as per API
options.build(args);
}

Expand All @@ -271,6 +261,7 @@ Command<K, V, List<Long>> jsonStrappend(K key, JsonPath jsonPath, JsonValue valu
CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key);

if (jsonPath != null && !jsonPath.isRootPath()) {
// OPTIONAL as per API
args.add(jsonPath.toString());
}

Expand All @@ -286,6 +277,7 @@ Command<K, V, List<Long>> jsonStrlen(K key, JsonPath jsonPath) {
CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key);

if (jsonPath != null && !jsonPath.isRootPath()) {
// OPTIONAL as per API
args.add(jsonPath.toString());
}

Expand All @@ -296,10 +288,7 @@ Command<K, V, List<Long>> jsonToggle(K key, JsonPath jsonPath) {
notNullKey(key);

CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key);

if (jsonPath != null && !jsonPath.isRootPath()) {
args.add(jsonPath.toString());
}
args.add(jsonPath.toString());

return createCommand(JSON_TOGGLE, (CommandOutput) new ArrayOutput<>(codec), args);
}
Expand All @@ -310,6 +299,7 @@ Command<K, V, Long> jsonDel(K key, JsonPath jsonPath) {
CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key);

if (jsonPath != null && !jsonPath.isRootPath()) {
// OPTIONAL as per API
args.add(jsonPath.toString());
}
return createCommand(JSON_DEL, new IntegerOutput<>(codec), args);
Expand All @@ -321,6 +311,7 @@ Command<K, V, List<JsonType>> jsonType(K key, JsonPath jsonPath) {
CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key);

if (jsonPath != null && !jsonPath.isRootPath()) {
// OPTIONAL as per API
args.add(jsonPath.toString());
}

Expand Down
Loading

0 comments on commit c60960b

Please sign in to comment.