fix possible key collision problem with pools, potential race with incr/decr, and some logging

Author: gwhalin

src/com/danga/MemCached/MemCachedClient.java

@@ -805,6 +805,86 @@ public long getCounter( String key, Integer hashCode ) {
 		return counter;
 	}
 
+	/** 
+	 * Thread safe way to initialize and increment a counter. 
+	 * 
+	 * @param key key where the data is stored
+	 * @return value of incrementer
+	 */
+	public long addOrIncr( String key ) {
+		return addOrIncr( key, 0, null );
+	}
+
+	/** 
+	 * Thread safe way to initialize and increment a counter. 
+	 * 
+	 * @param key key where the data is stored
+	 * @param inc value to set or increment by
+	 * @return value of incrementer
+	 */
+	public long addOrIncr( String key, long inc ) {
+		return addOrIncr( key, inc, null );
+	}
+
+	/** 
+	 * Thread safe way to initialize and increment a counter. 
+	 * 
+	 * @param key key where the data is stored
+	 * @param inc value to set or increment by
+	 * @param hashCode if not null, then the int hashcode to use
+	 * @return value of incrementer
+	 */
+	public long addOrIncr( String key, long inc, Integer hashCode ) {
+		boolean ret = set( "add", key, new Long( inc ), null, hashCode, true );
+
+		if ( ret ) {
+			return inc;
+		}
+		else {
+			return incrdecr( "incr", key, inc, hashCode );
+		}
+	}
+
+	/** 
+	 * Thread safe way to initialize and decrement a counter. 
+	 * 
+	 * @param key key where the data is stored
+	 * @return value of incrementer
+	 */
+	public long addOrDecr( String key ) {
+		return addOrDecr( key, 0, null );
+	}
+
+	/** 
+	 * Thread safe way to initialize and decrement a counter. 
+	 * 
+	 * @param key key where the data is stored
+	 * @param inc value to set or increment by
+	 * @return value of incrementer
+	 */
+	public long addOrDecr( String key, long inc ) {
+		return addOrDecr( key, inc, null );
+	}
+
+	/** 
+	 * Thread safe way to initialize and decrement a counter. 
+	 * 
+	 * @param key key where the data is stored
+	 * @param inc value to set or increment by
+	 * @param hashCode if not null, then the int hashcode to use
+	 * @return value of incrementer
+	 */
+	public long addOrDecr( String key, long inc, Integer hashCode ) {
+		boolean ret = set( "add", key, new Long( inc ), null, hashCode, true );
+
+		if ( ret ) {
+			return inc;
+		}
+		else {
+			return incrdecr( "decr", key, inc, hashCode );
+		}
+	}
+
 	/**
 	 * Increment the value at the specified key by 1, and then return it.
 	 *

src/com/danga/MemCached/SockIOPool.java

@@ -895,7 +895,13 @@ public SockIO getConnection( String host ) {
 						}
 						else {
 							// not connected, so we need to remove it
-							log.error( "++++ socket in avail pool is not connected: " + socket.toString() + " for host: " + host );
+							try {
+								socket.trueClose();
+							}
+							catch ( Exception ex ) {
+								log.debug( "++++ error trying to true close the socket" );
+							}
+
 							socket = null;
 
 							// remove from avail pool
@@ -966,7 +972,7 @@ protected void addSocketToPool( Map<String,Map<SockIO,Long>> pool, String host,
 		}
 
 		Map<SockIO,Long> sockets =
-			new HashMap<SockIO,Long>();
+			new IdentityHashMap<SockIO,Long>();
 
 		sockets.put( socket, new Long( System.currentTimeMillis() ) );
 		pool.put( host, sockets );