upgrade to 2.6.4

add storecounter with expiry
add more test cases

Author: newroot

.classpath

@@ -1,26 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

.settings/org.eclipse.jdt.core.prefs

@@ -1,6 +1,5 @@
-#Fri Nov 25 12:08:17 CST 2011
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6

README

@@ -1,5 +1,7 @@
 #Author Xingen Wang ([email protected])
         Meng Li ([email protected])
+Release 2.6.4:
+add storeCounter with expiry support. 
 
 Release 2.6.3:
 Perhaps solve the hang issue.

build.properties

@@ -33,7 +33,7 @@ build.dir=classes
 test.build.dir=testclasses
 build.instr.dir=classesinstr
 project=java_memcached-release
-ver=2.6.3
+ver=2.6.4
 junit.jar=lib/junit.jar
 slf4japi.jar=lib/slf4j-api-1.6.1.jar
 slf4jsimple.jar=lib/slf4j-simple-1.6.1.jar

pom.xml

@@ -4,7 +4,7 @@
 
 	<groupId>com.danga</groupId>
 	<artifactId>Memcached-Java-Client</artifactId>
-	<version>2.6.3</version>
+	<version>2.6.4</version>
 	<packaging>jar</packaging>
 
 	<name>Memcached-Java-Client</name>
@@ -55,8 +55,8 @@
 				<configuration>
 					<debuglevel>none</debuglevel>
 					<optimize>true</optimize>
-					<source>1.5</source>
-					<target>1.5</target>
+					<source>1.6</source>
+					<target>1.6</target>
 				</configuration>
 			</plugin>
 			<plugin>

src/main/java/com/danga/MemCached/MemCachedClient.java

