Jedis从2.2.1升级到2.7.2

safestarcode · Jul 10, 2015 · 37a3b1e · 37a3b1e
1 parent 3e51958
commit 37a3b1e
Show file tree

Hide file tree

Showing 17 changed files with 610 additions and 199 deletions.
diff --git a/com.newtouch.lion/com.newtouch.lion-parent/pom.xml b/com.newtouch.lion/com.newtouch.lion-parent/pom.xml
@@ -23,7 +23,7 @@
 		<lion-service.version>0.1.2-SNAPSHOT</lion-service.version>
 		<lion-data.version>0.1.2-SNAPSHOT</lion-data.version>
 		<lion-common.version>0.1.2-SNAPSHOT</lion-common.version>
-		<lion-redis.version>0.1.2-SNAPSHOT</lion-redis.version>
+		<lion-redis.version>0.5-SNAPSHOT</lion-redis.version>
 		<lion-mongodb.version>0.1.2-SNAPSHOT</lion-mongodb.version>
 		<lion-exception.version>0.1.2-SNAPSHOT</lion-exception.version>
 		<lion-trans.version>0.1.2-SNAPSHOT</lion-trans.version>
@@ -64,7 +64,7 @@
 		<httpcore.version>4.3.2</httpcore.version>
 		<dom4j.version>1.6.1</dom4j.version>
 		<xstream.version>1.4.6</xstream.version>
-		<jedis.version>2.2.1</jedis.version>
+		<jedis.version>2.7.2</jedis.version>
 		<spring-data-redis.version>1.5.0.RELEASE</spring-data-redis.version>
 		<validation-api.version>1.1.0.Final</validation-api.version>
 		<maven-source.version>2.4</maven-source.version>

diff --git a/com.newtouch.lion/com.newtouch.lion-redis/pom.xml b/com.newtouch.lion/com.newtouch.lion-redis/pom.xml
@@ -10,7 +10,7 @@
 		<relativePath>../com.newtouch.lion-parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>com.newtouch.lion-redis</artifactId>
-	<version>0.1.2-SNAPSHOT</version>
+	<version>0.5-SNAPSHOT</version>
 	<name>com.newtouch.lion-redis</name>
 	<url>http://www.newtouchone.com</url>
 	<properties>
@@ -59,10 +59,7 @@
 			<artifactId>logback-ext-spring</artifactId>
 		</dependency>
 		<!-- Logger End -->
-		<dependency>
-			<groupId>redis.clients</groupId>
-			<artifactId>jedis</artifactId>
-		</dependency>
+
 		<dependency>
 			<groupId>commons-pool</groupId>
 			<artifactId>commons-pool</artifactId>
@@ -93,6 +90,10 @@
 			<groupId>org.aspectj</groupId>
 			<artifactId>aspectjweaver</artifactId>
 			<version>1.7.4</version>
+		</dependency>		
+		<dependency>
+			<groupId>redis.clients</groupId>
+			<artifactId>jedis</artifactId>
 		</dependency>
 	</dependencies>
 	<build>

diff --git a/...ewtouch.lion-redis/src/main/java/com/newtouch/lion/redis/client/impl/RedisClientImpl.java b/...ewtouch.lion-redis/src/main/java/com/newtouch/lion/redis/client/impl/RedisClientImpl.java
@@ -2,10 +2,12 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 
 import redis.clients.jedis.BinaryClient.LIST_POSITION;
 import redis.clients.jedis.Jedis;
+import redis.clients.jedis.ScanResult;
 import redis.clients.jedis.SortingParams;
 import redis.clients.jedis.Tuple;
 import redis.clients.jedis.ZParams;
