Skip to content

Commit 251831c

Browse files
authored
Deprecate Triggers and Functions feature (#3968)
* Use redis:8.0-M01 image * Deprecate TFUNCTION commands * Deprecate TFCALL and TFCALLASYNC commands * Deprecate EVERYTHING about Gears module * Revert "Use redis:8.0-M01 image"
1 parent cc8c8ce commit 251831c

14 files changed

+52
-20
lines changed

src/main/java/redis/clients/jedis/CommandObjects.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4414,26 +4414,31 @@ public final CommandObject<Map<String, Object>> graphConfigGet(String configName
44144414
// RedisGraph commands
44154415

44164416
// RedisGears commands
4417+
@Deprecated
44174418
public final CommandObject<String> tFunctionLoad(String libraryCode, TFunctionLoadParams params) {
44184419
return new CommandObject<>(commandArguments(GearsCommand.TFUNCTION).add(GearsKeyword.LOAD)
44194420
.addParams(params).add(libraryCode), BuilderFactory.STRING);
44204421
}
44214422

4423+
@Deprecated
44224424
public final CommandObject<String> tFunctionDelete(String libraryName) {
44234425
return new CommandObject<>(commandArguments(GearsCommand.TFUNCTION).add(GearsKeyword.DELETE)
44244426
.add(libraryName), BuilderFactory.STRING);
44254427
}
44264428

4429+
@Deprecated
44274430
public final CommandObject<List<GearsLibraryInfo>> tFunctionList(TFunctionListParams params) {
44284431
return new CommandObject<>(commandArguments(GearsCommand.TFUNCTION).add(GearsKeyword.LIST)
44294432
.addParams(params), GearsLibraryInfo.GEARS_LIBRARY_INFO_LIST);
44304433
}
44314434

4435+
@Deprecated
44324436
public final CommandObject<Object> tFunctionCall(String library, String function, List<String> keys, List<String> args) {
44334437
return new CommandObject<>(commandArguments(GearsCommand.TFCALL).add(library + "." + function)
44344438
.add(keys.size()).keys(keys).addObjects(args), BuilderFactory.AGGRESSIVE_ENCODED_OBJECT);
44354439
}
44364440

4441+
@Deprecated
44374442
public final CommandObject<Object> tFunctionCallAsync(String library, String function, List<String> keys, List<String> args) {
44384443
return new CommandObject<>(commandArguments(GearsCommand.TFCALLASYNC).add(library + "." + function)
44394444
.add(keys.size()).keys(keys).addObjects(args), BuilderFactory.AGGRESSIVE_ENCODED_OBJECT);

src/main/java/redis/clients/jedis/UnifiedJedis.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4984,26 +4984,31 @@ public Map<String, Object> graphConfigGet(String configName) {
49844984
// RedisGraph commands
49854985

49864986
// RedisGears commands
4987+
@Deprecated
49874988
@Override
49884989
public String tFunctionLoad(String libraryCode, TFunctionLoadParams params) {
49894990
return executeCommand(commandObjects.tFunctionLoad(libraryCode, params));
49904991
}
49914992

4993+
@Deprecated
49924994
@Override
49934995
public String tFunctionDelete(String libraryName) {
49944996
return executeCommand(commandObjects.tFunctionDelete(libraryName));
49954997
}
49964998

4999+
@Deprecated
49975000
@Override
49985001
public List<GearsLibraryInfo> tFunctionList(TFunctionListParams params) {
49995002
return executeCommand(commandObjects.tFunctionList(params));
50005003
}
50015004

5005+
@Deprecated
50025006
@Override
50035007
public Object tFunctionCall(String library, String function, List<String> keys, List<String> args) {
50045008
return executeCommand(commandObjects.tFunctionCall(library, function, keys, args));
50055009
}
50065010

5011+
@Deprecated
50075012
@Override
50085013
public Object tFunctionCallAsync(String library, String function, List<String> keys, List<String> args) {
50095014
return executeCommand(commandObjects.tFunctionCallAsync(library, function, keys, args));

src/main/java/redis/clients/jedis/gears/RedisGearsCommands.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,24 @@
44

55
import java.util.List;
66

7+
@Deprecated
78
public interface RedisGearsCommands {
89

9-
default String tFunctionLoad(String libraryCode) {
10+
@Deprecated default String tFunctionLoad(String libraryCode) {
1011
return tFunctionLoad(libraryCode, TFunctionLoadParams.loadParams());
1112
}
1213

13-
String tFunctionLoad(String libraryCode, TFunctionLoadParams params);
14+
@Deprecated String tFunctionLoad(String libraryCode, TFunctionLoadParams params);
1415

15-
default List<GearsLibraryInfo> tFunctionList() {
16+
@Deprecated default List<GearsLibraryInfo> tFunctionList() {
1617
return tFunctionList(TFunctionListParams.listParams());
1718
}
1819

19-
List<GearsLibraryInfo> tFunctionList(TFunctionListParams params);
20+
@Deprecated List<GearsLibraryInfo> tFunctionList(TFunctionListParams params);
2021

21-
String tFunctionDelete(String libraryName);
22+
@Deprecated String tFunctionDelete(String libraryName);
2223

23-
Object tFunctionCall(String library, String function, List<String> keys, List<String> args);
24+
@Deprecated Object tFunctionCall(String library, String function, List<String> keys, List<String> args);
2425

25-
Object tFunctionCallAsync(String library, String function, List<String> keys, List<String> args);
26+
@Deprecated Object tFunctionCallAsync(String library, String function, List<String> keys, List<String> args);
2627
}

src/main/java/redis/clients/jedis/gears/RedisGearsProtocol.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@
44
import redis.clients.jedis.commands.ProtocolCommand;
55
import redis.clients.jedis.util.SafeEncoder;
66

7+
@Deprecated
78
public class RedisGearsProtocol {
89

10+
@Deprecated
911
public enum GearsCommand implements ProtocolCommand {
1012

11-
TFUNCTION,
12-
TFCALL,
13-
TFCALLASYNC;
13+
@Deprecated TFUNCTION,
14+
@Deprecated TFCALL,
15+
@Deprecated TFCALLASYNC;
1416

1517
private final byte[] raw;
1618

@@ -24,6 +26,7 @@ public byte[] getRaw() {
2426
}
2527
}
2628

29+
@Deprecated
2730
public enum GearsKeyword implements Rawable {
2831

2932
CONFIG,

src/main/java/redis/clients/jedis/gears/TFunctionListParams.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
import java.util.Collections;
88

9+
@Deprecated
910
public class TFunctionListParams implements IParams {
1011
private boolean withCode = false;
1112
private int verbose;

src/main/java/redis/clients/jedis/gears/TFunctionLoadParams.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import redis.clients.jedis.gears.RedisGearsProtocol.GearsKeyword;
55
import redis.clients.jedis.params.IParams;
66

7+
@Deprecated
78
public class TFunctionLoadParams implements IParams {
89
private boolean replace = false;
910
private String config;

src/main/java/redis/clients/jedis/gears/resps/FunctionInfo.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
import static redis.clients.jedis.BuilderFactory.*;
1212

13+
@Deprecated
1314
public class FunctionInfo {
1415
private final String name;
1516
private final String description;
@@ -40,6 +41,7 @@ public FunctionInfo(String name, String description, boolean isAsync, List<Strin
4041
this.flags = flags;
4142
}
4243

44+
@Deprecated
4345
public static final Builder<List<FunctionInfo>> FUNCTION_INFO_LIST = new Builder<List<FunctionInfo>>() {
4446
@Override
4547
public List<FunctionInfo> build(Object data) {

src/main/java/redis/clients/jedis/gears/resps/FunctionStreamInfo.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import java.util.List;
77
import java.util.stream.Collectors;
88

9+
@Deprecated
910
public class FunctionStreamInfo {
1011
private final String name;
1112
private final String idToReadFrom;
@@ -67,6 +68,7 @@ public FunctionStreamInfo(String name, String idToReadFrom, String lastError,
6768
this.pendingIds = pendingIds;
6869
}
6970

71+
@Deprecated
7072
public static final Builder<List<FunctionStreamInfo>> STREAM_INFO_LIST = new Builder<List<FunctionStreamInfo>>() {
7173
@Override
7274
public List<FunctionStreamInfo> build(Object data) {

src/main/java/redis/clients/jedis/gears/resps/GearsLibraryInfo.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import static redis.clients.jedis.gears.resps.StreamTriggerInfo.STREAM_TRIGGER_INFO_LIST;
1313
import static redis.clients.jedis.gears.resps.TriggerInfo.KEYSPACE_TRIGGER_INFO_LIST;
1414

15+
@Deprecated
1516
public class GearsLibraryInfo {
1617
private final String apiVersion;
1718
private final List<String> clusterFunctions;
@@ -90,6 +91,7 @@ public String getUser() {
9091
return user;
9192
}
9293

94+
@Deprecated
9395
public static final Builder<GearsLibraryInfo> GEARS_LIBRARY_INFO = new Builder<GearsLibraryInfo>() {
9496
@Override
9597
public GearsLibraryInfo build(Object data) {
@@ -171,6 +173,7 @@ public GearsLibraryInfo build(Object data) {
171173
}
172174
};
173175

176+
@Deprecated
174177
public static final Builder<List<GearsLibraryInfo>> GEARS_LIBRARY_INFO_LIST = new Builder<List<GearsLibraryInfo>>() {
175178
@Override
176179
public List<GearsLibraryInfo> build(Object data) {

src/main/java/redis/clients/jedis/gears/resps/StreamTriggerInfo.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import static redis.clients.jedis.BuilderFactory.*;
1212
import static redis.clients.jedis.gears.resps.FunctionStreamInfo.STREAM_INFO_LIST;
1313

14+
@Deprecated
1415
public class StreamTriggerInfo {
1516
private final String name;
1617
private final String description;
@@ -60,6 +61,7 @@ public StreamTriggerInfo(String name, String description, String prefix,
6061
this(name, description, prefix, window, trim, Collections.emptyList());
6162
}
6263

64+
@Deprecated
6365
public static final Builder<List<StreamTriggerInfo>> STREAM_TRIGGER_INFO_LIST = new Builder<List<StreamTriggerInfo>>() {
6466
@Override
6567
public List<StreamTriggerInfo> build(Object data) {

src/main/java/redis/clients/jedis/gears/resps/TriggerInfo.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import static redis.clients.jedis.BuilderFactory.LONG;
1212
import static redis.clients.jedis.BuilderFactory.STRING;
1313

14+
@Deprecated
1415
public class TriggerInfo {
1516
private final String name;
1617
private final String description;
@@ -80,6 +81,7 @@ public TriggerInfo(String name, String description, String lastError, long numFi
8081
this.totalExecutionTime = totalExecutionTime;
8182
}
8283

84+
@Deprecated
8385
public static final Builder<List<TriggerInfo>> KEYSPACE_TRIGGER_INFO_LIST = new Builder<List<TriggerInfo>>() {
8486
@Override
8587
public List<TriggerInfo> build(Object data) {

src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsTriggersAndFunctionsCommandsTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import java.util.ArrayList;
99
import java.util.List;
1010
import org.junit.After;
11+
import org.junit.Ignore;
1112
import org.junit.Test;
1213

1314
import redis.clients.jedis.RedisProtocol;
@@ -19,6 +20,7 @@
1920
/**
2021
* Tests related to <a href="https://redis.io/commands/?group=triggers_and_functions">Triggers and functions</a> commands.
2122
*/
23+
@Ignore
2224
public class CommandObjectsTriggersAndFunctionsCommandsTest extends CommandObjectsModulesTestBase {
2325

2426
public CommandObjectsTriggersAndFunctionsCommandsTest(RedisProtocol protocol) {

src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisTriggersAndFunctionsCommandsTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@
99
import java.util.ArrayList;
1010
import java.util.Arrays;
1111
import java.util.List;
12-
12+
import org.junit.Ignore;
1313
import org.junit.Test;
1414
import redis.clients.jedis.gears.TFunctionListParams;
1515
import redis.clients.jedis.gears.TFunctionLoadParams;
1616
import redis.clients.jedis.gears.resps.GearsLibraryInfo;
1717

18+
@Ignore
1819
public class UnifiedJedisTriggersAndFunctionsCommandsTest extends UnifiedJedisMockedTestBase {
1920

2021
@Test

src/test/java/redis/clients/jedis/modules/gears/GearsTest.java

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,19 @@
11
package redis.clients.jedis.modules.gears;
22

3+
import java.io.IOException;
4+
import java.nio.file.Files;
5+
import java.nio.file.Path;
6+
import java.nio.file.Paths;
7+
import java.util.*;
8+
import java.util.function.Predicate;
9+
import java.util.stream.Collectors;
10+
import java.util.stream.Stream;
11+
312
import org.hamcrest.Matchers;
413
import org.junit.After;
514
import org.junit.Assert;
615
import org.junit.BeforeClass;
16+
import org.junit.Ignore;
717
import org.junit.Test;
818
import org.junit.runner.RunWith;
919
import org.junit.runners.Parameterized;
@@ -15,22 +25,14 @@
1525
import redis.clients.jedis.modules.RedisModuleCommandsTestBase;
1626
import redis.clients.jedis.gears.resps.GearsLibraryInfo;
1727

18-
import java.io.IOException;
19-
import java.nio.file.Files;
20-
import java.nio.file.Path;
21-
import java.nio.file.Paths;
22-
import java.util.*;
23-
import java.util.function.Predicate;
24-
import java.util.stream.Collectors;
25-
import java.util.stream.Stream;
26-
2728
import static org.hamcrest.MatcherAssert.assertThat;
2829
import static org.junit.Assert.assertEquals;
2930
import static org.junit.Assert.assertFalse;
3031
import static org.junit.Assert.assertNotNull;
3132
import static org.junit.Assert.assertNull;
3233
import static org.junit.Assert.assertTrue;
3334

35+
@Ignore
3436
@RunWith(Parameterized.class)
3537
public class GearsTest extends RedisModuleCommandsTestBase {
3638

0 commit comments

Comments
 (0)