Merge in changes from redis#1455 and push to our nexus

gavagai-corp · Nov 17, 2020 · 7440511 · 7440511
1 parent 818dc9d
commit 7440511
Show file tree

Hide file tree

Showing 9 changed files with 795 additions and 32 deletions.
diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
 	<packaging>jar</packaging>
 	<groupId>redis.clients</groupId>
 	<artifactId>jedis</artifactId>
-	<version>3.4.0-SNAPSHOT</version>
+	<version>3.4.0-Gavagai</version>
 	<name>Jedis</name>
 	<description>Jedis is a blazingly small and sane Redis java client.</description>
   <url>https://github.com/xetorthio/jedis</url>
@@ -93,14 +93,16 @@
 	</dependencies>
 
 	<distributionManagement>
-		<snapshotRepository>
-			<id>ossrh</id>
-			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
-		</snapshotRepository>
 		<repository>
-			<id>ossrh</id>
-			<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+			<id>deployment</id>
+			<name>Internal Releases</name>
+			<url>http://nexus.gavagai.se/nexus3/content/repositories/releases/</url>
 		</repository>
+		<snapshotRepository>
+			<id>deployment-snapshots</id>
+			<name>Internal Snapshots</name>
+			<url>http://nexus.gavagai.se/nexus3/content/repositories/snapshots/</url>
+		</snapshotRepository>
 	</distributionManagement>
 
 	<build>
@@ -162,17 +164,6 @@
 				<artifactId>maven-release-plugin</artifactId>
 				<version>2.4.2</version>
 			</plugin>
-			<plugin>
-				<groupId>org.sonatype.plugins</groupId>
-				<artifactId>nexus-staging-maven-plugin</artifactId>
-				<version>1.6.7</version>
-				<extensions>true</extensions>
-				<configuration>
-					<serverId>ossrh</serverId>
-					<nexusUrl>https://oss.sonatype.org/</nexusUrl>
-					<autoReleaseAfterClose>true</autoReleaseAfterClose>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>com.googlecode.maven-java-formatter-plugin</groupId>
 				<artifactId>maven-java-formatter-plugin</artifactId>
@@ -189,20 +180,6 @@
 			      <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
 			    </archive> 
 			  </configuration>
-			</plugin> 
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-gpg-plugin</artifactId>
-				<version>1.5</version>
-				<executions>
-					<execution>
-						<id>sign-artifacts</id>
-						<phase>verify</phase>
-						<goals>
-							<goal>sign</goal>
-						</goals>
-					</execution>
-				</executions>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.felix</groupId>