@@ -2588,10 +2590,7 @@ public Long strlen(String key) {
 	 *            成员得分
 	 * @return 结果
 	 */
-	@Override
-	public Long zadd(String key, Map<Double, String> scoreMembers) {
-		return null;
-	}
+
 
 	/**
 	 * 返回有序集 key 中， score 值在 min 和 max 之间(默认包括 score 值等于 min 或 max )的成员的数量。
@@ -2901,4 +2900,138 @@ public Long bitcount(String key) {
 	public Long bitcount(String key, long start, long end) {
 		return null;
 	}
+
+	@Override
+	public Long pexpire(String key, long milliseconds) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public Long pexpireAt(String key, long millisecondsTimestamp) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public Double incrByFloat(String key, double value) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public Set<String> spop(String key, long count) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public List<String> srandmember(String key, int count) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public Long zadd(String key, Map<String, Double> scoreMembers) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public Long zlexcount(String key, String min, String max) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public Set<String> zrangeByLex(String key, String min, String max) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public Set<String> zrangeByLex(String key, String min, String max,
+			int offset, int count) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public Set<String> zrevrangeByLex(String key, String max, String min) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public Set<String> zrevrangeByLex(String key, String max, String min,
+			int offset, int count) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public Long zremrangeByLex(String key, String min, String max) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public List<String> blpop(int timeout, String key) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public List<String> brpop(int timeout, String key) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public ScanResult<Entry<String, String>> hscan(String key, int cursor) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public ScanResult<String> sscan(String key, int cursor) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public ScanResult<Tuple> zscan(String key, int cursor) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public ScanResult<Entry<String, String>> hscan(String key, String cursor) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public ScanResult<String> sscan(String key, String cursor) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public ScanResult<Tuple> zscan(String key, String cursor) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public Long pfadd(String key, String... elements) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public long pfcount(String key) {
+		// TODO Auto-generated method stub
+		return 0;
+	}
 }
diff --git a/...redis/src/main/java/com/newtouch/lion/redis/client/impl/spring/SpringRedisClientImpl.java b/...redis/src/main/java/com/newtouch/lion/redis/client/impl/spring/SpringRedisClientImpl.java
@@ -2,10 +2,12 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 
 import redis.clients.jedis.BinaryClient.LIST_POSITION;
 import redis.clients.jedis.Jedis;
+import redis.clients.jedis.ScanResult;
 import redis.clients.jedis.SortingParams;
 import redis.clients.jedis.Tuple;
 import redis.clients.jedis.ZParams;
@@ -2593,7 +2595,7 @@ public Long persist(String key) {
      * @param value 参数
      * @return 结果
      */
-    @Override
+
     public Boolean setbit(String key, long offset, String value) {
         return null;
     }
@@ -2617,10 +2619,8 @@ public Long strlen(String key) {
      * @param scoreMembers 成员得分
      * @return 结果
      */
-    @Override
-    public Long zadd(String key, Map<Double, String> scoreMembers) {
-        return null;
-    }
+
+
 
     /**
      * 返回有序集 key 中， score 值在 min 和 max 之间(默认包括 score 值等于 min 或 max )的成员的数量。
@@ -2878,4 +2878,140 @@ public Long invoke(Jedis jedis) {
 			}
 		});
 	}
+
+	@Override
+	public Long pexpire(String key, long milliseconds) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public Long pexpireAt(String key, long millisecondsTimestamp) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public Double incrByFloat(String key, double value) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public Set<String> spop(String key, long count) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public List<String> srandmember(String key, int count) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+
+
+	@Override
+	public Long zlexcount(String key, String min, String max) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public Set<String> zrangeByLex(String key, String min, String max) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public Set<String> zrangeByLex(String key, String min, String max,
+			int offset, int count) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public Set<String> zrevrangeByLex(String key, String max, String min) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public Set<String> zrevrangeByLex(String key, String max, String min,
+			int offset, int count) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public Long zremrangeByLex(String key, String min, String max) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public List<String> blpop(int timeout, String key) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public List<String> brpop(int timeout, String key) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public ScanResult<Entry<String, String>> hscan(String key, int cursor) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public ScanResult<String> sscan(String key, int cursor) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public ScanResult<Tuple> zscan(String key, int cursor) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public ScanResult<Entry<String, String>> hscan(String key, String cursor) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public ScanResult<String> sscan(String key, String cursor) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public ScanResult<Tuple> zscan(String key, String cursor) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public Long pfadd(String key, String... elements) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public long pfcount(String key) {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public Long zadd(String key, Map<String, Double> scoreMembers) {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }