github-forks
/
redisson
mirror of https://github.com/redisson/redisson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:redisson/redisson

Browse Source
pull/6151/head
Nikita Koksharov 6 months ago
parent 2ed79895e3 e9bd62dc3f
commit 837a26b5c4
11 changed files with 138 additions and 17 deletions
Show Stats Download Patch File Download Diff File

2
redisson-spring-data/redisson-spring-data-32/pom.xml
Unescape Escape View File

@ -48,7 +48,7 @@
<forkCount>4</forkCount>
<reuseForks>true</reuseForks>
<argLine>${argLine} -javaagent:"${settings.localRepository}"/com/github/hazendaz/jmockit/jmockit/1.52.0/jmockit-1.52.0.jar</argLine>
<argLine>${argLine} -javaagent:"${settings.localRepository}"/com/github/hazendaz/jmockit/jmockit/1.54.0/jmockit-1.54.0.jar</argLine>
</configuration>
</plugin>

2
redisson-spring-data/redisson-spring-data-33/pom.xml
Unescape Escape View File

@ -48,7 +48,7 @@
<forkCount>4</forkCount>
<reuseForks>true</reuseForks>
<argLine>${argLine} -javaagent:"${settings.localRepository}"/com/github/hazendaz/jmockit/jmockit/1.52.0/jmockit-1.52.0.jar</argLine>
<argLine>${argLine} -javaagent:"${settings.localRepository}"/com/github/hazendaz/jmockit/jmockit/1.54.0/jmockit-1.54.0.jar</argLine>
</configuration>
</plugin>

4
redisson/pom.xml
Unescape Escape View File

@ -487,7 +487,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>3.22.0</version>
<version>3.25.0</version>
<executions>
<execution>
<phase>verify</phase>
@ -528,7 +528,7 @@
<trimStackTrace>true</trimStackTrace>
<forkCount>5</forkCount>
<reuseForks>false</reuseForks>
<argLine>${argLine} -javaagent:"${settings.localRepository}"/com/github/hazendaz/jmockit/jmockit/1.52.0/jmockit-1.52.0.jar</argLine>
<argLine>${argLine} -javaagent:"${settings.localRepository}"/com/github/hazendaz/jmockit/jmockit/1.54.0/jmockit-1.54.0.jar</argLine>
</configuration>
</plugin>

31
redisson/src/main/java/org/redisson/RedissonSetCache.java
Unescape Escape View File

