Merge pull request #166 from naver/minkikim89/1.11.0_fix

FIX: select separator depending on node version(v1.11.0)
naver · Jun 19, 2018 · 45fd0bf · 45fd0bf
2 parents 5132d65 + 634acff
commit 45fd0bf
Show file tree

Hide file tree

Showing 20 changed files with 168 additions and 48 deletions.
diff --git a/src/main/java/net/spy/memcached/MemcachedConnection.java b/src/main/java/net/spy/memcached/MemcachedConnection.java
@@ -1153,9 +1153,9 @@ public CountDownLatch broadcastOperation(final BroadcastOpFactory of,
 		final CountDownLatch latch=new CountDownLatch(locator.getAll().size());
 		for(MemcachedNode node : nodes) {
 			Operation op = of.newOp(node, latch);
+			op.setHandlingNode(node);
 			op.initialize();
 			node.addOp(op);
-			op.setHandlingNode(node);
 			addedQueue.offer(node);
 		}
 		Selector s=selector.wakeup();

diff --git a/src/main/java/net/spy/memcached/MemcachedNode.java b/src/main/java/net/spy/memcached/MemcachedNode.java
@@ -199,6 +199,11 @@ public interface MemcachedNode {
 	 */
 	boolean enabledMGetOp();
 
+	/**
+	 * Check the enable SpaceSeparate operation.
+	 */
+	boolean enabledSpaceSeparate();
+
 	/**
 	 * Get the number of bytes remaining to write.
 	 */

diff --git a/src/main/java/net/spy/memcached/MemcachedNodeROImpl.java b/src/main/java/net/spy/memcached/MemcachedNodeROImpl.java
@@ -149,6 +149,10 @@ public void setSk(SelectionKey to) {
 
 	public boolean enabledMGetOp() { throw new UnsupportedOperationException(); }
 
+	public boolean enabledSpaceSeparate() {
+		throw new UnsupportedOperationException();
+	}
+
 	public void setupResend(boolean cancelWrite, String cause) {
 		throw new UnsupportedOperationException();
 	}

diff --git a/src/main/java/net/spy/memcached/collection/BTreeGetBulk.java b/src/main/java/net/spy/memcached/collection/BTreeGetBulk.java
@@ -19,7 +19,9 @@
 import java.util.List;
 
 public interface BTreeGetBulk<T> {
-
+
+	public void setKeySeparator(String keySeparator);
+
 	public String getSpaceSeparatedKeys();
 
 	public String getRepresentKey();

diff --git a/src/main/java/net/spy/memcached/collection/BTreeGetBulkImpl.java b/src/main/java/net/spy/memcached/collection/BTreeGetBulkImpl.java
@@ -25,6 +25,7 @@ public abstract class BTreeGetBulkImpl<T> implements BTreeGetBulk<T> {
 
 	private static final String command = "bop mget";
 
+	private String keySeparator;
 	private String spaceSeparatedKeys;
 
 	protected String str;
@@ -67,6 +68,10 @@ protected BTreeGetBulkImpl(List<String> keyList, long from, long to,
 		this.reverse = (from > to);
 	}
 
+	public void setKeySeparator(String keySeparator) {
+		this.keySeparator = keySeparator;
+	}
+
 	public String getSpaceSeparatedKeys() {
 		if (spaceSeparatedKeys != null) {
 			return spaceSeparatedKeys;
@@ -77,7 +82,7 @@ public String getSpaceSeparatedKeys() {
 		for (int i = 0; i < numkeys; i++) {
 			sb.append(keyList.get(i));
 			if ((i + 1) < numkeys) {
-				sb.append(" ");
+				sb.append(keySeparator);
 			}
 		}
 		spaceSeparatedKeys = sb.toString();

diff --git a/src/main/java/net/spy/memcached/collection/BTreeSMGet.java b/src/main/java/net/spy/memcached/collection/BTreeSMGet.java
@@ -21,7 +21,9 @@
 public interface BTreeSMGet<T> {
 
 	public int headerCount = 4;
-
+
+	public void setKeySeparator(String keySeparator);
+
 	public String getSpaceSeparatedKeys();
 
 	public String getRepresentKey();

diff --git a/src/main/java/net/spy/memcached/collection/BTreeSMGetWithByteTypeBkey.java b/src/main/java/net/spy/memcached/collection/BTreeSMGetWithByteTypeBkey.java
@@ -29,6 +29,7 @@ public class BTreeSMGetWithByteTypeBkey<T> implements BTreeSMGet<T> {
 	protected String str;
 
 	protected List<String> keyList;
+	private String keySeparator;
 	private String spaceSeparatedKeys;
 
 	protected int lenKeys;
@@ -59,6 +60,10 @@ public BTreeSMGetWithByteTypeBkey(List<String> keyList, byte[] from,
 		this.smgetMode = smgetMode;
 		this.reverse = BTreeUtil.compareByteArraysInLexOrder(from, to) > 0;
 	}
+
+	public void setKeySeparator(String keySeparator) {
+		this.keySeparator = keySeparator;
+	}
 
 	public String getSpaceSeparatedKeys() {
 		if (spaceSeparatedKeys != null) {
@@ -70,7 +75,7 @@ public String getSpaceSeparatedKeys() {
 		for (int i = 0; i < numkeys; i++) {
 			sb.append(keyList.get(i));
 			if ((i + 1) < numkeys) {
-				sb.append(" ");
+				sb.append(keySeparator);
 			}
 		}
 		spaceSeparatedKeys = sb.toString();

diff --git a/src/main/java/net/spy/memcached/collection/BTreeSMGetWithByteTypeBkeyOld.java b/src/main/java/net/spy/memcached/collection/BTreeSMGetWithByteTypeBkeyOld.java
@@ -28,6 +28,7 @@ public class BTreeSMGetWithByteTypeBkeyOld<T> implements BTreeSMGet<T> {
 	protected String str;
 
 	protected List<String> keyList;
+	private String keySeparator;
 	private String spaceSeparatedKeys;
 
 	protected int lenKeys;
@@ -57,6 +58,10 @@ public BTreeSMGetWithByteTypeBkeyOld(List<String> keyList, byte[] from,
 		this.count = count;
 		this.reverse = BTreeUtil.compareByteArraysInLexOrder(from, to) > 0;
 	}
+
+	public void setKeySeparator(String keySeparator) {
+		this.keySeparator = keySeparator;
+	}
 
 	public String getSpaceSeparatedKeys() {
 		if (spaceSeparatedKeys != null) {
@@ -68,7 +73,7 @@ public String getSpaceSeparatedKeys() {
 		for (int i = 0; i < numkeys; i++) {
 			sb.append(keyList.get(i));
 			if ((i + 1) < numkeys) {
-				sb.append(" ");
+				sb.append(keySeparator);
 			}
 		}
 		spaceSeparatedKeys = sb.toString();

diff --git a/src/main/java/net/spy/memcached/collection/BTreeSMGetWithLongTypeBkey.java b/src/main/java/net/spy/memcached/collection/BTreeSMGetWithLongTypeBkey.java
@@ -29,6 +29,7 @@ public class BTreeSMGetWithLongTypeBkey<T> implements BTreeSMGet<T> {
 	protected String str;
 
 	protected List<String> keyList;
+	private String keySeparator;
 	private String spaceSeparatedKeys;
 
 	protected int lenKeys;
@@ -62,7 +63,11 @@ public BTreeSMGetWithLongTypeBkey(List<String> keyList, long from, long to,
 		this.smgetMode = smgetMode;
 		this.reverse = (from > to);
 	}
-
+
+	public void setKeySeparator(String keySeparator) {
+		this.keySeparator = keySeparator;
+	}
+
 	public String getSpaceSeparatedKeys() {
 		if (spaceSeparatedKeys != null) {
 			return spaceSeparatedKeys;
@@ -73,7 +78,7 @@ public String getSpaceSeparatedKeys() {
 		for (int i = 0; i < numkeys; i++) {
 			sb.append(keyList.get(i));
 			if ((i + 1) < numkeys) {
-				sb.append(" ");
+				sb.append(keySeparator);
 			}
 		}
 		spaceSeparatedKeys = sb.toString();

diff --git a/src/main/java/net/spy/memcached/collection/BTreeSMGetWithLongTypeBkeyOld.java b/src/main/java/net/spy/memcached/collection/BTreeSMGetWithLongTypeBkeyOld.java
@@ -28,6 +28,7 @@ public class BTreeSMGetWithLongTypeBkeyOld<T> implements BTreeSMGet<T> {
 	protected String str;
 
 	protected List<String> keyList;
+	private String keySeparator;
 	private String spaceSeparatedKeys;
 
 	protected int lenKeys;
@@ -60,7 +61,11 @@ public BTreeSMGetWithLongTypeBkeyOld(List<String> keyList, long from, long to,
 		this.count = count;
 		this.reverse = (from > to);
 	}
-
+
+	public void setKeySeparator(String keySeparator) {
+		this.keySeparator = keySeparator;
+	}
+
 	public String getSpaceSeparatedKeys() {
 		if (spaceSeparatedKeys != null) {
 			return spaceSeparatedKeys;
@@ -71,7 +76,7 @@ public String getSpaceSeparatedKeys() {
 		for (int i = 0; i < numkeys; i++) {
 			sb.append(keyList.get(i));
 			if ((i + 1) < numkeys) {
-				sb.append(" ");
+				sb.append(keySeparator);
 			}
 		}
 		spaceSeparatedKeys = sb.toString();

diff --git a/src/main/java/net/spy/memcached/collection/MapDelete.java b/src/main/java/net/spy/memcached/collection/MapDelete.java
@@ -22,24 +22,24 @@ public class MapDelete extends CollectionDelete {
 	private static final String command = "mop delete";
 
 	protected List<String> mkeyList;
+	private String keySeparator;
 	private String spaceSeparatedKeys;
 	protected byte[] additionalArgs;
 
 	public MapDelete(List<String> mkeyList, boolean noreply) {
 		this.mkeyList = mkeyList;
 		this.noreply = noreply;
-		if (mkeyList.size() == 0) {
-			this.additionalArgs = null;
-		} else {
-			this.additionalArgs = getSpaceSeparatedMkeys().getBytes();
-		}
 	}
 
 	public MapDelete(List<String> mkeyList, boolean noreply, boolean dropIfEmpty) {
 		this(mkeyList, noreply);
 		this.dropIfEmpty = dropIfEmpty;
 	}
 
+	public void setKeySeparator(String keySeparator) {
+		this.keySeparator = keySeparator;
+	}
+
 	public String getSpaceSeparatedMkeys() {
 		if (spaceSeparatedKeys != null) {
 			return spaceSeparatedKeys;
@@ -50,7 +50,7 @@ public String getSpaceSeparatedMkeys() {
 		for (int i = 0; i < numkeys; i++) {
 			sb.append(mkeyList.get(i));
 			if ((i + 1) < numkeys) {
-				sb.append(" ");
+				sb.append(keySeparator);
 			}
 		}
 		spaceSeparatedKeys = sb.toString();
@@ -64,6 +64,12 @@ public byte[] getAdditionalArgs() {
 	public String stringify() {
 		if (str != null) return str;
 
+		if (mkeyList.size() == 0) {
+			additionalArgs = null;
+		} else {
+			additionalArgs = getSpaceSeparatedMkeys().getBytes();
+		}
+
 		StringBuilder b = new StringBuilder();
 		if (additionalArgs == null) {
 			b.append("0");

diff --git a/src/main/java/net/spy/memcached/collection/MapGet.java b/src/main/java/net/spy/memcached/collection/MapGet.java
@@ -24,25 +24,25 @@ public class MapGet extends CollectionGet {
 
 	protected List<String> mkeyList;
 	protected byte[] data;
+	private String keySeparator;
 	private String spaceSeparatedKeys;
 	protected byte[] additionalArgs;
 
 	public MapGet(List<String> mkeyList, boolean delete) {
 		this.headerCount = 2;
 		this.mkeyList = mkeyList;
 		this.delete = delete;
-		if (mkeyList.size() == 0) {
-			this.additionalArgs = null;
-		} else {
-			this.additionalArgs = getSpaceSeparatedMkeys().getBytes();
-		}
 	}
 
 	public MapGet(List<String> mkeyList, boolean delete, boolean dropIfEmpty) {
 		this(mkeyList, delete);
 		this.dropIfEmpty = dropIfEmpty;
 	}
 
+	public void setKeySeparator(String keySeparator) {
+		this.keySeparator = keySeparator;
+	}
+
 	public String getSpaceSeparatedMkeys() {
 		if (spaceSeparatedKeys != null) {
 			return spaceSeparatedKeys;
@@ -53,7 +53,7 @@ public String getSpaceSeparatedMkeys() {
 		for (int i = 0; i < numkeys; i++) {
 			sb.append(mkeyList.get(i));
 			if ((i + 1) < numkeys) {
-				sb.append(" ");
+				sb.append(keySeparator);
 			}
 		}
 		spaceSeparatedKeys = sb.toString();
@@ -68,6 +68,12 @@ public byte[] getAddtionalArgs() {
 	public String stringify() {
 		if (str != null) return str;
 
+		if (mkeyList.size() == 0) {
+			additionalArgs = null;
+		} else {
+			additionalArgs = getSpaceSeparatedMkeys().getBytes();
+		}
+
 		StringBuilder b = new StringBuilder();
 		if (additionalArgs == null) {
 			b.append("0");

diff --git a/src/main/java/net/spy/memcached/protocol/TCPMemcachedNodeImpl.java b/src/main/java/net/spy/memcached/protocol/TCPMemcachedNodeImpl.java
@@ -68,6 +68,7 @@ public abstract class TCPMemcachedNodeImpl extends SpyObject
 	private String version=null;
 	private boolean isAsciiProtocol=true;
 	private boolean enabledMGetOp=false;
+	private boolean enabledSpaceSeparate = false;
 
 	// operation Future.get timeout counter
 	private final AtomicInteger continuousTimeout = new AtomicInteger(0);
@@ -555,6 +556,7 @@ public final SelectionKey getSk() {
 	public final void setVersion(String vr) {
 		version = vr;
 		setEnableMGetOp();
+		setEnableSpaceSeparate();
 	}
 
 	/* (non-javadoc)
@@ -578,11 +580,34 @@ private final void setEnableMGetOp() {
 		}
 	}
 
+
+	/* (non-javadoc)
+     * @see net.spy.memcached.MemcachedNode#setEnableSpaceSeparate(java.lang.Boolean)
+     */
+	private final void setEnableSpaceSeparate() {
+		if (isAsciiProtocol) {
+			StringTokenizer tokens = new StringTokenizer(version, ".");
+			int majorVersion = Integer.parseInt(tokens.nextToken());
+			int minorVersion = Integer.parseInt(tokens.nextToken());
+			if (version.contains("E")) {
+				enabledSpaceSeparate = (majorVersion > 0 || (majorVersion == 0 && minorVersion > 6));
+			} else {
+				enabledSpaceSeparate = (majorVersion > 1 || (majorVersion == 1 && minorVersion > 10));
+			}
+		}
+	}
+
 	/* (non-javadoc)
 	 * @see net.spy.memcached.MemcachedNode#enabledMGetOp()
 	 */
 	public final boolean enabledMGetOp() { return enabledMGetOp; }
 
+
+	/* (non-javadoc)
+     * @see net.spy.memcached.MemcachedNode#enabledSpaceSeparate()
+     */
+	public final boolean enabledSpaceSeparate() { return enabledSpaceSeparate; }
+
 	/* (non-Javadoc)
 	 * @see net.spy.memcached.MemcachedNode#getBytesRemainingInBuffer()
 	 */
@@ -757,13 +782,13 @@ private BlockingQueue<Operation> getAllOperations() {
 
 	public void addAllOpToInputQ(BlockingQueue<Operation> allOp) {
 		for (Operation op : allOp) {
+			op.setHandlingNode(this);
 			if (op.getState() == OperationState.WRITING && op.getBuffer() != null) {
 				op.getBuffer().reset(); // buffer offset reset
 			} else {
 				op.initialize(); // write completed or not yet initialized
 				op.resetState(); // reset operation state
 			}
-			op.setHandlingNode(this);
 			op.setMoved(true);
 		}
 		addOpCount += allOp.size();

diff --git a/src/main/java/net/spy/memcached/protocol/ascii/BTreeGetBulkOperationImpl.java b/src/main/java/net/spy/memcached/protocol/ascii/BTreeGetBulkOperationImpl.java
@@ -225,6 +225,11 @@ private final void readValue(ByteBuffer bb) {
 
 	public void initialize() {
 		String cmd = getBulk.getCommand();
+		if (getHandlingNode() == null || getHandlingNode().enabledSpaceSeparate()) {
+			getBulk.setKeySeparator(" ");
+		} else {
+			getBulk.setKeySeparator(",");
+		}
 		String args = getBulk.stringify();
 
 		ByteBuffer bb = ByteBuffer.allocate(cmd.length() + args.length()

diff --git a/src/main/java/net/spy/memcached/protocol/ascii/BTreeSortMergeGetOperationImpl.java b/src/main/java/net/spy/memcached/protocol/ascii/BTreeSortMergeGetOperationImpl.java
@@ -382,6 +382,11 @@ else if (smGet instanceof BTreeSMGetWithByteTypeBkey)
 
 	public void initialize() {
 		String cmd = smGet.getCommand();
+		if (getHandlingNode() == null || getHandlingNode().enabledSpaceSeparate()) {
+			smGet.setKeySeparator(" ");
+		} else {
+			smGet.setKeySeparator(",");
+		}
 		String args = smGet.stringify();
 
 		ByteBuffer bb = ByteBuffer.allocate(cmd.length() + args.length()