@@ -568,6 +568,7 @@ public boolean delete(String key) {
 	/**
 	 * Deletes an object from cache given cache key and expiration date.
 	 * 
+	 * @deprecated not supported in memcached 1.4+
 	 * @param key
 	 *            the key to be removed
 	 * @param expiry
@@ -590,6 +591,7 @@ public boolean delete(String key, Date expiry) {
 	 * specified time. However, {@link #set(String, Object) set} will succeed,<br/>
 	 * and the new value will not be deleted.
 	 * 
+	 * @deprecated not supported in memcached 1.4+
 	 * @param key
 	 *            the key to be removed
 	 * @param hashCode
@@ -799,8 +801,8 @@ public boolean replace(String key, Object value, Date expiry, Integer hashCode)
 	 *            number to store
 	 * @return true/false indicating success
 	 */
-	public boolean storeCounter(String key, long counter) {
-		return storeCounter(key, new Long(counter));
+	public boolean storeCounter(String key, Long counter) {
+		return storeCounter(key, counter, null, null);
 	}
 
 	/**
@@ -810,10 +812,29 @@ public boolean storeCounter(String key, long counter) {
 	 *            cache key
 	 * @param counter
 	 *            number to store
+	 * @param date
+	 *            when to expire the record
 	 * @return true/false indicating success
 	 */
-	public boolean storeCounter(String key, Long counter) {
-		return storeCounter(key, counter, null);
+	public boolean storeCounter(String key, Long counter, Date date) {
+		return storeCounter(key, counter, date, null);
+	}
+
+	/**
+	 * Store a counter to memcached given a key
+	 * 
+	 * @param key
+	 *            cache key
+	 * @param counter
+	 *            number to store
+	 * @param date
+	 *            when to expire the record
+	 * @param hashCode
+	 *            if not null, then the int hashcode to use
+	 * @return true/false indicating success
+	 */
+	public boolean storeCounter(String key, Long counter, Date date, Integer hashCode) {
+		return set(key, counter, date, hashCode);
 	}
 
 	/**
@@ -828,7 +849,7 @@ public boolean storeCounter(String key, Long counter) {
 	 * @return true/false indicating success
 	 */
 	public boolean storeCounter(String key, Long counter, Integer hashCode) {
-		return set(key, counter, hashCode);
+		return storeCounter(key, counter, null, hashCode);
 	}
 
 	/**
@@ -955,7 +976,9 @@ public long addOrDecr(String key, long inc, Integer hashCode) {
 	}
 
 	/**
-	 * Increment the value at the specified key by 1, and then return it.
+	 * Increment the value at the specified key by 1, and then return it.<br>
+	 * Please make sure setPrimitiveAsString=true if the key/value pair is
+	 * stored with set command.
 	 * 
 	 * @param key
 	 *            key where the data is stored
@@ -967,7 +990,9 @@ public long incr(String key) {
 	}
 
 	/**
-	 * Increment the value at the specified key by passed in val.
+	 * Increment the value at the specified key by passed in val.<br>
+	 * Please make sure setPrimitiveAsString=true if the key/value pair is
+	 * stored with set command.
 	 * 
 	 * @param key
 	 *            key where the data is stored
@@ -982,7 +1007,9 @@ public long incr(String key, long inc) {
 
 	/**
 	 * Increment the value at the specified key by the specified increment, and
-	 * then return it.
+	 * then return it.<br>
+	 * Please make sure setPrimitiveAsString=true if the key/value pair is
+	 * stored with set command.
 	 * 
 	 * @param key
 	 *            key where the data is stored
@@ -998,7 +1025,9 @@ public long incr(String key, long inc, Integer hashCode) {
 	}
 
 	/**
-	 * Decrement the value at the specified key by 1, and then return it.
+	 * Decrement the value at the specified key by 1, and then return it.<br>
+	 * Please make sure setPrimitiveAsString=true if the key/value pair is
+	 * stored with set command.
 	 * 
 	 * @param key
 	 *            key where the data is stored
@@ -1011,7 +1040,9 @@ public long decr(String key) {
 
 	/**
 	 * Decrement the value at the specified key by passed in value, and then
-	 * return it.
+	 * return it.<br>
+	 * Please make sure setPrimitiveAsString=true if the key/value pair is
+	 * stored with set command.
 	 * 
 	 * @param key
 	 *            key where the data is stored
@@ -1026,7 +1057,9 @@ public long decr(String key, long inc) {
 
 	/**
 	 * Decrement the value at the specified key by the specified increment, and
-	 * then return it.
+	 * then return it.<br>
+	 * Please make sure setPrimitiveAsString=true if the key/value pair is
+	 * stored with set command.
 	 * 
 	 * @param key
 	 *            key where the data is stored

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

@@ -582,7 +582,7 @@ private long incrdecr(String cmdname, String key, long inc, Integer hashCode) {
 				// Sucessfully increase.
 				// return sock to pool and return result
 				return Long.parseLong(line);
-			} else if (NOTFOUND.equals(line)) {
+			} else if (NOTFOUND.equals(line + "\r\n")) {
 				if (log.isInfoEnabled())
 					log.info(new StringBuffer().append("++++ key not found to incr/decr for key: ").append(key)
 							.toString());
@@ -1630,7 +1630,7 @@ public void readResponse(SelectionKey key) throws IOException {
 	public boolean sync(String key, Integer hashCode) {
 		if (key == null) {
 			if (log.isErrorEnabled())
-				log.error("null value for key passed to delete()");
+				log.error("null value for key passed to sync()");
 			return false;
 		}
 

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

@@ -105,9 +105,9 @@
  * static {
  * 	String[] serverlist = { "cache0.server.com:12345", "cache1.server.com:12345" };
  * 	Integer[] weights = { new Integer(5), new Integer(2) };
- * 	pool.setInitConn(500);
- * 	pool.setMinConn(50);
- * 	pool.setMaxConn(50000);
+ * 	pool.setInitConn(5);
+ * 	pool.setMinConn(5);
+ * 	pool.setMaxConn(10);
  * 	pool.setMaintSleep(0);
  * 	pool.setNagle(false);
  * 	pool.initialize();

src/test/java/com/danga/MemCached/test/UnitTests.java

@@ -143,7 +143,7 @@ public static void test14() {
 		log.error("+ store/retrieve test passed");
 
 		assert !mc.keyExists("counterTest123");
-		mc.storeCounter("counterTest123", 0);
+		mc.storeCounter("counterTest123", 0L);
 		assert mc.keyExists("counterTest123");
 		log.error("+ counter store test passed");
 	}