add connection status check.

Thanks for iqtao's great work.

Author: newroot

pom.xml

@@ -3,7 +3,7 @@
 
 	<groupId>com.whalin</groupId>
 	<artifactId>Memcached-Java-Client</artifactId>
-	<version>3.0.1-SNAPSHOT</version>
+	<version>3.0.1</version>
 	<packaging>jar</packaging>
 
 	<name>Memcached-Java-Client</name>
@@ -96,6 +96,7 @@
 					<optimize>true</optimize>
 					<source>1.6</source>
 					<target>1.6</target>
+					<encoding>UTF-8</encoding>
 				</configuration>
 			</plugin>
 			<plugin>

src/main/java/com/schooner/MemCached/SchoonerSockIO.java

@@ -81,4 +81,29 @@ public int getBufferSize() {
 		return bufferSize;
 	}
 
+	/**
+	 * check if the connection is working
+	 * this version fix the bugs of isAlive() as follows:
+	 *  1. some servers doesn't support version command
+	 *  2. readLine shouldn't stop until
+	 * @return true if working
+	 */
+	public boolean isAlive() {		
+		if (!isConnected()) {
+			return false;
+		}
+		
+		try {
+			getByteChannel().write(ByteBuffer.wrap("get dummy\r\n".getBytes()));
+			
+			String line;
+			do {
+				line = this.readLine();
+			} while (!line.equals("END"));			
+		} catch (Exception e) {
+			return false;
+		}
+		
+		return true;
+	}
 }

src/main/java/com/schooner/MemCached/SchoonerSockIOFactory.java

