From b6036ccb0ba929f76c1e26dd5ce2dbf090c31229 Mon Sep 17 00:00:00 2001 From: Calvin Date: Wed, 10 Jul 2013 15:39:48 +0800 Subject: [PATCH] =?UTF-8?q?#221=20=E5=8A=A0=E5=85=A5=E5=AF=B9Jedis?= =?UTF-8?q?=E7=9A=84=E5=B0=81=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{Utils.java => JedisPoolFactory.java} | 42 ++++++++++--------- .../demos/redis/RedisCounterBenchmark.java | 2 +- .../redis/RedisMassInsertionBenchmark.java | 2 +- .../demos/redis/RedisSessionBenchmark.java | 2 +- .../showcase/demos/redis/job/JobProducer.java | 4 +- 5 files changed, 27 insertions(+), 25 deletions(-) rename examples/showcase/src/main/java/org/springside/examples/showcase/demos/redis/{Utils.java => JedisPoolFactory.java} (79%) diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/demos/redis/Utils.java b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/redis/JedisPoolFactory.java similarity index 79% rename from examples/showcase/src/main/java/org/springside/examples/showcase/demos/redis/Utils.java rename to examples/showcase/src/main/java/org/springside/examples/showcase/demos/redis/JedisPoolFactory.java index 7469098a..1f50af21 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/demos/redis/Utils.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/redis/JedisPoolFactory.java @@ -1,20 +1,22 @@ -package org.springside.examples.showcase.demos.redis; - -import redis.clients.jedis.JedisPool; -import redis.clients.jedis.JedisPoolConfig; - -public class Utils { - - public static JedisPool createJedisPool(String defaultHost, int defaultPort, int defaultTimeout, int threadCount) { - // merge default setting and system properties - String host = System.getProperty("benchmark.host", defaultHost); - String port = System.getProperty("benchmark.port", String.valueOf(defaultPort)); - String timeout = System.getProperty("benchmark.timeout", String.valueOf(defaultTimeout)); - - // create jedis pool - JedisPoolConfig poolConfig = new JedisPoolConfig(); - poolConfig.setMaxActive(threadCount); - poolConfig.setMaxIdle(threadCount); - return new JedisPool(poolConfig, host, Integer.valueOf(port), Integer.valueOf(timeout)); - } -} +package org.springside.examples.showcase.demos.redis; + +import redis.clients.jedis.JedisPool; +import redis.clients.jedis.JedisPoolConfig; + +public class JedisPoolFactory { + + public static JedisPool createJedisPool(String defaultHost, int defaultPort, int defaultTimeout, int poolSize) { + // merge default setting and system properties + String host = System.getProperty("benchmark.host", defaultHost); + String port = System.getProperty("benchmark.port", String.valueOf(defaultPort)); + String timeout = System.getProperty("benchmark.timeout", String.valueOf(defaultTimeout)); + + // 设置Pool + JedisPoolConfig poolConfig = new JedisPoolConfig(); + poolConfig.setMaxActive(poolSize); + poolConfig.setMaxIdle(poolSize); + + // create jedis pool + return new JedisPool(poolConfig, host, Integer.valueOf(port), Integer.valueOf(timeout)); + } +} diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/demos/redis/RedisCounterBenchmark.java b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/redis/RedisCounterBenchmark.java index e6ffad31..b73b7bd0 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/demos/redis/RedisCounterBenchmark.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/redis/RedisCounterBenchmark.java @@ -40,7 +40,7 @@ public class RedisCounterBenchmark extends ConcurrentBenchmark { @Override protected void setUp() { - pool = Utils.createJedisPool(DEFAULT_HOST, DEFAULT_PORT, DEFAULT_TIMEOUT, threadCount); + pool = JedisPoolFactory.createJedisPool(DEFAULT_HOST, DEFAULT_PORT, DEFAULT_TIMEOUT, threadCount); jedisTemplate = new JedisTemplate(pool); jedisTemplate.set(counterName, "0"); } diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/demos/redis/RedisMassInsertionBenchmark.java b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/redis/RedisMassInsertionBenchmark.java index 9918bc8e..d542da9f 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/demos/redis/RedisMassInsertionBenchmark.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/redis/RedisMassInsertionBenchmark.java @@ -46,7 +46,7 @@ public class RedisMassInsertionBenchmark extends ConcurrentBenchmark { @Override protected void setUp() { // create jedis pool - pool = Utils.createJedisPool(DEFAULT_HOST, DEFAULT_PORT, DEFAULT_TIMEOUT, threadCount); + pool = JedisPoolFactory.createJedisPool(DEFAULT_HOST, DEFAULT_PORT, DEFAULT_TIMEOUT, threadCount); jedisTemplate = new JedisTemplate(pool); // remove all keys diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/demos/redis/RedisSessionBenchmark.java b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/redis/RedisSessionBenchmark.java index 7ce860d2..97cfdc0b 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/demos/redis/RedisSessionBenchmark.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/redis/RedisSessionBenchmark.java @@ -45,7 +45,7 @@ public class RedisSessionBenchmark extends ConcurrentBenchmark { @Override protected void setUp() { // create jedis pool - pool = Utils.createJedisPool(DEFAULT_HOST, DEFAULT_PORT, DEFAULT_TIMEOUT, threadCount); + pool = JedisPoolFactory.createJedisPool(DEFAULT_HOST, DEFAULT_PORT, DEFAULT_TIMEOUT, threadCount); jedisTemplate = new JedisTemplate(pool); // remove all keys diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/demos/redis/job/JobProducer.java b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/redis/job/JobProducer.java index 24809fbd..216a898a 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/demos/redis/job/JobProducer.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/demos/redis/job/JobProducer.java @@ -3,7 +3,7 @@ package org.springside.examples.showcase.demos.redis.job; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; -import org.springside.examples.showcase.demos.redis.Utils; +import org.springside.examples.showcase.demos.redis.JedisPoolFactory; import org.springside.modules.nosql.redis.scheduler.SchedulerManager; import org.springside.modules.test.benchmark.BenchmarkTask; import org.springside.modules.test.benchmark.ConcurrentBenchmark; @@ -40,7 +40,7 @@ public class JobProducer extends ConcurrentBenchmark { @Override protected void setUp() { // create jedis pool - pool = Utils.createJedisPool(JobManager.DEFAULT_HOST, JobManager.DEFAULT_PORT, JobManager.DEFAULT_TIMEOUT, + pool = JedisPoolFactory.createJedisPool(JobManager.DEFAULT_HOST, JobManager.DEFAULT_PORT, JobManager.DEFAULT_TIMEOUT, threadCount); scheduler = new SchedulerManager(pool, "ss"); }