Merge branch 'master' into pool-socket-factory

Author: gkorland

.circleci/config.yml

@@ -0,0 +1,57 @@
+version: 2.1
+
+
+executors:
+  linux-8-jdk:
+    docker:
+      - image: circleci/openjdk:8-jdk
+  linux-7-jdk:
+    docker:
+      - image: circleci/openjdk:7-jdk
+
+jobs:
+  build:
+    parameters:
+      os:
+        type: executor
+
+    executor: << parameters.os >>
+
+    working_directory: ~/repo
+
+    environment:
+      JVM_OPTS: -Xmx3200m
+      TERM: dumb
+
+    steps:
+      - checkout
+
+      # Download and cache dependencies
+      - restore_cache:
+          keys:
+            - jedis-{{ checksum "pom.xml" }}
+
+      - run: mvn dependency:go-offline 
+
+      - save_cache:
+          paths:
+            - ~/.m2
+          key: jedis-{{ checksum "pom.xml" }}
+
+      - run: |
+          sudo apt update
+          sudo apt install -y stunnel
+
+      - run: make circleci-install
+    
+      - run: TEST="\!ModuleTest" make test
+
+
+workflows:
+  all-jdks:
+    jobs:
+      - build:
+          matrix:
+            parameters:
+#              os: [linux-8-jdk, linux-7-jdk]
+              os: [linux-8-jdk]

.github/workflows/build-jdk8.yml

@@ -379,6 +379,15 @@ travis-install:
 	[ ! -e redis-git ] && git clone https://github.com/antirez/redis.git --branch unstable --single-branch redis-git || true
 	$(MAKE) -C redis-git clean
 	$(MAKE) -C redis-git
+	
+circleci-install:
+	sudo apt-get install -y gcc-8 g++-8
+	cd /usr/bin ;\
+	sudo ln -sf gcc-8 gcc ;\
+	sudo ln -sf g++-8 g++
+	[ ! -e redis-git ] && git clone https://github.com/antirez/redis.git --branch unstable --single-branch redis-git || true
+	$(MAKE) -C redis-git clean
+	$(MAKE) -C redis-git	
 
 compile-module:
 	gcc -shared -o /tmp/testmodule.so -fPIC src/test/resources/testmodule.c

.travis.yml

