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

Merge branch 'master' into 3.0.0

Browse Source
pull/1821/head
Nikita 7 years ago
parent d5b68f4289 5382062871
commit ffc1f08e74
8 changed files with 73 additions and 93 deletions
Show Stats Download Patch File Download Diff File

45
pom.xml
Unescape Escape View File

@ -65,13 +65,7 @@
<profiles>
<profile>
<id>release-sign-artifacts</id>
<activation>
<property>
<name>performRelease</name>
<value>true</value>
</property>
</activation>
<id>release</id>
<build>
<plugins>
<plugin>
@ -118,7 +112,7 @@
<plugin>
<groupId>net.ju-n.maven.plugins</groupId>
<artifactId>checksum-maven-plugin</artifactId>
<version>1.3</version>
<version>1.4</version>
</plugin>
</plugins>
</build>
@ -152,18 +146,32 @@
<testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.8</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrepo</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.3</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-gitexe</artifactId>
<version>1.9.5</version>
</dependency>
</dependencies>
</plugin>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
<useReleaseProfile>true</useReleaseProfile>
<releaseProfiles>release</releaseProfiles>
<goals>deploy</goals>
</configuration>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
@ -201,6 +209,11 @@
</goals>
</execution>
</executions>
<configuration>
<level>public</level>
<additionalparam>-Xdoclint:none</additionalparam>
<quiet>true</quiet>
</configuration>
</plugin>
</plugins>
</pluginManagement>

6
redisson-all/pom.xml
Unescape Escape View File

@ -145,12 +145,6 @@
<version>1.1.2.6</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>de.ruedigermoeller</groupId>
<artifactId>fst</artifactId>
<version>2.47</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

67
redisson/pom.xml
Unescape Escape View File

@ -301,46 +301,12 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
@ -349,12 +315,6 @@
<version>2.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
@ -405,31 +365,6 @@
</configuration>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.7.0</version>
<configuration>
<source>${source.version}</source>
<target>${source.version}</target>
<optimize>true</optimize>
<showDeprecations>true</showDeprecations>
</configuration>
<executions>
<execution>
<id>default-testCompile</id>
<phase>process-test-sources</phase>
<goals>
<goal>testCompile</goal>
</goals>
<configuration>
<fork>true</fork>
<source>${test.source.version}</source>
<target>${test.source.version}</target>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>

9
redisson/src/main/java/org/redisson/BaseRemoteService.java
Unescape Escape View File