@ -1273,6 +1273,11 @@ public class RedissonSetCache<V> extends RedissonExpirable implements RSetCache<
return get(addAllIfAbsentAsync(objects));
}
@Override
public boolean addIfAbsent(Map<V, Duration> objects) {
return get(addIfAbsentAsync(objects));
}
@Override
public int addAllIfExist(Map<V, Duration> objects) {
return get(addAllIfExistAsync(objects));
@ -1314,7 +1319,33 @@ public class RedissonSetCache<V> extends RedissonExpirable implements RSetCache<
"return result; ",
Arrays.asList(getRawName()), params.toArray());
}
@Override
public RFuture<Boolean> addIfAbsentAsync(Map<V, Duration> objects) {
List<Object> params = new ArrayList<>();
long currentTime = System.currentTimeMillis();
params.add(currentTime);
for (Map.Entry<V, Duration> entry : objects.entrySet()) {
long timeoutDate = currentTime + entry.getValue().toMillis();
if (entry.getValue().isZero()) {
timeoutDate = 92233720368547758L - currentTime;
}
params.add(timeoutDate);
encode(params, entry.getKey());
}
return commandExecutor.evalWriteAsync(getRawName(), codec, RedisCommands.EVAL_BOOLEAN,
"for i=2, #ARGV, 2 do " +
"local expireDateScore = redis.call('zscore', KEYS[1], ARGV[i+1]); " +
"if expireDateScore ~= false and tonumber(expireDateScore) > tonumber(ARGV[1]) then " +
"return 0; " +
"end; " +
"end; " +
"for i=2, #ARGV, 2 do " +
"redis.call('zadd', KEYS[1], ARGV[i], ARGV[i+1]); " +
"end; " +
"return 1; ",
Collections.singletonList(getRawName()), params.toArray());
}
@Override
public RFuture<Integer> addAllIfExistAsync(Map<V, Duration> objects) {
List<Object> params = new ArrayList<>();

11
redisson/src/main/java/org/redisson/api/RSetCache.java
Unescape Escape View File

@ -62,7 +62,7 @@ public interface RSetCache<V> extends RSet<V>, RExpirable, RSetCacheAsync<V>, RD
int size();
/**
* Use {@link #addIfAbsent(Duration, Object)} instead
* Use {@link #addIfAbsent(Map)} instead
*
* @param values - values to add
* @param ttl - time to live for value.
@ -136,6 +136,15 @@ public interface RSetCache<V> extends RSet<V>, RExpirable, RSetCacheAsync<V>, RD
* @return amount of added elements
*/
int addAllIfAbsent(Map<V, Duration> objects);
/**
* Adds elements to this set only if all of them haven't been added before.
* <p>
* Requires <b>Redis 3.0.2 and higher.</b>
*
* @param objects map of elements to add
* @return <code>true</code> if elements added and <code>false</code> if not.
*/
boolean addIfAbsent(Map<V, Duration> objects);
/**
* Adds elements to this set only if they already exist.

11
redisson/src/main/java/org/redisson/api/RSetCacheAsync.java
Unescape Escape View File

@ -52,7 +52,7 @@ public interface RSetCacheAsync<V> extends RSetAsync<V> {
RFuture<Integer> sizeAsync();
/**
* Use {@link #addIfAbsentAsync(Duration, Object)} instead
* Use {@link #addIfAbsentAsync(Map)} instead
*
* @param values - values to add
* @param ttl - time to live for value.
@ -126,6 +126,15 @@ public interface RSetCacheAsync<V> extends RSetAsync<V> {
* @return amount of added elements
*/
RFuture<Integer> addAllIfAbsentAsync(Map<V, Duration> objects);
/**
* Adds elements to this set only if all of them haven't been added before.
* <p>
* Requires <b>Redis 3.0.2 and higher.</b>
*
* @param objects map of elements to add
* @return amount of added elements
*/
RFuture<Boolean> addIfAbsentAsync(Map<V, Duration> objects);
/**
* Adds elements to this set only if they already exist.

13
redisson/src/main/java/org/redisson/api/RSetCacheReactive.java
Unescape Escape View File

@ -110,6 +110,8 @@ public interface RSetCacheReactive<V> extends RCollectionReactive<V>, RDestroyab
Mono<Boolean> tryAdd(V... values);
/**
* Use {@link #addIfAbsent(Map)} instead
*
* Tries to add elements only if none of them in set.
*
* @param values - values to add
@ -119,6 +121,7 @@ public interface RSetCacheReactive<V> extends RCollectionReactive<V>, RDestroyab
* @return <code>true</code> if elements successfully added,
* otherwise <code>false</code>.
*/
@Deprecated
Mono<Boolean> tryAdd(long ttl, TimeUnit unit, V... values);
/**
@ -132,6 +135,16 @@ public interface RSetCacheReactive<V> extends RCollectionReactive<V>, RDestroyab
*/
Mono<Boolean> addIfAbsent(Duration ttl, V object);
/**
* Adds elements to this set only if all of them haven't been added before.
* <p>
* Requires <b>Redis 3.0.2 and higher.</b>
*
* @param objects map of elements to add
* @return <code>true</code> if elements added and <code>false</code> if not.
*/
Mono<Boolean> addIfAbsent(Map<V, Duration> objects);
/**
* Adds element to this set only if it's already exists.
* <p>

11
redisson/src/main/java/org/redisson/api/RSetCacheRx.java
Unescape Escape View File

@ -110,7 +110,7 @@ public interface RSetCacheRx<V> extends RCollectionRx<V>, RDestroyable {
Single<Boolean> tryAdd(V... values);
/**
* Use {@link #addIfAbsent(Duration, Object)} instead
* Use {@link #addIfAbsent(Map)} instead
*
* @param values - values to add
* @param ttl - time to live for value.
@ -121,6 +121,15 @@ public interface RSetCacheRx<V> extends RCollectionRx<V>, RDestroyable {
*/
@Deprecated
Single<Boolean> tryAdd(long ttl, TimeUnit unit, V... values);
/**
* Adds elements to this set only if all of them haven't been added before.
* <p>
* Requires <b>Redis 3.0.2 and higher.</b>
*
* @param objects map of elements to add
* @return <code>true</code> if elements added and <code>false</code> if not.
*/
Single<Boolean> addIfAbsent(Map<V, Duration> objects);
/**
* Adds element to this set only if has not been added before.

26
redisson/src/test/java/org/redisson/RedissonSetCacheReactiveTest.java
Unescape Escape View File

@ -3,11 +3,8 @@ package org.redisson;
import static org.assertj.core.api.Assertions.assertThat;
import java.io.Serializable;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
import java.time.Duration;
import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
@ -321,4 +318,23 @@ public class RedissonSetCacheReactiveTest extends BaseReactiveTest {
}
@Test
public void testAddIfAbsentWithMapParam() throws InterruptedException {
sync(redisson.getKeys().flushall());
RSetCacheReactive<String> cache = redisson.getSetCache("cache");
Map<String, Duration> map = new HashMap<>();
map.put("key1", Duration.ofMinutes(1));
map.put("key2", Duration.ofMinutes(1));
assertThat(sync(cache.addIfAbsent(map))).isTrue();
map = new HashMap<>();
map.put("key1", Duration.ofMinutes(1));
assertThat(sync(cache.addIfAbsent(map))).isFalse();
map = new HashMap<>();
map.put("key3", Duration.ofSeconds(1));
assertThat(sync(cache.addIfAbsent(map))).isTrue();
Thread.sleep(1200);
assertThat(sync(cache.addIfAbsent(map))).isTrue();
sync((redisson.getKeys().flushall()));
}
}

18
redisson/src/test/java/org/redisson/RedissonSetCacheTest.java
Unescape Escape View File

@ -697,4 +697,22 @@ public class RedissonSetCacheTest extends RedisDockerTest {
}, NOTIFY_KEYSPACE_EVENTS, "Ez");
}
@Test
public void testAddIfAbsentWithMapParam() throws InterruptedException {
redisson.getKeys().flushall();
RSetCache<String> cache = redisson.getSetCache("cache");
Map<String, Duration> map = new HashMap<>();
map.put("key1", Duration.ofMinutes(1));
map.put("key2", Duration.ofMinutes(1));
assertThat(cache.addIfAbsent(map)).isTrue();
map = new HashMap<>();
map.put("key1", Duration.ofMinutes(1));
assertThat(cache.addIfAbsent(map)).isFalse();
map = new HashMap<>();
map.put("key3", Duration.ofSeconds(1));
assertThat(cache.addIfAbsent(map)).isTrue();
Thread.sleep(1200);
assertThat(cache.addIfAbsent(map)).isTrue();
redisson.getKeys().flushall();
}
}

26
redisson/src/test/java/org/redisson/rx/RedissonSetCacheRxTest.java
Unescape Escape View File

@ -3,17 +3,15 @@ package org.redisson.rx;
import static org.assertj.core.api.Assertions.assertThat;
import java.io.Serializable;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
import java.time.Duration;
import java.util.*;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.redisson.TestObject;
import org.redisson.api.RSetCacheReactive;
import org.redisson.api.RSetCacheRx;
public class RedissonSetCacheRxTest extends BaseRxTest {
@ -290,5 +288,23 @@ public class RedissonSetCacheRxTest extends BaseRxTest {
Assertions.assertEquals(0, sync(cache.size()).intValue());
}
@Test
public void testAddIfAbsentWithMapParam() throws InterruptedException {
sync(redisson.getKeys().flushall());
RSetCacheRx<String> cache = redisson.getSetCache("cache");
Map<String, Duration> map = new HashMap<>();
map.put("key1", Duration.ofMinutes(1));
map.put("key2", Duration.ofMinutes(1));
assertThat(sync(cache.addIfAbsent(map))).isTrue();
map = new HashMap<>();
map.put("key1", Duration.ofMinutes(1));
assertThat(sync(cache.addIfAbsent(map))).isFalse();
map = new HashMap<>();
map.put("key3", Duration.ofSeconds(1));
assertThat(sync(cache.addIfAbsent(map))).isTrue();
Thread.sleep(1200);
assertThat(sync(cache.addIfAbsent(map))).isTrue();
sync((redisson.getKeys().flushall()));
}
}

Write Preview
Loading…
Cancel
Save