Merge branch 'feature/reactor-optional-1' into ali/reactor-optional-tracing

Author: atakavci

Makefile

@@ -43,10 +43,10 @@ start:
 	echo "Started test environment with Redis $$display_version.";
 
 test:
-	mvn -DskipITs=false $(MVN_SOCKET_ARGS) clean compile verify -P$(PROFILE)
+	TEST_WORK_FOLDER=$(REDIS_ENV_WORK_DIR) mvn -DskipITs=false $(MVN_SOCKET_ARGS) clean compile verify -P$(PROFILE)
 
 test-coverage:
-	mvn -DskipITs=false $(MVN_SOCKET_ARGS) clean compile verify jacoco:report -P$(PROFILE)
+	TEST_WORK_FOLDER=$(REDIS_ENV_WORK_DIR) mvn -DskipITs=false $(MVN_SOCKET_ARGS) clean compile verify jacoco:report -P$(PROFILE)
 
 stop:
 	@$(COMPOSE_ENV) \
@@ -60,4 +60,4 @@ release:
 	mvn release:prepare
 	mvn release:perform
 	ls target/checkout/target/*-bin.zip | xargs gpg -b -a
-	ls target/checkout/target/*-bin.tar.gz | xargs gpg -b -a
+	ls target/checkout/target/*-bin.tar.gz | xargs gpg -b -a

README.md

@@ -27,10 +27,10 @@ This version of Lettuce has been tested against the latest Redis source-build.
 * [Redis Sentinel](https://redis.github.io/lettuce/ha-sharding/#redis-sentinel_1)
 * [Redis Cluster](https://redis.github.io/lettuce/ha-sharding/#redis-cluster)
 * [SSL](https://redis.github.io/lettuce/advanced-usage/#ssl-connections) and [Unix Domain Socket](https://redis.github.io/lettuce/advanced-usage/#unix-domain-sockets) connections
-* [Streaming API](https://redis.github.io/lettuce/advanced-usage/#streaming-api)
+* [Streaming API](https://redis.github.io/lettuce/advanced-usage/streaming-api)
 * [Codecs](https://redis.github.io/lettuce/integration-extension/#codecss) (for UTF8/bit/JSON etc. representation of your data)
 * multiple [Command Interfaces](https://github.com/redis/lettuce/wiki/Command-Interfaces-%284.0%29)
-* Support for [Native Transports](https://redis.github.io/lettuce/advanced-usage/#native-transports)
+* Support for [Native Transports](https://redis.github.io/lettuce/advanced-usage/native-transports)
 * Support [RediSearch](https://redis.github.io/lettuce/user-guide/redis-search/), [RedisJSON](https://redis.github.io/lettuce/user-guide/redis-json/) and [Redis Vector Sets](https://redis.github.io/lettuce/user-guide/vector-sets/)
 * Compatible with Java 8++ (implicit automatic module w/o descriptors)
 

docs/static/benchmarks/data.js

@@ -68,7 +68,7 @@
         <micrometer.version>1.14.2</micrometer.version>
         <micrometer-tracing.version>1.2.4</micrometer-tracing.version>
         <mockito.version>4.9.0</mockito.version>
-        <netty.version>4.2.5.Final</netty.version>
+        <netty.version>4.2.12.Final</netty.version>
         <openwebbeans.version>2.0.27</openwebbeans.version>
         <reactor.version>3.6.6</reactor.version>
         <rxjava.version>1.3.8</rxjava.version>

pom.xml

@@ -31,6 +31,7 @@
  *
  * @author Tihomir Mateev
  * @author SeugnSu Kim
+ * @author Yordan Tsintsov
  * @since 6.5
  */
 class RedisJsonCommandBuilder<K, V> extends BaseRedisCommandBuilder<K, V> {
@@ -47,10 +48,7 @@ Command<K, V, List<Long>> jsonArrappend(K key, JsonPath jsonPath, JsonValue... j
 
         CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key);
 
-        if (jsonPath != null && !jsonPath.isRootPath()) {
-            // OPTIONAL as per API
-            args.add(jsonPath.toString());
-        }
+        args.add(jsonPath.toString());
 
         for (JsonValue value : jsonValues) {
             args.add(value.asByteBuffer().array());
@@ -64,10 +62,7 @@ Command<K, V, List<Long>> jsonArrappend(K key, JsonPath jsonPath, String... json
 
         CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(key);
 
-        if (jsonPath != null && !jsonPath.isRootPath()) {
-            // OPTIONAL as per API
-            args.add(jsonPath.toString());
-        }
+        args.add(jsonPath.toString());
 
         for (String value : jsonValues) {
             args.add(value);

src/main/java/io/lettuce/core/RedisJsonCommandBuilder.java

@@ -20,7 +20,6 @@
 import io.netty.buffer.Unpooled;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
-import reactor.core.publisher.Mono;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Collections;
@@ -34,6 +33,7 @@
  *
  * @author Tihomir Mateev
  * @author SeugnSu Kim
+ * @author Yordan Tsintsov
  */
 @Tag(UNIT_TEST)
 class RedisJsonCommandBuilderUnitTests {
@@ -50,6 +50,8 @@ class RedisJsonCommandBuilderUnitTests {
 
     public static final JsonPath MY_PATH = JsonPath.of("$..commuter_bikes");
 
+    public static final String RESP_ENCODED_ROOT_PATH = "$1\r\n" + JsonPath.ROOT_PATH + "\r\n";
+
     RedisJsonCommandBuilder<String, String> builder = new RedisJsonCommandBuilder<>(StringCodec.UTF8, () -> PARSER);
 
     @Test
@@ -68,8 +70,8 @@ void shouldCorrectlyConstructJsonArrappendRootPath() {
         ByteBuf buf = Unpooled.directBuffer();
         command.encode(buf);
 
-        assertThat(buf.toString(StandardCharsets.UTF_8)).isEqualTo(
-                "*3\r\n" + "$14\r\nJSON.ARRAPPEND\r\n" + "$15\r\nbikes:inventory\r\n" + "$14\r\n" + ID_BIKE_6 + "\r\n");
+        assertThat(buf.toString(StandardCharsets.UTF_8)).isEqualTo("*4\r\n" + "$14\r\nJSON.ARRAPPEND\r\n"
+                + "$15\r\nbikes:inventory\r\n" + RESP_ENCODED_ROOT_PATH + "$14\r\n" + ID_BIKE_6 + "\r\n");
     }
 
     @Test
@@ -505,8 +507,8 @@ void shouldCorrectlyConstructJsonArrappendStringOverloadRootPath() {
         ByteBuf buf = Unpooled.directBuffer();
         command.encode(buf);
 
-        assertThat(buf.toString(StandardCharsets.UTF_8)).isEqualTo(
-                "*3\r\n" + "$14\r\nJSON.ARRAPPEND\r\n" + "$15\r\nbikes:inventory\r\n" + "$14\r\n" + ID_BIKE_6 + "\r\n");
+        assertThat(buf.toString(StandardCharsets.UTF_8)).isEqualTo("*4\r\n" + "$14\r\nJSON.ARRAPPEND\r\n"
+                + "$15\r\nbikes:inventory\r\n" + RESP_ENCODED_ROOT_PATH + "$14\r\n" + ID_BIKE_6 + "\r\n");
     }
 
     @Test
@@ -625,8 +627,8 @@ void shouldCorrectlyConstructJsonArrappendStringOverloadRootVararg() {
         ByteBuf buf = Unpooled.directBuffer();
         command.encode(buf);
 
-        assertThat(buf.toString(StandardCharsets.UTF_8))
-                .isEqualTo("*4\r\n$14\r\nJSON.ARRAPPEND\r\n$15\r\nbikes:inventory\r\n$1\r\nA\r\n$1\r\nB\r\n");
+        assertThat(buf.toString(StandardCharsets.UTF_8)).isEqualTo("*5\r\n$14\r\nJSON.ARRAPPEND\r\n$15\r\nbikes:inventory\r\n"
+                + RESP_ENCODED_ROOT_PATH + "$1\r\nA\r\n$1\r\nB\r\n");
     }
 
     @Test

src/test/java/io/lettuce/core/RedisJsonCommandBuilderUnitTests.java

@@ -67,8 +67,6 @@
 @ExtendWith(LettuceExtension.class)
 class SslIntegrationTests extends TestSupport {
 
-    private static final String KEYSTORE = "work/keystore.jks";
-
     private static File truststoreFile0;
 
     private static File truststoreFile1;
@@ -116,6 +114,8 @@ class SslIntegrationTests extends TestSupport {
 
     @BeforeAll
     static void beforeClass() {
+        assumeTrue(CanConnect.to(TestSettings.host(), sslPort()), "Assume that stunnel runs on port 6443");
+
         Path path0 = createAndSaveTestTruststore("redis-standalone-0", Paths.get("redis-standalone-0/work/tls"), "changeit");
         truststoreFile0 = path0.toFile();
 
@@ -129,8 +129,6 @@ static void beforeClass() {
         truststoreFile3 = createAndSaveTestTruststore("redis-standalone-5-client-cert",
                 Paths.get("redis-standalone-5-client-cert/work/tls"), "changeit").toFile();
 
-        assumeTrue(CanConnect.to(TestSettings.host(), sslPort()), "Assume that stunnel runs on port 6443");
-        // Maybe we should do a list.
         assertThat(truststoreFile0).exists();
         assertThat(truststoreFile1).exists();
         assertThat(truststoreFile2).exists();
@@ -267,7 +265,7 @@ void standaloneWithOpenSsl() {
 
         SslOptions sslOptions = SslOptions.builder() //
                 .openSslProvider() //
-                .truststore(truststoreFile0, "changeit") //
+                .truststore(truststoreFile1, "changeit") //
                 .build();
         setOptions(sslOptions);
 

src/test/java/io/lettuce/core/SslIntegrationTests.java

@@ -284,19 +284,6 @@ void testPubSubClientPublish() throws Exception {
         assertThat(connectionListener.getMessages().take()).isEqualTo(value);
     }
 
-    @Test
-    void testConnectToLeastClientsNode() {
-
-        clusterClient.reloadPartitions();
-        String nodeId = pubSubConnection.sync().clusterMyId();
-
-        StatefulRedisPubSubConnection<String, String> connectionAfterPartitionReload = clusterClient.connectPubSub();
-        String newConnectionNodeId = connectionAfterPartitionReload.sync().clusterMyId();
-        connectionAfterPartitionReload.close();
-
-        assertThat(nodeId).isNotEqualTo(newConnectionNodeId);
-    }
-
     @Test
     void testRegularClientPubSubPublish() throws Exception {
 

src/test/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubConnectionIntegrationTests.java

@@ -150,8 +150,9 @@ void hotkeysStartOptions() {
         redis.hotkeysStop();
         redis.hotkeysReset();
 
-        // Test DURATION option (auto-stop) - wait for tracking to stop automatically
-        redis.hotkeysStart(HotkeysArgs.Builder.metrics(HotkeysArgs.Metric.CPU).duration(1));
+        // Test DURATION option (auto-stop) - wait for tracking to stop automatically.
+        // Use sample(1) to ensure every command is captured.
+        redis.hotkeysStart(HotkeysArgs.Builder.metrics(HotkeysArgs.Metric.CPU).duration(1).sample(1));
         redis.set("durationkey", "testvalue");
         await().until(() -> !redis.hotkeysGet().isTrackingActive());
         reply = redis.hotkeysGet();

src/test/java/io/lettuce/core/commands/HotkeysCommandIntegrationTests.java

@@ -33,7 +33,6 @@
 
 import javax.inject.Inject;
 
-import org.junit.Ignore;
 import org.junit.jupiter.api.*;
 import org.junit.jupiter.api.extension.ExtendWith;
 
@@ -52,7 +51,6 @@
 import io.lettuce.test.LettuceExtension;
 import io.lettuce.test.ListStreamingAdapter;
 import io.lettuce.test.condition.EnabledOnCommand;
-import io.lettuce.test.condition.RedisConditions;
 
 /**
  * Integration tests for {@link io.lettuce.core.api.sync.RedisKeyCommands}.
@@ -307,11 +305,14 @@ void pexpireWithArgs() {
 
     @Test
     void pexpireat() {
-        Date expiration = new Date(System.currentTimeMillis() + 5000);
+        long expiryMillis = System.currentTimeMillis() + 5000;
+        Date expiration = new Date(expiryMillis);
         assertThat(redis.pexpireat(key, expiration)).isFalse();
         redis.set(key, value);
         assertThat(redis.pexpireat(key, expiration)).isTrue();
-        assertThat(redis.pttl(key)).isGreaterThan(0).isLessThanOrEqualTo(5000);
+        long clockSkewToleranceMs = 50;
+        long upperBound = expiryMillis - System.currentTimeMillis() + clockSkewToleranceMs;
+        assertThat(redis.pttl(key)).isGreaterThan(0).isLessThanOrEqualTo(upperBound);
 
         assertThat(redis.pexpireat(key, Instant.now().plusSeconds(15))).isTrue();
         assertThat(redis.ttl(key)).isBetween(10L, 20L);
@@ -404,10 +405,12 @@ void restoreReplace() {
         assertThat(redis.pttl(key)).isGreaterThan(0).isLessThanOrEqualTo(1000);
 
         redis.del(key);
-        assertThat(redis.restore(key, bytes, RestoreArgs.Builder.ttl(System.currentTimeMillis() + 3000).replace().absttl()))
-                .isEqualTo("OK");
+        long expiryMillis = System.currentTimeMillis() + 5000;
+        assertThat(redis.restore(key, bytes, RestoreArgs.Builder.ttl(expiryMillis).replace().absttl())).isEqualTo("OK");
         assertThat(redis.get(key)).isEqualTo(value);
-        assertThat(redis.pttl(key)).isGreaterThan(0).isLessThanOrEqualTo(3000);
+        long clockSkewToleranceMs = 50;
+        long upperBound = expiryMillis - System.currentTimeMillis() + clockSkewToleranceMs;
+        assertThat(redis.pttl(key)).isGreaterThan(0).isLessThanOrEqualTo(upperBound);
     }
 
     @Test