@@ -55,7 +55,7 @@ public void destroyObject(Object obj) throws Exception {
 
 	@Override
 	public boolean validateObject(Object obj) {
-		return super.validateObject(obj);
+		return ((SchoonerSockIO) obj).isAlive();
 	}
 
 	/**

src/main/java/com/schooner/MemCached/SchoonerSockIOPool.java

@@ -161,7 +161,17 @@ protected final MessageDigest initialValue() {
 	@SuppressWarnings("unused")
 	private static int recBufferSize = 128;// bufsize
 
-	private long maxIdle = 1000; // max idle time for avail sockets
+	private long maxWait = 1000; // max wait time for avail sockets
+	private int maxIdle = maxConn; 
+	private int minIdle = GenericObjectPool.DEFAULT_MIN_IDLE;
+	private boolean testOnBorrow = GenericObjectPool.DEFAULT_TEST_ON_BORROW;
+	private boolean testOnReturn = GenericObjectPool.DEFAULT_TEST_ON_RETURN;
+	private long timeBetweenEvictionRunsMillis = GenericObjectPool.DEFAULT_TIME_BETWEEN_EVICTION_RUNS_MILLIS;
+	private int numTestsPerEvictionRun = GenericObjectPool.DEFAULT_NUM_TESTS_PER_EVICTION_RUN;
+	private long minEvictableIdleTimeMillis = GenericObjectPool.DEFAULT_MIN_EVICTABLE_IDLE_TIME_MILLIS;
+	private boolean testWhileIdle = true;
+	private long softMinEvictableIdleTimeMillis = GenericObjectPool.DEFAULT_SOFT_MIN_EVICTABLE_IDLE_TIME_MILLIS;
+	private boolean lifo = GenericObjectPool.DEFAULT_LIFO;
 
 	private boolean aliveCheck = false; // default to not check each connection
 	// for being alive
@@ -337,7 +347,9 @@ private void populateBuckets() {
 			} else {
 				factory = new SchoonerSockIOFactory(servers[i], isTcp, bufferSize, socketTO, socketConnectTO, nagle);
 			}
-			gop = new GenericObjectPool(factory, maxConn, GenericObjectPool.WHEN_EXHAUSTED_BLOCK, maxIdle, maxConn);
+			gop = new GenericObjectPool(factory, maxConn, GenericObjectPool.WHEN_EXHAUSTED_BLOCK, maxWait, maxIdle, minIdle, testOnBorrow,
+					testOnReturn, timeBetweenEvictionRunsMillis, numTestsPerEvictionRun, minEvictableIdleTimeMillis, testWhileIdle,
+					this.softMinEvictableIdleTimeMillis, this.lifo);
 			factory.setSockets(gop);
 			socketPool.put(servers[i], gop);
 		}
@@ -382,7 +394,10 @@ private void populateConsistentBuckets() {
 			} else {
 				factory = new SchoonerSockIOFactory(servers[i], isTcp, bufferSize, socketTO, socketConnectTO, nagle);
 			}
-			gop = new GenericObjectPool(factory, maxConn, GenericObjectPool.WHEN_EXHAUSTED_BLOCK, maxIdle, maxConn);
+
+			gop = new GenericObjectPool(factory, maxConn, GenericObjectPool.WHEN_EXHAUSTED_BLOCK, maxWait, maxIdle, minIdle, testOnBorrow,
+					testOnReturn, timeBetweenEvictionRunsMillis, numTestsPerEvictionRun, minEvictableIdleTimeMillis, testWhileIdle,
+					this.softMinEvictableIdleTimeMillis, this.lifo);
 			factory.setSockets(gop);
 			socketPool.put(servers[i], gop);
 		}
@@ -758,7 +773,7 @@ public final int getSocketConnectTO() {
 	 * @param maxIdle
 	 *            idle time in ms
 	 */
-	public void setMaxIdle(long maxIdle) {
+	public void setMaxIdle(int maxIdle) {
 		this.maxIdle = maxIdle;
 	}
 
@@ -767,10 +782,89 @@ public void setMaxIdle(long maxIdle) {
 	 * 
 	 * @return max idle setting in ms
 	 */
-	public long getMaxIdle() {
+	public int getMaxIdle() {
 		return this.maxIdle;
 	}
-
+	
+	public final long getMaxWait() {
+		return this.maxWait;
+	}
+	
+	public final void setMaxWait(long maxWait) {
+		this.maxWait = maxWait;
+	}
+	
+	public final int getMinIdle() {
+		return minIdle;
+	}
+	
+	public final void setMinIdle(int minIdle) {
+		this.minIdle = minIdle;
+	}
+	
+	public final boolean getTestOnBorrow() {
+		return testOnBorrow;
+	}
+	
+	public final void setTestOnBorrow(boolean testOnBorrow) {
+		this.testOnBorrow = testOnBorrow;
+	}
+	
+	public final boolean getTestOnReturn() {
+		return testOnReturn;
+	}
+	
+	public final void setTestOnReturn(boolean testOnReturn) {
+		this.testOnReturn = testOnReturn;
+	}
+	
+	public final long getTimeBetweenEvictionRunsMillis() {
+		return this.timeBetweenEvictionRunsMillis;
+	}
+	
+	public final void setTimeBetweenEvictionRunsMillis(long timeBetweenEvictionRunsMillis) {
+		this.timeBetweenEvictionRunsMillis = timeBetweenEvictionRunsMillis;
+	}
+	
+	public final int getNumTestsPerEvictionRun() {
+		return this.numTestsPerEvictionRun;
+	}
+	
+	public final void setNumTestsPerEvictionRun(int numTestsPerEvictionRun) {
+		this.numTestsPerEvictionRun = numTestsPerEvictionRun;
+	}
+	
+	public final long getMinEvictableIdleTimeMillis() {
+		return this.minEvictableIdleTimeMillis;
+	}
+	
+	public final void setMinEvictableIdleTimeMillis(long minEvictableIdleTimeMillis) {
+		this.minEvictableIdleTimeMillis = minEvictableIdleTimeMillis;
+	}
+	
+	public final boolean getTestWhileIdle() {
+		return this.testWhileIdle;
+	}
+	
+	public final void setTestWhileIdle(boolean testWhileIdle) {
+		this.testWhileIdle = testWhileIdle;
+	}
+	
+	public final long getSoftMinEvictableIdleTimeMillis(long softMinEvictableIdleTimeMillis) {
+		return this.softMinEvictableIdleTimeMillis;
+	}
+	
+	public final void setSoftMinEvictableIdleTimeMillis(long softMinEvictableIdleTimeMillis) {
+		this.softMinEvictableIdleTimeMillis = softMinEvictableIdleTimeMillis;
+	}
+	
+	public final boolean getLifo() {
+		return this.lifo;
+	}
+	
+	public final void setLifo(boolean lifo) {
+		this.lifo = lifo;
+	}
 	/**
 	 * Sets the failover flag for the pool.
 	 * 
@@ -1479,27 +1573,6 @@ public boolean isConnected() {
 			return (sock != null && sock.isConnected());
 		}
 
-		/**
-		 * checks to see that the connection is still working
-		 * 
-		 * @return true if still alive
-		 */
-		public final boolean isAlive() {
-			if (!isConnected())
-				return false;
-
-			// try to talk to the server w/ a dumb query to ask its version
-			try {
-				write("version\r\n".getBytes());
-				readBuf.clear();
-				sockChannel.read(readBuf);
-			} catch (IOException ex) {
-				return false;
-			}
-
-			return true;
-		}
-
 		/**
 		 * read fix length data from server and store it in the readBuf
 		 * 
@@ -1691,7 +1764,7 @@ public void trueClose(boolean addToDeadPool) throws IOException {
 		@Override
 		public ByteChannel getByteChannel() {
 			// TODO Auto-generated method stub
-			return null;
+			return sockChannel;
 		}
 	}
 

src/main/java/com/whalin/MemCached/SockIOPool.java

@@ -177,7 +177,7 @@ public class SockIOPool {
 	private int poolMultiplier = 3;
 	private int minConn = 5;
 	private int maxConn = 100;
-	private long maxIdle = 1000 * 60 * 5; // max idle time for avail sockets
+	private int maxIdle = 1000 * 60 * 5; // max idle time for avail sockets
 	private long maxBusyTime = 1000 * 30; // max idle time for avail sockets
 	private int socketTO = 1000 * 3; // default timeout of socket reads
 	private int socketConnectTO = 1000 * 3; // default timeout of socket
@@ -427,7 +427,7 @@ public int getSocketConnectTO() {
 	 * @param maxIdle
 	 *            idle time in ms
 	 */
-	public void setMaxIdle(long maxIdle) {
+	public void setMaxIdle(int maxIdle) {
 		schoonerSockIOPool.setMaxIdle(maxIdle);
 	}
 
@@ -436,7 +436,7 @@ public void setMaxIdle(long maxIdle) {
 	 * 
 	 * @return max idle setting in ms
 	 */
-	public long getMaxIdle() {
+	public int getMaxIdle() {
 		return schoonerSockIOPool.getMaxIdle();
 	}
 

src/test/java/com/whalin/MemCached/test/MemcachedBench.java

@@ -26,7 +26,7 @@ public static void main(String[] args) {
 
 		int runs = Integer.parseInt(args[0]);
 
-		String[] serverlist = { "localhost:11211" };
+		String[] serverlist = { "localhost:11211", "localhost:11212" };
 
 		// initialize the pool for memcache servers
 		SockIOPool pool = SockIOPool.getInstance("test");