Skip to content

Commit d07f276

Browse files
committed
Updates code with 5.0.0-beta2 jedis.
1 parent ca05786 commit d07f276

File tree

5 files changed

+24
-15
lines changed

5 files changed

+24
-15
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ redis.clients.jedis.exceptions.JedisConnectionException: java.net.SocketTimeoutE
101101
at redis.clients.jedis.executors.CircuitBreakerCommandExecutor.executeCommand(CircuitBreakerCommandExecutor.java:55)
102102
at redis.clients.jedis.UnifiedJedis.executeCommand(UnifiedJedis.java:180)
103103
at redis.clients.jedis.UnifiedJedis.get(UnifiedJedis.java:602)
104-
at com.redis.benchmark.utils.Util.createOneMillionOfKeys(Util.java:15)
104+
at createOneMillionStringKeysKeys(Util.java:15)
105105
at com.redis.benchmark.RedisBenchmark.setup(RedisBenchmark.java:25)
106106
at com.redis.benchmark.jmh_generated.RedisBenchmark_jedisSimpleGet_jmhTest._jmh_tryInit_f_redisbenchmark0_0(RedisBenchmark_jedisSimpleGet_jmhTest.java:338)
107107
at com.redis.benchmark.jmh_generated.RedisBenchmark_jedisSimpleGet_jmhTest.jedisSimpleGet_Throughput(RedisBenchmark_jedisSimpleGet_jmhTest.java:71)

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<maven.compiler.target>11</maven.compiler.target>
3737
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3838
<jmh.version>1.36</jmh.version>
39-
<jedis.version>5.0.0-SNAPSHOT</jedis.version>
39+
<jedis.version>5.0.0-beta2</jedis.version>
4040
<jreleaser.version>1.3.1</jreleaser.version>
4141
<resilience4j.version>1.7.1</resilience4j.version>
4242
<slf4j.version>1.7.36</slf4j.version>

src/main/java/com/redis/benchmark/RedisBenchmark.java

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,20 @@
33
import com.redis.benchmark.utils.BenchmarkConfiguration;
44
import com.redis.benchmark.utils.JedisConnectionManagement;
55
import com.redis.benchmark.utils.Util;
6-
import org.openjdk.jmh.annotations.*;
7-
import redis.clients.jedis.commands.JedisCommands;
86
import java.util.concurrent.TimeUnit;
7+
import org.openjdk.jmh.annotations.BenchmarkMode;
8+
import org.openjdk.jmh.annotations.Mode;
9+
import org.openjdk.jmh.annotations.Warmup;
10+
import org.openjdk.jmh.annotations.Threads;
11+
import org.openjdk.jmh.annotations.State;
12+
import org.openjdk.jmh.annotations.Scope;
13+
import org.openjdk.jmh.annotations.Measurement;
14+
import org.openjdk.jmh.annotations.OutputTimeUnit;
15+
import org.openjdk.jmh.annotations.Setup;
16+
import org.openjdk.jmh.annotations.Level;
17+
import org.openjdk.jmh.annotations.Benchmark;
18+
import org.openjdk.jmh.annotations.TearDown;
19+
import redis.clients.jedis.UnifiedJedis;
920

1021
@BenchmarkMode({Mode.Throughput, Mode.AverageTime})
1122
@Warmup(iterations = 1)
@@ -14,15 +25,15 @@
1425
@Measurement(iterations = 1, time = 1000, timeUnit = TimeUnit.MILLISECONDS)
1526
@OutputTimeUnit(TimeUnit.MILLISECONDS)
1627
public class RedisBenchmark {
17-
private static JedisCommands jedisCommands;
28+
private static UnifiedJedis jedisCommands;
1829
private static Integer jedisGetCount = 0;
1930
private static Integer jedisSetCount = 0;
2031

2132
@Setup(Level.Trial)
2233
public void setup() {
2334
System.out.println("\n------------------- Setup");
2435

25-
Util.createOneMillionOfKeys();
36+
Util.createOneMillionStringKeys();
2637

2738
jedisCommands = JedisConnectionManagement.getCommands();
2839
}

src/main/java/com/redis/benchmark/utils/JedisConnectionManagement.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
package com.redis.benchmark.utils;
22

3+
import java.io.File;
4+
import java.nio.file.Path;
5+
import java.util.Set;
36
import redis.clients.jedis.DefaultJedisClientConfig;
47
import redis.clients.jedis.HostAndPort;
58
import redis.clients.jedis.JedisClientConfig;
69
import redis.clients.jedis.MultiClusterClientConfig.ClusterConfig;
710
import redis.clients.jedis.UnifiedJedis;
8-
import redis.clients.jedis.commands.JedisCommands;
911
import redis.clients.jedis.MultiClusterClientConfig;
1012
import redis.clients.jedis.providers.MultiClusterPooledConnectionProvider;
1113

12-
import java.io.File;
13-
import java.nio.file.Path;
14-
import java.util.Set;
15-
1614
public final class JedisConnectionManagement {
1715
private static final JedisConnectionManagement connectionManagement = new JedisConnectionManagement();
1816
private static Boolean connectionCreated = false;
@@ -70,7 +68,7 @@ private void createJedisConnection() {
7068
}
7169
}
7270

73-
public static JedisCommands getCommands() {
71+
public static UnifiedJedis getCommands() {
7472
if (!connectionCreated) {
7573
connectionManagement.createJedisConnection();
7674
connectionCreated = Boolean.TRUE;

src/main/java/com/redis/benchmark/utils/Util.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.redis.benchmark.utils;
22

3-
import redis.clients.jedis.commands.JedisCommands;
3+
import redis.clients.jedis.UnifiedJedis;
44
import redis.clients.jedis.exceptions.JedisConnectionException;
55

66
public final class Util {
@@ -10,8 +10,8 @@ public final class Util {
1010
private Util() {
1111
}
1212

13-
public static void createOneMillionOfKeys() {
14-
JedisCommands commands = JedisConnectionManagement.getCommands();
13+
public static void createOneMillionStringKeys() {
14+
UnifiedJedis commands = JedisConnectionManagement.getCommands();
1515
String keysCreated = commands.get(BenchmarkKeysCreated);
1616
if (keysCreated != null && keysCreated.equals("y")) {
1717
return;

0 commit comments

Comments
 (0)