Skip to content

Commit 5974c62

Browse files
committed
Updated to Redis 7.2.0 with minimal code changes
1 parent 3cbb8f5 commit 5974c62

File tree

17 files changed

+41
-88
lines changed

17 files changed

+41
-88
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>net.greghaines</groupId>
55
<artifactId>jesque</artifactId>
6-
<version>2.3.1-SNAPSHOT</version>
6+
<version>3.0.0-SNAPSHOT</version>
77
<packaging>jar</packaging>
88
<name>Jesque</name>
99
<description>An implementation of Resque in Java</description>
@@ -258,7 +258,7 @@
258258
<dependency>
259259
<groupId>redis.clients</groupId>
260260
<artifactId>jedis</artifactId>
261-
<version>3.10.0</version>
261+
<version>7.2.0</version>
262262
</dependency>
263263
<dependency>
264264
<groupId>org.apache.commons</groupId>

src/main/java/net/greghaines/jesque/admin/AdminClientImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public void end() {
120120
if (this.keepAliveService != null) {
121121
this.keepAliveService.shutdownNow();
122122
}
123-
this.jedis.quit();
123+
this.jedis.close();
124124
}
125125

126126
private void authenticateAndSelectDB() {

src/main/java/net/greghaines/jesque/admin/AdminImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public void run() {
139139
}
140140
} finally {
141141
LOG.debug("AdminImpl shutting down");
142-
this.jedis.quit();
142+
this.jedis.close();
143143
this.threadRef.set(null);
144144
}
145145
} else {

src/main/java/net/greghaines/jesque/client/ClientImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public void end() {
146146
if (this.keepAliveService != null) {
147147
this.keepAliveService.shutdownNow();
148148
}
149-
this.jedis.quit();
149+
this.jedis.close();
150150
}
151151

152152
/**

src/main/java/net/greghaines/jesque/meta/dao/impl/QueueInfoDAORedisImpl.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import java.util.ArrayList;
2424
import java.util.Collections;
2525
import java.util.List;
26-
import java.util.Set;
2726

2827
import net.greghaines.jesque.Config;
2928
import net.greghaines.jesque.Job;
@@ -35,7 +34,7 @@
3534
import net.greghaines.jesque.utils.PoolUtils;
3635
import net.greghaines.jesque.utils.PoolUtils.PoolWork;
3736
import redis.clients.jedis.Jedis;
38-
import redis.clients.jedis.Tuple;
37+
import redis.clients.jedis.resps.Tuple;
3938
import redis.clients.jedis.util.Pool;
4039

4140
/**
@@ -245,7 +244,7 @@ private List<Job> getJobs(final Jedis jedis, final String queueName, final long
245244
final String key = key(QUEUE, queueName);
246245
final List<Job> jobs = new ArrayList<>();
247246
if (JedisUtils.isDelayedQueue(jedis, key)) { // If delayed queue, use ZRANGEWITHSCORES
248-
final Set<Tuple> elements = jedis.zrangeWithScores(key, jobOffset, jobOffset + jobCount - 1);
247+
final List<Tuple> elements = jedis.zrangeWithScores(key, jobOffset, jobOffset + jobCount - 1);
249248
for (final Tuple elementWithScore : elements) {
250249
final Job job = ObjectMapperFactory.get().readValue(elementWithScore.getElement(), Job.class);
251250
job.setRunAt(elementWithScore.getScore());

src/main/java/net/greghaines/jesque/utils/JedisUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public static boolean ensureJedisConnection(final Jedis jedis) {
4848
final boolean jedisOK = testJedisConnection(jedis);
4949
if (!jedisOK) {
5050
try {
51-
jedis.quit();
51+
jedis.close();
5252
} catch (Exception e) {
5353
} // Ignore
5454
try {

src/main/java/net/greghaines/jesque/worker/WorkerImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ public void run() {
227227
this.jedis.srem(key(WORKERS), this.name);
228228
this.jedis.del(key(WORKER, this.name), key(WORKER, this.name, STARTED), key(STAT, FAILED, this.name),
229229
key(STAT, PROCESSED, this.name));
230-
this.jedis.quit();
230+
this.jedis.close();
231231
this.threadRef.set(null);
232232
}
233233
} else if (RUNNING.equals(this.state.get())) {

src/test/java/net/greghaines/jesque/ClientBeforeWorkerTest.java

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,8 @@ public void issue18() throws Exception {
5656
// Enqueue the job before worker is created and started
5757
final Job job = new Job("TestAction", new Object[] { 1, 2.3, true, "test", Arrays.asList("inner", 4.5) });
5858
TestUtils.enqueueJobs(testQueue, Arrays.asList(job), config);
59-
Jedis jedis = createJedis(config);
60-
try { // Assert that we enqueued the job
61-
Assert.assertEquals(Long.valueOf(1), jedis.llen(createKey(config.getNamespace(), QUEUE, testQueue)));
62-
} finally {
63-
jedis.quit();
59+
try (Jedis jedis = createJedis(config)) { // Assert that we enqueued the job
60+
Assert.assertEquals(1L, jedis.llen(createKey(config.getNamespace(), QUEUE, testQueue)));
6461
}
6562

6663
// Create and start worker
@@ -75,13 +72,10 @@ public void issue18() throws Exception {
7572
}
7673

7774
// Assert that the job was run by the worker
78-
jedis = createJedis(config);
79-
try {
75+
try (Jedis jedis = createJedis(config)) {
8076
Assert.assertEquals("1", jedis.get(createKey(config.getNamespace(), STAT, PROCESSED)));
8177
Assert.assertNull(jedis.get(createKey(config.getNamespace(), STAT, FAILED)));
82-
Assert.assertEquals(Long.valueOf(0), jedis.llen(createKey(config.getNamespace(), QUEUE, testQueue)));
83-
} finally {
84-
jedis.quit();
78+
Assert.assertEquals(0L, jedis.llen(createKey(config.getNamespace(), QUEUE, testQueue)));
8579
}
8680
}
8781
}

src/test/java/net/greghaines/jesque/DelayedQueueTest.java

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,9 @@ public void testCode() throws Exception {
5252
}
5353
TestUtils.enqueueJobs(testQueue, jobs, config);
5454

55-
Jedis jedis = createJedis(config);
56-
try { // Assert that we enqueued the job
57-
Assert.assertEquals(Long.valueOf(10),
55+
try (Jedis jedis = createJedis(config)) { // Assert that we enqueued the job
56+
Assert.assertEquals(10L,
5857
jedis.zcount(createKey(config.getNamespace(), QUEUE, delayTestQueue), "-inf", "+inf"));
59-
} finally {
60-
jedis.quit();
6158
}
6259

6360
// Create and start worker
@@ -79,14 +76,11 @@ public void testCode() throws Exception {
7976
}
8077

8178
// Assert that the job was run by the worker
82-
jedis = createJedis(config);
83-
try {
79+
try (Jedis jedis = createJedis(config)) {
8480
Assert.assertEquals(String.valueOf(20), jedis.get(createKey(config.getNamespace(), STAT, PROCESSED)));
8581
Assert.assertNull(jedis.get(createKey(config.getNamespace(), STAT, FAILED)));
86-
Assert.assertEquals(Long.valueOf(0),
82+
Assert.assertEquals(0L,
8783
jedis.zcount(createKey(config.getNamespace(), QUEUE, delayTestQueue), "-inf", "+inf"));
88-
} finally {
89-
jedis.quit();
9084
}
9185
}
9286
}

src/test/java/net/greghaines/jesque/DurabilityTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public void testNotInterrupted() throws InterruptedException, JsonProcessingExce
5353

5454
final Jedis jedis = TestUtils.createJedis(config);
5555
Assert.assertEquals("In-flight list should have length one when running the job",
56-
jedis.llen(inFlightKey(worker, queue)), (Long)1L);
56+
1L, jedis.llen(inFlightKey(worker, queue)));
5757
Assert.assertEquals("Object on the in-flight list should be the first job",
5858
ObjectMapperFactory.get().writeValueAsString(sleepJob),
5959
jedis.lindex(inFlightKey(worker, queue), 0));
@@ -63,7 +63,7 @@ public void testNotInterrupted() throws InterruptedException, JsonProcessingExce
6363
Assert.assertTrue("The job should not be requeued after succesful processing",
6464
jedis.llen(JesqueUtils.createKey(config.getNamespace(), QUEUE, queue)) == 0L);
6565
Assert.assertEquals("In-flight list should be empty when finishing a job",
66-
jedis.llen(inFlightKey(worker, queue)), (Long)0L);
66+
0L, jedis.llen(inFlightKey(worker, queue)));
6767
}
6868

6969
@Test
@@ -123,7 +123,7 @@ public void testJSONException() throws InterruptedException {
123123
TestUtils.stopWorker(worker, workerThread, false);
124124

125125
Assert.assertEquals("In-flight list should have length zero if the worker failed during JSON deserialization",
126-
jedis.llen(inFlightKey(worker, queue)), (Long) 0L);
126+
0L, jedis.llen(inFlightKey(worker, queue)));
127127
}
128128

129129
private static String inFlightKey(final Worker worker, final String queue) {

0 commit comments

Comments
 (0)