Skip to content

Commit 050f6e0

Browse files
committed
Test according to design doc with Redis 8.0-M03
1 parent fc01783 commit 050f6e0

7 files changed

+99
-34
lines changed

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

+4
Original file line numberDiff line numberDiff line change
@@ -3531,19 +3531,23 @@ public final CommandObject<Set<String>> ftTagVals(String indexName, String field
35313531
.add(fieldName), BuilderFactory.STRING_SET);
35323532
}
35333533

3534+
@Deprecated
35343535
public final CommandObject<Map<String, Object>> ftConfigGet(String option) {
35353536
return new CommandObject<>(commandArguments(SearchCommand.CONFIG).add(SearchKeyword.GET).add(option),
35363537
protocol == RedisProtocol.RESP3 ? BuilderFactory.AGGRESSIVE_ENCODED_OBJECT_MAP : BuilderFactory.ENCODED_OBJECT_MAP_FROM_PAIRS);
35373538
}
35383539

3540+
@Deprecated
35393541
public final CommandObject<Map<String, Object>> ftConfigGet(String indexName, String option) {
35403542
return directSearchCommand(ftConfigGet(option), indexName);
35413543
}
35423544

3545+
@Deprecated
35433546
public final CommandObject<String> ftConfigSet(String option, String value) {
35443547
return new CommandObject<>(commandArguments(SearchCommand.CONFIG).add(SearchKeyword.SET).add(option).add(value), BuilderFactory.STRING);
35453548
}
35463549

3550+
@Deprecated
35473551
public final CommandObject<String> ftConfigSet(String indexName, String option, String value) {
35483552
return directSearchCommand(ftConfigSet(option, value), indexName);
35493553
}

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

+4
Original file line numberDiff line numberDiff line change
@@ -3565,21 +3565,25 @@ public Response<Set<String>> ftTagVals(String indexName, String fieldName) {
35653565
}
35663566

35673567
@Override
3568+
@Deprecated
35683569
public Response<Map<String, Object>> ftConfigGet(String option) {
35693570
return appendCommand(commandObjects.ftConfigGet(option));
35703571
}
35713572

35723573
@Override
3574+
@Deprecated
35733575
public Response<Map<String, Object>> ftConfigGet(String indexName, String option) {
35743576
return appendCommand(commandObjects.ftConfigGet(indexName, option));
35753577
}
35763578

35773579
@Override
3580+
@Deprecated
35783581
public Response<String> ftConfigSet(String option, String value) {
35793582
return appendCommand(commandObjects.ftConfigSet(option, value));
35803583
}
35813584

35823585
@Override
3586+
@Deprecated
35833587
public Response<String> ftConfigSet(String indexName, String option, String value) {
35843588
return appendCommand(commandObjects.ftConfigSet(indexName, option, value));
35853589
}

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

+4
Original file line numberDiff line numberDiff line change
@@ -4067,21 +4067,25 @@ public Set<String> ftTagVals(String indexName, String fieldName) {
40674067
}
40684068

40694069
@Override
4070+
@Deprecated
40704071
public Map<String, Object> ftConfigGet(String option) {
40714072
return executeCommand(commandObjects.ftConfigGet(option));
40724073
}
40734074

40744075
@Override
4076+
@Deprecated
40754077
public Map<String, Object> ftConfigGet(String indexName, String option) {
40764078
return executeCommand(commandObjects.ftConfigGet(indexName, option));
40774079
}
40784080

40794081
@Override
4082+
@Deprecated
40804083
public String ftConfigSet(String option, String value) {
40814084
return executeCommand(commandObjects.ftConfigSet(option, value));
40824085
}
40834086

40844087
@Override
4088+
@Deprecated
40854089
public String ftConfigSet(String indexName, String option, String value) {
40864090
return executeCommand(commandObjects.ftConfigSet(indexName, option, value));
40874091
}

src/main/java/redis/clients/jedis/search/RediSearchCommands.java

+11
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import java.util.Map;
66
import java.util.Set;
77