@@ -1,5 +1,5 @@
 [![Release](https://img.shields.io/github/release/redis/jedis.svg)](https://github.com/redis/jedis/releases/latest)
-[![Build](https://github.com/redis/jedis/workflows/Build%20with%20JDK/badge.svg)](https://github.com/redis/jedis/actions)
+[![CircleCI](https://circleci.com/gh/redis/jedis/tree/master.svg?style=svg)](https://circleci.com/gh/redis/jedis/tree/master)
 [![Maven Central](https://img.shields.io/maven-central/v/redis.clients/jedis.svg)](http://mvnrepository.com/artifact/redis.clients/jedis)
 [![Javadocs](https://www.javadoc.io/badge/redis.clients/jedis.svg)](https://www.javadoc.io/doc/redis.clients/jedis)
 [![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE.txt)

Makefile

@@ -1,5 +1,4 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
   <parent>
     <groupId>org.sonatype.oss</groupId>
     <artifactId>oss-parent</artifactId>
@@ -220,4 +219,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
+</project>

README.md

@@ -385,7 +385,7 @@ public void lpos(final byte[] key, final byte[] element, LPosParams params) {
   }
 
   public void lpos(final byte[] key, final byte[] element, final LPosParams params, final long count){
-    sendCommand(LPOS, joinParameters(key, element, params.getByteParams(toByteArray(count))));
+    sendCommand(LPOS, joinParameters(key, element, params.getByteParams(Keyword.COUNT.raw, toByteArray(count))));
   }
 
   public void rpop(final byte[] key) {

pom.xml

@@ -61,9 +61,8 @@ private void initializeSlotsCache(Set<HostAndPort> startNodes,
       int connectionTimeout, int soTimeout, String user, String password, String clientName,
       boolean ssl, SSLSocketFactory sslSocketFactory, SSLParameters sslParameters, HostnameVerifier hostnameVerifier) {
     for (HostAndPort hostAndPort : startNodes) {
-      Jedis jedis = null;
-      try {
-        jedis = new Jedis(hostAndPort.getHost(), hostAndPort.getPort(), connectionTimeout, soTimeout, ssl, sslSocketFactory, sslParameters, hostnameVerifier);
+      try (Jedis jedis = new Jedis(hostAndPort.getHost(), hostAndPort.getPort(),
+          connectionTimeout, soTimeout, ssl, sslSocketFactory, sslParameters, hostnameVerifier)) { 
         if (user != null) {
           jedis.auth(user, password);
         } else if (password != null) {
@@ -73,13 +72,9 @@ private void initializeSlotsCache(Set<HostAndPort> startNodes,
           jedis.clientSetname(clientName);
         }
         cache.discoverClusterNodesAndSlots(jedis);
-        break;
+        return;
       } catch (JedisConnectionException e) {
         // try next nodes
-      } finally {
-        if (jedis != null) {
-          jedis.close();
-        }
       }
     }
   }

src/main/java/redis/clients/jedis/BinaryClient.java

@@ -9,7 +9,6 @@
 public class LPosParams extends Params {
 
   private static final String RANK = "RANK";
-  private static final String COUNT = "COUNT";
   private static final String MAXLEN = "MAXLEN";
 
   public static LPosParams lPosParams() {
@@ -26,11 +25,6 @@ public LPosParams maxlen(int maxLen) {
     return this;
   }
 
-  public LPosParams count(int count) {
-    addParam(COUNT, count);
-    return this;
-  }
-  
   public byte[][] getByteParams(byte[]... args) {
     ArrayList<byte[]> byteParams = new ArrayList<>();
     Collections.addAll(byteParams, args);
@@ -40,11 +34,6 @@ public byte[][] getByteParams(byte[]... args) {
       byteParams.add(Protocol.toByteArray((int) getParam(RANK)));
     }
 
-    if (contains(COUNT)) {
-      byteParams.add(SafeEncoder.encode(COUNT));
-      byteParams.add(Protocol.toByteArray((int) getParam(COUNT)));
-    }
-    
     if (contains(MAXLEN)) {
       byteParams.add(SafeEncoder.encode(MAXLEN));
       byteParams.add(Protocol.toByteArray((int) getParam(MAXLEN)));

src/main/java/redis/clients/jedis/JedisClusterConnectionHandler.java

@@ -287,7 +287,7 @@ public void testMigrateToNewNode() throws InterruptedException {
     jedisClusterNode.add(nodeInfo1);
     JedisCluster jc = new JedisCluster(jedisClusterNode, DEFAULT_TIMEOUT, DEFAULT_TIMEOUT,
         DEFAULT_REDIRECTIONS, "cluster", DEFAULT_CONFIG);
-    node4.clusterMeet(localHost, nodeInfo1.getPort());
+    node3.clusterMeet(localHost, nodeInfo4.getPort());
 
     String node3Id = JedisClusterTestUtil.getNodeId(node3.clusterNodes());
     String node4Id = JedisClusterTestUtil.getNodeId(node4.clusterNodes());
@@ -379,29 +379,31 @@ public void testRedisClusterMaxRedirections() {
   public void testClusterForgetNode() throws InterruptedException {
     // at first, join node4 to cluster
     node1.clusterMeet("127.0.0.1", nodeInfo4.getPort());
+    node2.clusterMeet("127.0.0.1", nodeInfo4.getPort());
+    node3.clusterMeet("127.0.0.1", nodeInfo4.getPort());
 
-    String node7Id = JedisClusterTestUtil.getNodeId(node4.clusterNodes());
-
-    JedisClusterTestUtil.assertNodeIsKnown(node3, node7Id, 1000);
-    JedisClusterTestUtil.assertNodeIsKnown(node2, node7Id, 1000);
-    JedisClusterTestUtil.assertNodeIsKnown(node1, node7Id, 1000);
+    String node4Id = JedisClusterTestUtil.getNodeId(node4.clusterNodes());
 
-    assertNodeHandshakeEnded(node3, 1000);
-    assertNodeHandshakeEnded(node2, 1000);
+    JedisClusterTestUtil.assertNodeIsKnown(node1, node4Id, 1000);
+    JedisClusterTestUtil.assertNodeIsKnown(node2, node4Id, 1000);
+    JedisClusterTestUtil.assertNodeIsKnown(node3, node4Id, 1000);
+    
     assertNodeHandshakeEnded(node1, 1000);
+    assertNodeHandshakeEnded(node2, 1000);
+    assertNodeHandshakeEnded(node3, 1000);
 
     assertEquals(4, node1.clusterNodes().split("\n").length);
     assertEquals(4, node2.clusterNodes().split("\n").length);
     assertEquals(4, node3.clusterNodes().split("\n").length);
 
     // do cluster forget
-    node1.clusterForget(node7Id);
-    node2.clusterForget(node7Id);
-    node3.clusterForget(node7Id);
+    node1.clusterForget(node4Id);
+    node2.clusterForget(node4Id);
+    node3.clusterForget(node4Id);
 
-    JedisClusterTestUtil.assertNodeIsUnknown(node1, node7Id, 1000);
-    JedisClusterTestUtil.assertNodeIsUnknown(node2, node7Id, 1000);
-    JedisClusterTestUtil.assertNodeIsUnknown(node3, node7Id, 1000);
+    JedisClusterTestUtil.assertNodeIsUnknown(node1, node4Id, 1000);
+    JedisClusterTestUtil.assertNodeIsUnknown(node2, node4Id, 1000);
+    JedisClusterTestUtil.assertNodeIsUnknown(node3, node4Id, 1000);
 
     assertEquals(3, node1.clusterNodes().split("\n").length);
     assertEquals(3, node2.clusterNodes().split("\n").length);