Small change in UDP client

Change-Id: I375eaf56e55ee87cca38fbd56e087a833b059719

Author: mengli

src/main/com/schooner/MemCached/command/DeletionCommand.java

@@ -65,12 +65,12 @@ public DeletionCommand(String key, Integer hashCode, Date expiry) {
 	public boolean response(SchoonerSockIO sock, short rid) throws IOException {
 		byte[] res = sock.getResponse(rid);
 		if (Arrays.equals(res, DELETED)) {
-			if (log.isInfoEnabled())
-				log.info("DELETED!");
+			if (log.isDebugEnabled())
+				log.debug("DELETED!");
 			return true;
 		} else if (Arrays.equals(res, NOTFOUND)) {
-			if (log.isInfoEnabled())
-				log.info("NOT_FOUND!");
+			// if (log.isDebugEnabled())
+			log.debug("NOT_FOUND!");
 		} else {
 			log.error("error");
 		}

src/main/com/schooner/MemCached/command/RetrievalCommand.java

@@ -31,7 +31,6 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.util.Arrays;
-import java.util.LinkedList;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -88,7 +87,6 @@ public class Value {
 	}
 
 	public class ResponseParser {
-		private LinkedList<Value> list;
 		public Value retvalue = null;
 
 		public void exec(byte[] res) throws IOException {
@@ -97,7 +95,6 @@ public void exec(byte[] res) throws IOException {
 			byte[] end = new byte[5];
 			byte next;
 			int length = 0;
-			int i = 0;
 
 			// check if it is the end.
 			stream.mark(0);
@@ -107,80 +104,70 @@ public void exec(byte[] res) throws IOException {
 			}
 			stream.reset();
 
-			while (true) {
-				Value value = new Value();
-				// skip "VALUE <key> "
-				stream.skip(B_VALUE.length + key.length() + 1);
+			Value value = new Value();
+			// skip "VALUE <key> "
+			stream.skip(B_VALUE.length + key.length() + 1);
 
-				// get the length of <flags> and build it.
-				length = 0;
-				while ((next = (byte) stream.read()) != AscIIUDPClient.B_DELIMITER) {
-					length++;
-					sb.append((char) next);
-				}
-				try {
-					value.flags = Integer.valueOf(sb.toString());
-				} catch (NumberFormatException e) {
-					retvalue = null;
-					return;
-				}
-				sb.delete(0, length);
+			// get the length of <flags> and build it.
+			length = 0;
+			while ((next = (byte) stream.read()) != AscIIUDPClient.B_DELIMITER) {
+				length++;
+				sb.append((char) next);
+			}
+			try {
+				value.flags = Integer.valueOf(sb.toString());
+			} catch (NumberFormatException e) {
+				retvalue = null;
+				return;
+			}
+			sb.delete(0, length);
+
+			// get the length of <byte> and build it.
+			length = 0;
+			while (((next = (byte) stream.read()) != AscIIUDPClient.B_DELIMITER) && (next != B_RETURN)) {
+				length++;
+				sb.append((char) next);
+			}
 
-				// get the length of <byte> and build it.
+			try {
+				value.bytes = Integer.valueOf(sb.toString());
+			} catch (NumberFormatException e) {
+				retvalue = null;
+				return;
+			}
+			sb.delete(0, length);
+
+			if (cmd.equals("gets")) {
+				// if gets then get the length of <casUnique> and build it.
 				length = 0;
-				while (((next = (byte) stream.read()) != AscIIUDPClient.B_DELIMITER) && (next != B_RETURN)) {
+				while ((next = (byte) stream.read()) != B_RETURN) {
 					length++;
 					sb.append((char) next);
 				}
-
 				try {
-					value.bytes = Integer.valueOf(sb.toString());
+					value.casUnique = Long.valueOf(sb.toString());
 				} catch (NumberFormatException e) {
 					retvalue = null;
 					return;
 				}
 				sb.delete(0, length);
+			}
 
-				if (cmd.equals("gets")) {
-					// if gets then get the length of <casUnique> and build it.
-					length = 0;
-					while ((next = (byte) stream.read()) != B_RETURN) {
-						length++;
-						sb.append((char) next);
-					}
-					try {
-						value.casUnique = Long.valueOf(sb.toString());
-					} catch (NumberFormatException e) {
-						retvalue = null;
-						return;
-					}
-					sb.delete(0, length);
-				}
-
-				// skip "\n"
-				stream.skip(1);
+			// skip "\n"
+			stream.skip(1);
 
-				// build datablock
-				value.dataBlock = new byte[value.bytes];
-				stream.read(value.dataBlock);
+			// build datablock
+			value.dataBlock = new byte[value.bytes];
+			stream.read(value.dataBlock);
 
-				// skip "\r\n"
-				stream.skip(2);
+			// skip "\r\n"
+			stream.skip(2);
 
-				// check if it is the end.
-				stream.mark(0);
-				stream.read(end);
-				if (Arrays.equals(end, B_END)) {
-					retvalue = value;
-					break;
-				} else {
-					stream.reset();
-				}
-				if (i == 0) {
-					list = new LinkedList<Value>();
-				}
-				list.add(value);
-				i++;
+			// check if it is the end.
+			stream.mark(0);
+			stream.read(end);
+			if (Arrays.equals(end, B_END)) {
+				retvalue = value;
 			}
 		}
 	}

src/test/com/schooner/MemCached/MemCachedBenchUdp.java

@@ -56,7 +56,10 @@ public static void main(String[] args) {
 		MemCachedClient mc = new MemCachedClient("test", false, false);
 
 		String keyBase = "testKey";
-		String object = "This is a test of an object blah blah es, serialization does not seem to slow things down so much.  The gzip compression is horrible horrible performance, so we only use it for very large objects.  I have not done any heavy benchmarking recently";
+		int[] object = new int[16 * 1020]; // 64K limit for UDP
+		for (int i = 0; i < 16 * 1020; i++) {
+			object[i] = i;
+		}
 
 		long begin = System.currentTimeMillis();
 		for (int i = start; i < start + runs; i++) {
@@ -68,7 +71,7 @@ public static void main(String[] args) {
 
 		begin = System.currentTimeMillis();
 		for (int i = start; i < start + runs; i++) {
-			mc.get(keyBase + i);
+			System.out.println(mc.get(keyBase + i));
 		}
 		end = System.currentTimeMillis();
 		time = end - begin;