Skip to content

Commit c3eae13

Browse files
committed
Merge branch 'master' into graph-complete-remove
2 parents b1dae57 + 8da5104 commit c3eae13

20 files changed

+84
-1680
lines changed

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

-35
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
import redis.clients.jedis.bloom.*;
2020
import redis.clients.jedis.bloom.RedisBloomProtocol.*;
2121
import redis.clients.jedis.commands.ProtocolCommand;
22-
import redis.clients.jedis.gears.*;
23-
import redis.clients.jedis.gears.RedisGearsProtocol.*;
24-
import redis.clients.jedis.gears.resps.GearsLibraryInfo;
2522
import redis.clients.jedis.json.*;
2623
import redis.clients.jedis.json.JsonProtocol.JsonCommand;
2724
import redis.clients.jedis.json.DefaultGsonObjectMapper;
@@ -4384,38 +4381,6 @@ public final CommandObject<List<Double>> tdigestByRevRank(String key, long... ra
43844381
}
43854382
// RedisBloom commands
43864383

4387-
// RedisGears commands
4388-
@Deprecated
4389-
public final CommandObject<String> tFunctionLoad(String libraryCode, TFunctionLoadParams params) {
4390-
return new CommandObject<>(commandArguments(GearsCommand.TFUNCTION).add(GearsKeyword.LOAD)
4391-
.addParams(params).add(libraryCode), BuilderFactory.STRING);
4392-
}
4393-
4394-
@Deprecated
4395-
public final CommandObject<String> tFunctionDelete(String libraryName) {
4396-
return new CommandObject<>(commandArguments(GearsCommand.TFUNCTION).add(GearsKeyword.DELETE)
4397-
.add(libraryName), BuilderFactory.STRING);
4398-
}
4399-
4400-
@Deprecated
4401-
public final CommandObject<List<GearsLibraryInfo>> tFunctionList(TFunctionListParams params) {
4402-
return new CommandObject<>(commandArguments(GearsCommand.TFUNCTION).add(GearsKeyword.LIST)
4403-
.addParams(params), GearsLibraryInfo.GEARS_LIBRARY_INFO_LIST);
4404-
}
4405-
4406-
@Deprecated
4407-
public final CommandObject<Object> tFunctionCall(String library, String function, List<String> keys, List<String> args) {
4408-
return new CommandObject<>(commandArguments(GearsCommand.TFCALL).add(library + "." + function)
4409-
.add(keys.size()).keys(keys).addObjects(args), BuilderFactory.AGGRESSIVE_ENCODED_OBJECT);
4410-
}
4411-
4412-
@Deprecated
4413-
public final CommandObject<Object> tFunctionCallAsync(String library, String function, List<String> keys, List<String> args) {
4414-
return new CommandObject<>(commandArguments(GearsCommand.TFCALLASYNC).add(library + "." + function)
4415-
.add(keys.size()).keys(keys).addObjects(args), BuilderFactory.AGGRESSIVE_ENCODED_OBJECT);
4416-
}
4417-
// RedisGears commands
4418-
44194384
// Transaction commands
44204385
public final CommandObject<String> watch(String... keys) {
44214386
return new CommandObject<>(commandArguments(WATCH).keys((Object[]) keys), BuilderFactory.STRING);

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

-35
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@
2525
import redis.clients.jedis.csc.CacheFactory;
2626
import redis.clients.jedis.exceptions.JedisException;
2727
import redis.clients.jedis.executors.*;
28-
import redis.clients.jedis.gears.TFunctionListParams;
29-
import redis.clients.jedis.gears.TFunctionLoadParams;
30-
import redis.clients.jedis.gears.resps.GearsLibraryInfo;
3128
import redis.clients.jedis.json.JsonSetParams;
3229
import redis.clients.jedis.json.Path;
3330
import redis.clients.jedis.json.Path2;
@@ -4959,38 +4956,6 @@ public List<Double> tdigestByRevRank(String key, long... ranks) {
49594956
}
49604957
// RedisBloom commands
49614958

4962-
// RedisGears commands
4963-
@Deprecated
4964-
@Override
4965-
public String tFunctionLoad(String libraryCode, TFunctionLoadParams params) {
4966-
return executeCommand(commandObjects.tFunctionLoad(libraryCode, params));
4967-
}
4968-
4969-
@Deprecated
4970-
@Override
4971-
public String tFunctionDelete(String libraryName) {
4972-
return executeCommand(commandObjects.tFunctionDelete(libraryName));
4973-
}
4974-
4975-
@Deprecated
4976-
@Override
4977-
public List<GearsLibraryInfo> tFunctionList(TFunctionListParams params) {
4978-
return executeCommand(commandObjects.tFunctionList(params));
4979-
}
4980-
4981-
@Deprecated
4982-
@Override
4983-
public Object tFunctionCall(String library, String function, List<String> keys, List<String> args) {
4984-
return executeCommand(commandObjects.tFunctionCall(library, function, keys, args));
4985-
}
4986-
4987-
@Deprecated
4988-
@Override
4989-
public Object tFunctionCallAsync(String library, String function, List<String> keys, List<String> args) {
4990-
return executeCommand(commandObjects.tFunctionCallAsync(library, function, keys, args));
4991-
}
4992-
// RedisGears commands
4993-
49944959
/**
49954960
* @return pipeline object. Use {@link AbstractPipeline} instead of {@link PipelineBase}.
49964961
*/
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package redis.clients.jedis.commands;
22

33
import redis.clients.jedis.bloom.commands.RedisBloomCommands;
4-
import redis.clients.jedis.gears.RedisGearsCommands;
54
import redis.clients.jedis.json.commands.RedisJsonCommands;
65
import redis.clients.jedis.search.RediSearchCommands;
76
import redis.clients.jedis.timeseries.RedisTimeSeriesCommands;
@@ -10,7 +9,6 @@ public interface RedisModuleCommands extends
109
RediSearchCommands,
1110
RedisJsonCommands,
1211
RedisTimeSeriesCommands,
13-
RedisBloomCommands,
14-
RedisGearsCommands {
12+
RedisBloomCommands {
1513

1614
}

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

-27
This file was deleted.

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

-52
This file was deleted.

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

-50
This file was deleted.

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

-36
This file was deleted.

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

-99
This file was deleted.

0 commit comments

Comments
 (0)