@ -212,7 +212,7 @@ public abstract class BaseRemoteService {
final RPromise<RRemoteServiceResponse> responseFuture;
if (optionsCopy.isResultExpected()) {
responseFuture = pollResponse(optionsCopy.getExecutionTimeoutInMillis(), requestId, false);
responseFuture = pollResultResponse(optionsCopy.getExecutionTimeoutInMillis(), requestId, request);
} else {
responseFuture = null;
}
@ -360,6 +360,11 @@ public abstract class BaseRemoteService {
});
}
protected <T extends RRemoteServiceResponse> RPromise<T> pollResultResponse(long timeout,
RequestId requestId, RemoteServiceRequest request) {
return pollResponse(timeout, requestId, false);
}
private <T extends RRemoteServiceResponse> RPromise<T> pollResponse(final long timeout,
final RequestId requestId, boolean insertFirst) {
final RPromise<T> responseFuture = new RedissonPromise<T>();
@ -540,7 +545,7 @@ public abstract class BaseRemoteService {
final RPromise<RRemoteServiceResponse> responseFuture;
if (optionsCopy.isResultExpected()) {
responseFuture = pollResponse(optionsCopy.getExecutionTimeoutInMillis(), requestId, false);
responseFuture = pollResultResponse(optionsCopy.getExecutionTimeoutInMillis(), requestId, request);
} else {
responseFuture = null;
}

2
redisson/src/main/java/org/redisson/RedissonExecutorService.java
Unescape Escape View File

@ -99,7 +99,7 @@ public class RedissonExecutorService implements RScheduledExecutorService {
private static final Logger LOGGER = LoggerFactory.getLogger(RedissonExecutorService.class);
private static final RemoteInvocationOptions RESULT_OPTIONS = RemoteInvocationOptions.defaults().noAck().expectResultWithin(1, TimeUnit.HOURS);
private static RemoteInvocationOptions RESULT_OPTIONS = RemoteInvocationOptions.defaults().noAck().expectResultWithin(1, TimeUnit.HOURS);
public static final int SHUTDOWN_STATE = 1;
public static final int TERMINATED_STATE = 2;

13
redisson/src/main/java/org/redisson/executor/ScheduledTasksService.java
Unescape Escape View File

@ -27,6 +27,8 @@ import org.redisson.client.codec.StringCodec;
import org.redisson.client.protocol.RedisCommands;
import org.redisson.command.CommandExecutor;
import org.redisson.executor.params.ScheduledParameters;
import org.redisson.misc.RPromise;
import org.redisson.remote.RRemoteServiceResponse;
import org.redisson.remote.RemoteServiceRequest;
import org.redisson.remote.RequestId;
import org.redisson.remote.ResponseEntry;
@ -119,6 +121,17 @@ public class ScheduledTasksService extends TasksService {
taskId.toString(), RedissonExecutorService.SHUTDOWN_STATE, RedissonExecutorService.TERMINATED_STATE);
}
@Override
protected <T extends RRemoteServiceResponse> RPromise<T> pollResultResponse(long timeout, RequestId requestId,
RemoteServiceRequest request) {
if (request.getArgs()[0].getClass() == ScheduledParameters.class) {
ScheduledParameters params = (ScheduledParameters) request.getArgs()[0];
timeout += params.getStartTime() - System.currentTimeMillis();
}
return super.pollResultResponse(timeout, requestId, request);
}
@Override
protected RequestId generateRequestId() {
if (requestId == null) {

2
redisson/src/main/java/org/redisson/misc/LogHelper.java
Unescape Escape View File

@ -43,8 +43,6 @@ public class LogHelper {
return toArrayString(object);
} else if (object instanceof Collection) {
return toCollectionString((Collection<?>) object);
} else if (object instanceof ByteBuf) {
return ((ByteBuf) object).toString(CharsetUtil.UTF_8);
} else if (object instanceof CommandData) {
CommandData cd = (CommandData)object;
return cd.getCommand() + ", params: " + LogHelper.toString(cd.getParams());

22
redisson/src/test/java/org/redisson/executor/RedissonScheduledExecutorServiceTest.java
Unescape Escape View File

@ -17,15 +17,18 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.redisson.BaseTest;
import org.redisson.RedissonExecutorService;
import org.redisson.RedissonNode;
import org.redisson.api.CronSchedule;
import org.redisson.api.ExecutorOptions;
import org.redisson.api.RExecutorFuture;
import org.redisson.api.RScheduledExecutorService;
import org.redisson.api.RScheduledFuture;
import org.redisson.api.RemoteInvocationOptions;
import org.redisson.config.Config;
import org.redisson.config.RedissonNodeConfig;
import mockit.Deencapsulation;
import mockit.Invocation;
import mockit.Mock;
import mockit.MockUp;
@ -58,8 +61,27 @@ public class RedissonScheduledExecutorServiceTest extends BaseTest {
long start = System.currentTimeMillis();
RScheduledFuture<?> f = executor.schedule(new ScheduledCallableTask(), 11, TimeUnit.SECONDS);
assertThat(f.awaitUninterruptibly(12000)).isTrue();
assertThat(f.isSuccess()).isTrue();
assertThat(System.currentTimeMillis() - start).isBetween(11000L, 11500L);
Deencapsulation.setField(RedissonExecutorService.class, "RESULT_OPTIONS", RemoteInvocationOptions.defaults().noAck().expectResultWithin(3, TimeUnit.SECONDS));
executor = redisson.getExecutorService("test", ExecutorOptions.defaults().taskRetryInterval(5, TimeUnit.SECONDS));
start = System.currentTimeMillis();
RScheduledFuture<?> f1 = executor.schedule(new ScheduledCallableTask(), 5, TimeUnit.SECONDS);
assertThat(f1.awaitUninterruptibly(6000)).isTrue();
assertThat(f1.isSuccess()).isTrue();
assertThat(System.currentTimeMillis() - start).isBetween(5000L, 5500L);
start = System.currentTimeMillis();
RScheduledFuture<?> f2 = executor.schedule(new RunnableTask(), 5, TimeUnit.SECONDS);
assertThat(f2.awaitUninterruptibly(6000)).isTrue();
assertThat(f2.isSuccess()).isTrue();
assertThat(System.currentTimeMillis() - start).isBetween(5000L, 5500L);
}
@Test
public void testScheduleWithFixedDelay() throws InterruptedException {
RScheduledExecutorService executor = redisson.getExecutorService("test", ExecutorOptions.defaults().taskRetryInterval(5, TimeUnit.SECONDS));
executor.scheduleWithFixedDelay(new IncrementRunnableTask("counter"), 0, 7, TimeUnit.SECONDS);
Thread.sleep(500);
assertThat(redisson.getAtomicLong("counter").get()).isEqualTo(1);

Write Preview
Loading…
Cancel
Save