8+
import redis.clients.jedis.commands.ConfigCommands;
89
import redis.clients.jedis.resps.Tuple;
910
import redis.clients.jedis.search.aggr.AggregationBuilder;
1011
import redis.clients.jedis.search.aggr.AggregationResult;
@@ -107,12 +108,22 @@ Map<String, Map<String, Double>> ftSpellCheck(String index, String query,
107108

108109
Set<String> ftTagVals(String indexName, String fieldName);
109110

111+
/**
112+
* @deprecated {@link ConfigCommands#configGet(java.lang.String)} is used since Redis 8.
113+
*/
114+
@Deprecated
110115
Map<String, Object> ftConfigGet(String option);
111116

117+
@Deprecated
112118
Map<String, Object> ftConfigGet(String indexName, String option);
113119

120+
/**
121+
* @deprecated {@link ConfigCommands#configSet(java.lang.String, java.lang.String)} is used since Redis 8.
122+
*/
123+
@Deprecated
114124
String ftConfigSet(String option, String value);
115125

126+
@Deprecated
116127
String ftConfigSet(String indexName, String option, String value);
117128

118129
long ftSugAdd(String key, String string, double score);

src/main/java/redis/clients/jedis/search/RediSearchPipelineCommands.java

+4
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,16 @@ Response<Map<String, Map<String, Double>>> ftSpellCheck(String index, String que
9595

9696
Response<Set<String>> ftTagVals(String indexName, String fieldName);
9797

98+
@Deprecated
9899
Response<Map<String, Object>> ftConfigGet(String option);
99100

101+
@Deprecated
100102
Response<Map<String, Object>> ftConfigGet(String indexName, String option);
101103

104+
@Deprecated
102105
Response<String> ftConfigSet(String option, String value);
103106

107+
@Deprecated
104108
Response<String> ftConfigSet(String indexName, String option, String value);
105109

106110
Response<Long> ftSugAdd(String key, String string, double score);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
package redis.clients.jedis.modules;
2+
3+
import static org.hamcrest.MatcherAssert.assertThat;
4+
import static org.hamcrest.Matchers.aMapWithSize;
5+
import static org.junit.Assert.assertEquals;
6+
import static org.junit.Assert.assertThrows;
7+
8+
import java.util.Collections;
9+
import org.hamcrest.Matchers;
10+
import org.junit.Test;
11+
import org.junit.runner.RunWith;
12+
import org.junit.runners.Parameterized;
13+
import redis.clients.jedis.RedisProtocol;
14+
import redis.clients.jedis.commands.jedis.JedisCommandsTestBase;
15+
import redis.clients.jedis.exceptions.JedisDataException;
16+
17+
@RunWith(Parameterized.class)
18+
public class RedisModulesConsolidatedConfigurationCommandsTest extends JedisCommandsTestBase {
19+
20+
public RedisModulesConsolidatedConfigurationCommandsTest(RedisProtocol redisProtocol) {
21+
super(redisProtocol);
22+
}
23+
24+
@org.junit.Ignore(value = "failing")
25+
@Test
26+
public void setSearchConfigGloballyTest() {
27+
final String configParam = "search-default-dialect";
28+
// confirm default - Redis 8.0-M03 has no default dialect
29+
//assertEquals(Collections.singletonMap(configParam, "1"), jedis.configGet(configParam));
30+
assertEquals(Collections.emptyMap(), jedis.configGet(configParam));
31+
32+
try {
33+
assertEquals("OK", jedis.configSet(configParam, "2"));
34+
assertEquals(Collections.singletonMap(configParam, "2"), jedis.configGet(configParam));
35+
36+
} finally {
37+
// restore to default
38+
assertEquals("OK", jedis.configSet(configParam, "1"));
39+
}
40+
}
41+
42+
@Test
43+
public void setReadOnlySearchConfigTest() {
44+
JedisDataException de = assertThrows(JedisDataException.class, () -> jedis.configSet("search-max-doctablesize", "10"));
45+
assertThat(de.getMessage(), Matchers.not(Matchers.emptyOrNullString()));
46+
}
47+
48+
@Test
49+
public void getSearchConfigSettingTest() {
50+
assertThat(jedis.configGet("search-timeout"), aMapWithSize(0)); // Redis 8.0-M03 has no default value
51+
}
52+
53+
@Test
54+
public void getTSConfigSettingTest() {
55+
assertThat(jedis.configGet("ts-retention-policy"), aMapWithSize(1));
56+
}
57+
58+
@Test
59+
public void getBFConfigSettingTest() {
60+
assertThat(jedis.configGet("bf-error-rate"), aMapWithSize(1));
61+
}
62+
63+
@Test
64+
public void getCFConfigSettingTest() {
65+
assertThat(jedis.configGet("cf-initial-size"), aMapWithSize(1));
66+
}
67+
68+
@Test
69+
public void getAllConigSettings() {
70+
assertThat(jedis.configGet("*").size(), Matchers.greaterThan(0));
71+
}
72+
}

src/test/java/redis/clients/jedis/modules/RedisModulesControlCommandsTest.java

-34
This file was deleted.

0 commit comments

Comments
 (0)