diff --git a/src/main/java/redis/clients/jedis/CommandListener.java b/src/main/java/redis/clients/jedis/CommandListener.java
@@ -0,0 +1,9 @@
+package redis.clients.jedis;
+
+import redis.clients.jedis.commands.ProtocolCommand;
+
+public interface CommandListener {
+
+	void afterCommand(Connection conn, ProtocolCommand cmd, final byte[][] args);
+
+}
diff --git a/src/main/java/redis/clients/jedis/Connection.java b/src/main/java/redis/clients/jedis/Connection.java
@@ -28,6 +28,7 @@ public class Connection implements Closeable {
   private RedisOutputStream outputStream;
   private RedisInputStream inputStream;
   private boolean broken = false;
+  private CommandListener commandListener;
 
   public Connection() {
     this(Protocol.DEFAULT_HOST);
@@ -97,6 +98,14 @@ public void rollbackTimeout() {
     }
   }
 
+  public void setCommandListener(CommandListener listener) {
+    this.commandListener = listener;
+  }
+
+  public void clearCommandListener() {
+    this.commandListener = null;
+  }
+
   public void sendCommand(final ProtocolCommand cmd, final String... args) {
     final byte[][] bargs = new byte[args.length][];
     for (int i = 0; i < args.length; i++) {
@@ -113,6 +122,10 @@ public void sendCommand(final ProtocolCommand cmd, final byte[]... args) {
     try {
       connect();
       Protocol.sendCommand(outputStream, cmd, args);
+      // Record commands sent, for retrying in cluster pipeline.
+      if (commandListener != null) {
+        commandListener.afterCommand(this, cmd, args);
+      }
     } catch (JedisConnectionException ex) {
       /*
        * When client send request which formed by invalid protocol, Redis send back error message

diff --git a/src/main/java/redis/clients/jedis/JedisCluster.java b/src/main/java/redis/clients/jedis/JedisCluster.java
@@ -170,6 +170,10 @@ public JedisCluster(Set<HostAndPort> jedisClusterNode, int connectionTimeout, in
             ssl, sslSocketFactory, sslParameters, hostnameVerifier, hostAndPortMap);
   }
 
+  public JedisClusterPipeline pipelined() {
+    return new JedisClusterPipeline(connectionHandler);
+  }
+
   @Override
   public String set(final String key, final String value) {
     return new JedisClusterCommand<String>(connectionHandler, maxAttempts) {

diff --git a/src/main/java/redis/clients/jedis/JedisClusterConnectionHandler.java b/src/main/java/redis/clients/jedis/JedisClusterConnectionHandler.java
@@ -57,6 +57,14 @@ public Map<String, JedisPool> getNodes() {
     return cache.getNodes();
   }
 
+  public HostAndPort getSlotNode(int slot) {
+    return cache.getSlotNode(slot);
+  }
+
+  public void assignSlotToNode(int slot, HostAndPort targetNode) {
+    cache.assignSlotToNode(slot, targetNode);
+  }
+
   private void initializeSlotsCache(Set<HostAndPort> startNodes,
       int connectionTimeout, int soTimeout, String user, String password, String clientName,
       boolean ssl, SSLSocketFactory sslSocketFactory, SSLParameters sslParameters, HostnameVerifier hostnameVerifier) {

diff --git a/src/main/java/redis/clients/jedis/JedisClusterInfoCache.java b/src/main/java/redis/clients/jedis/JedisClusterInfoCache.java
@@ -20,6 +20,7 @@
 public class JedisClusterInfoCache {
   private final Map<String, JedisPool> nodes = new HashMap<String, JedisPool>();
   private final Map<Integer, JedisPool> slots = new HashMap<Integer, JedisPool>();
+	private Map<Integer, HostAndPort> mapping = new HashMap<Integer, HostAndPort>();
 
   private final ReentrantReadWriteLock rwl = new ReentrantReadWriteLock();
   private final Lock r = rwl.readLock();
@@ -160,6 +161,7 @@ public void renewClusterSlots(Jedis jedis) {
   private void discoverClusterSlots(Jedis jedis) {
     List<Object> slots = jedis.clusterSlots();
     this.slots.clear();
+    this.mapping.clear();
 
     for (Object slotInfoObj : slots) {
       List<Object> slotInfo = (List<Object>) slotInfoObj;
@@ -227,6 +229,7 @@ public void assignSlotsToNode(List<Integer> targetSlots, HostAndPort targetNode)
       JedisPool targetPool = setupNodeIfNotExist(targetNode);
       for (Integer slot : targetSlots) {
         slots.put(slot, targetPool);
+        mapping.put(slot, targetNode);
       }
     } finally {
       w.unlock();
@@ -288,6 +291,7 @@ public void reset() {
       }
       nodes.clear();
       slots.clear();
+      mapping.clear();
     } finally {
       w.unlock();
     }
@@ -313,4 +317,13 @@ private List<Integer> getAssignedSlotArray(List<Object> slotInfo) {
     }
     return slotNums;
   }
+
+  public HostAndPort getSlotNode(int slot) {
+    r.lock();
+    try {
+      return mapping.get(slot);
+    } finally {
+      r.unlock();
+    }
+  }
 }