update JedisPoolBuilder

onealtang · Nov 21, 2014 · f1a4295 · f1a4295
1 parent a4e6d46
commit f1a4295
Show file tree

Hide file tree

Showing 13 changed files with 167 additions and 69 deletions.
diff --git a/...ase/src/main/java/org/springside/examples/showcase/demos/redis/RedisCounterBenchmark.java b/...ase/src/main/java/org/springside/examples/showcase/demos/redis/RedisCounterBenchmark.java
@@ -39,7 +39,7 @@ public RedisCounterBenchmark() {
 	@Override
 	protected void setUp() {
 
-		pool = new JedisPoolBuilder().setDirectHostAndPort("localhost", "6379").setPoolSize(threadCount).buildPool();
+		pool = new JedisPoolBuilder().setUrl("direct://localhost:6379?poolSize=" + threadCount).buildPool();
 		jedisTemplate = new JedisTemplate(pool);
 
 		// 重置Counter

diff --git a/...ase/src/main/java/org/springside/examples/showcase/demos/redis/RedisSessionBenchmark.java b/...ase/src/main/java/org/springside/examples/showcase/demos/redis/RedisSessionBenchmark.java
@@ -44,7 +44,7 @@ public RedisSessionBenchmark() {
 
 	@Override
 	protected void setUp() {
-		pool = new JedisPoolBuilder().setDirectHostAndPort("localhost", "6379").setPoolSize(threadCount).buildPool();
+		pool = new JedisPoolBuilder().setUrl("direct://localhost:6379?poolSize=" + threadCount).buildPool();
 		jedisTemplate = new JedisTemplate(pool);
 
 		// 清空数据库

diff --git a/...src/main/java/org/springside/examples/showcase/demos/redis/elector/MasterElectorDemo.java b/...src/main/java/org/springside/examples/showcase/demos/redis/elector/MasterElectorDemo.java
@@ -13,7 +13,7 @@ public class MasterElectorDemo {
 
 	public static void main(String[] args) throws Exception {
 
-		JedisPool pool = new JedisPoolBuilder().setDirectHostAndPort("localhost", "6379").setPoolSize(1).buildPool();
+		JedisPool pool = new JedisPoolBuilder().setUrl("direct://localhost:6379").setPoolSize(1).buildPool();
 		try {
 			MasterElector masterElector = new MasterElector(pool, 5);
 

diff --git a/...pringside/examples/showcase/demos/redis/job/consumer/AdvancedJobConsumerBatchPopDemo.java b/...pringside/examples/showcase/demos/redis/job/consumer/AdvancedJobConsumerBatchPopDemo.java
@@ -40,7 +40,7 @@ public static void main(String[] args) throws Exception {
 		batchSize = Integer.parseInt(System.getProperty("batchsize",
 				String.valueOf(AdvancedJobConsumer.DEFAULT_BATCH_SIZE)));
 
-		pool = new JedisPoolBuilder().setDirectHostAndPort("localhost", "6379").setPoolSize(threadCount).buildPool();
+		pool = new JedisPoolBuilder().setUrl("direct://localhost:6379?poolSize=" + threadCount).buildPool();
 
 		ExecutorService threadPool = Executors.newFixedThreadPool(threadCount);
 		for (int i = 0; i < threadCount; i++) {

diff --git a/...ringside/examples/showcase/demos/redis/job/consumer/AdvancedJobConsumerSinglePopDemo.java b/...ringside/examples/showcase/demos/redis/job/consumer/AdvancedJobConsumerSinglePopDemo.java
@@ -31,7 +31,7 @@ public static void main(String[] args) throws Exception {
 		threadCount = Integer.parseInt(System.getProperty(ConcurrentBenchmark.THREAD_COUNT_NAME,
 				String.valueOf(THREAD_COUNT)));
 
-		pool = new JedisPoolBuilder().setDirectHostAndPort("localhost", "6379").setPoolSize(threadCount).buildPool();
+		pool = new JedisPoolBuilder().setUrl("direct://localhost:6379?poolSize=" + threadCount).buildPool();
 
 		ExecutorService threadPool = Executors.newFixedThreadPool(threadCount);
 		for (int i = 0; i < threadCount; i++) {

diff --git a/...java/org/springside/examples/showcase/demos/redis/job/consumer/SimpleJobConsumerDemo.java b/...java/org/springside/examples/showcase/demos/redis/job/consumer/SimpleJobConsumerDemo.java
@@ -47,7 +47,7 @@ public static void main(String[] args) throws Exception {
 		threadCount = Integer.parseInt(System.getProperty(ConcurrentBenchmark.THREAD_COUNT_NAME,
 				String.valueOf(THREAD_COUNT)));
 
-		pool = new JedisPoolBuilder().setDirectHostAndPort("localhost", "6379").setPoolSize(threadCount).buildPool();
+		pool = new JedisPoolBuilder().setUrl("direct://localhost:6379?poolSize=" + threadCount).buildPool();
 
 		ExecutorService threadPool = Executors.newFixedThreadPool(threadCount);
 		for (int i = 0; i < threadCount; i++) {

diff --git a/...rg/springside/examples/showcase/demos/redis/job/dispatcher/ReliableJobDispatcherDemo.java b/...rg/springside/examples/showcase/demos/redis/job/dispatcher/ReliableJobDispatcherDemo.java
@@ -29,7 +29,7 @@ public class ReliableJobDispatcherDemo {
 
 	public static void main(String[] args) throws Exception {
 
-		JedisPool pool = new JedisPoolBuilder().setDirectHostAndPort("localhost", "6379").setPoolSize(1).buildPool();
+		JedisPool pool = new JedisPoolBuilder().setUrl("direct://localhost:6379?poolSize=1").buildPool();
 		try {
 			JobDispatcher dispatcher = new JobDispatcher("ss", pool);
 			dispatcher.setReliable(true);

diff --git a/.../org/springside/examples/showcase/demos/redis/job/dispatcher/SimpleJobDispatcherDemo.java b/.../org/springside/examples/showcase/demos/redis/job/dispatcher/SimpleJobDispatcherDemo.java
@@ -29,7 +29,7 @@ public class SimpleJobDispatcherDemo {
 
 	public static void main(String[] args) throws Exception {
 
-		JedisPool pool = new JedisPoolBuilder().setDirectHostAndPort("localhost", "6379").setPoolSize(1).buildPool();
+		JedisPool pool = new JedisPoolBuilder().setUrl("direct://localhost:6379?poolSize=1").buildPool();
 		try {
 			JobDispatcher dispatcher = new JobDispatcher("ss", pool);
 			JobStatistics statistics = new JobStatistics("ss", pool);

diff --git a/.../main/java/org/springside/examples/showcase/demos/redis/job/producer/JobProducerDemo.java b/.../main/java/org/springside/examples/showcase/demos/redis/job/producer/JobProducerDemo.java
@@ -47,7 +47,7 @@ public JobProducerDemo() {
 
 	@Override
 	protected void setUp() {
-		pool = new JedisPoolBuilder().setDirectHostAndPort("localhost", "6379").setPoolSize(threadCount).buildPool();
+		pool = new JedisPoolBuilder().setUrl("direct://localhost:6379?poolSize=" + threadCount).buildPool();
 		jobProducer = new JobProducer("ss", pool);
 	}
 

diff --git a/modules/redis/src/main/java/org/springside/modules/nosql/redis/pool/JedisDirectPool.java b/modules/redis/src/main/java/org/springside/modules/nosql/redis/pool/JedisDirectPool.java
@@ -13,11 +13,12 @@
  */
 public class JedisDirectPool extends JedisPool {
 
-	public JedisDirectPool(HostAndPort address, JedisPoolConfig config) {
-		initInternalPool(address, new ConnectionInfo(), config);
+	public JedisDirectPool(String poolName, HostAndPort address, JedisPoolConfig config) {
+		this(poolName, address, new ConnectionInfo(), config);
 	}
 
-	public JedisDirectPool(HostAndPort address, ConnectionInfo connectionInfo, JedisPoolConfig config) {
+	public JedisDirectPool(String poolName, HostAndPort address, ConnectionInfo connectionInfo, JedisPoolConfig config) {
 		initInternalPool(address, connectionInfo, config);
+		this.poolName = poolName;
 	}
 }
diff --git a/modules/redis/src/main/java/org/springside/modules/nosql/redis/pool/JedisPool.java b/modules/redis/src/main/java/org/springside/modules/nosql/redis/pool/JedisPool.java
@@ -17,6 +17,8 @@
  */
 public abstract class JedisPool extends Pool<Jedis> {
 
+	protected String poolName;
+
 	protected HostAndPort address;
 
 	protected ConnectionInfo connectionInfo;
@@ -41,6 +43,7 @@ public static JedisPoolConfig createPoolConfig(int maxPoolSize) {
 	 * Initialize the internal pool with connection info and pool config.
 	 */
 	protected void initInternalPool(HostAndPort address, ConnectionInfo connectionInfo, JedisPoolConfig config) {
+		this.poolName = poolName;
 		this.address = address;
 		this.connectionInfo = connectionInfo;
 		JedisFactory factory = new JedisFactory(address.getHost(), address.getPort(), connectionInfo.getTimeout(),