jedis pipeline

jaesonchen · May 15, 2019 · 399ade4 · 399ade4
1 parent 9d7e6eb
commit 399ade4
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 19 deletions.
diff --git a/src/main/java/com/asiainfo/redis/client/ClientApplication.java b/src/main/java/com/asiainfo/redis/client/ClientApplication.java
@@ -21,7 +21,7 @@ public static void main(String[] args) {
 
         JedisCluster jc = null;
         try {
-            jc = JedisClusterFactory.instance().getJedisCluster(CLUSTER_NODES);
+            jc = JedisClusterFactory.getInstance().getJedisCluster(CLUSTER_NODES);
             System.out.println(jc.get("10001"));
         } finally {
             IOUtils.closeQuietly(jc);

diff --git a/src/main/resources/jedis pipeline.png → ...ava/com/asiainfo/redis/jedis pipeline.png b/src/main/resources/jedis pipeline.png → ...ava/com/asiainfo/redis/jedis pipeline.png
diff --git a/src/main/java/com/asiainfo/redis/jedispool.png b/src/main/java/com/asiainfo/redis/jedispool.png
diff --git a/src/main/resources/redis-cluster.jpg → ...java/com/asiainfo/redis/redis-cluster.jpg b/src/main/resources/redis-cluster.jpg → ...java/com/asiainfo/redis/redis-cluster.jpg
diff --git a/src/main/resources/redis-twemproxy.jpg → ...va/com/asiainfo/redis/redis-twemproxy.jpg b/src/main/resources/redis-twemproxy.jpg → ...va/com/asiainfo/redis/redis-twemproxy.jpg
diff --git a/src/main/java/com/asiainfo/redis/usage/DistributeLock.java b/src/main/java/com/asiainfo/redis/usage/DistributeLock.java
@@ -28,7 +28,7 @@ public static void main(String[] args) {
         DistributeLock dl = new DistributeLock();
         JedisCluster jc = null;
         try {
-            jc = JedisClusterFactory.instance().getJedisCluster(CLUSTER_NODES);
+            jc = JedisClusterFactory.getInstance().getJedisCluster(CLUSTER_NODES);
             // acquireLock
             String lock = dl.acquireLock(jc, LOCK_KEY);
             dl.acquireLock(jc, LOCK_KEY);

diff --git a/src/main/java/com/asiainfo/redis/usage/IdGenerator.java b/src/main/java/com/asiainfo/redis/usage/IdGenerator.java
@@ -6,7 +6,7 @@
 import redis.clients.jedis.JedisCluster;
 
 /**   
- * IdGenerator 分布式id生成器，jedis.incr(key)
+ * IdGenerator 分布式id生成器，jedis.incr(key) / jedis.incrBy(key, long)
  * 
  * @author chenzq  
  * @date 2019年4月27日 下午5:47:34
@@ -21,7 +21,7 @@ public class IdGenerator {
     public static void main(String[] args) {
         JedisCluster jc = null;
         try {
-            jc = JedisClusterFactory.instance().getJedisCluster(CLUSTER_NODES);
+            jc = JedisClusterFactory.getInstance().getJedisCluster(CLUSTER_NODES);
             // incr
             for (int i = 0; i < 100; i++) {
                 jc.incr(KEY);

diff --git a/src/main/java/com/asiainfo/redis/usage/JedisTransaction.java b/src/main/java/com/asiainfo/redis/usage/JedisTransaction.java
@@ -51,7 +51,7 @@ public static void main(String[] args) throws Exception {
 
         JedisCluster jc = null;
         try {
-            jc = JedisClusterFactory.instance().getJedisCluster(CLUSTER_NODES);
+            jc = JedisClusterFactory.getInstance().getJedisCluster(CLUSTER_NODES);
             JedisSlotBasedConnectionHandler handler = getFieldValue(jc, FIELD_CONNECTION_HANDLER);
             JedisClusterInfoCache cache = getFieldValue(handler, FIELD_INFO_CACHE);
             Jedis jedis = cache.getSlotPool(JedisClusterCRC16.getSlot(WATCH_KEY)).getResource();

diff --git a/src/main/java/com/asiainfo/redis/util/JedisClusterFactory.java b/src/main/java/com/asiainfo/redis/util/JedisClusterFactory.java
@@ -21,13 +21,18 @@ private static class JedisClusterFactoryHolder {
         private static JedisClusterFactory instance = new JedisClusterFactory();
     }
 
-    public static JedisClusterFactory instance() {
+    public static JedisClusterFactory getInstance() {
         return JedisClusterFactoryHolder.instance;
     }
 
-    // 获取JedisCluster连接
+    /**
+     * @Description: 获取JedisCluster连接
+     * @author chenzq
+     * @date 2019年5月9日 下午2:47:40
+     * @param clusterNodes
+     * @return
+     */
     public JedisCluster getJedisCluster(String clusterNodes) {
-
         JedisCluster jc = null;
         try {
             // Jedis连接池配置，基于common-pool2

diff --git a/src/main/resources/application-redis-configure.xml b/src/main/resources/application-redis-configure.xml
@@ -9,17 +9,12 @@
 		http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/context 
 		http://www.springframework.org/schema/context/spring-context.xsd ">
-
-	<!-- 引入配置文件 -->  
-    <bean id="redis_propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-        <property name="ignoreUnresolvablePlaceholders" value="true" />
-        <property name="locations">
-		  <value>classpath:redis.properties</value>
-		</property>
-    </bean>
-
-	<!-- 启用组件注解扫描  -->
-	<context:component-scan base-package="com.asiainfo.redis.service" />
+
+    <!-- 启用组件注解扫描  -->
+    <context:component-scan base-package="com.asiainfo.redis.service" />
+
+    <!-- 配置redis相关参数properties的属性：${} -->
+    <context:property-placeholder location="classpath:redis.properties" />
 
     <!-- redisCluster 配置文件加载 -->  
     <bean id="resourcePropertySource" class="org.springframework.core.io.support.ResourcePropertySource">