CLIENT-3524 Fix the client info calls that are causing deprecation warning messages on server 8.1+

Author: mirzakaracic

client/src/com/aerospike/client/AerospikeClient.java

@@ -5334,7 +5334,7 @@ private String buildCreateIndexInfoCommand(
 		Expression exp
 	) {
 		StringBuilder sb = new StringBuilder(1024);
-		Version currentServerVersion = node.getVersion();
+		Version currentServerVersion = node.getServerVersion();
 		String createIndexCommand = currentServerVersion.isGreaterOrEqual(Version.SERVER_VERSION_8_1) ? "sindex-create:namespace=": "sindex-create:ns=";
 
 		sb.append(createIndexCommand);
@@ -5348,40 +5348,52 @@ private String buildCreateIndexInfoCommand(
 		sb.append(";indexname=");
 		sb.append(indexName);
 
-		if (ctx != null && ctx.length > 0) {
-			byte[] bytes = Pack.pack(ctx);
-			String base64 = Crypto.encodeBase64(bytes);
-
-			sb.append(";context=");
-			sb.append(base64);
-		}
-
 		if (exp != null && exp.size() > 0) {
 			String base64 = exp.getBase64();
 
 			sb.append(";exp=");
 			sb.append(base64);
-		}
 
-		if (indexCollectionType != IndexCollectionType.DEFAULT) {
-			sb.append(";indextype=");
-			sb.append(indexCollectionType);
-		}
+			if (indexCollectionType != IndexCollectionType.DEFAULT) {
+				sb.append(";indextype=");
+				sb.append(indexCollectionType);
+			}
 
-		if (binName != null) {
-			sb.append(";indexdata=");
-			sb.append(binName);
-			sb.append(",");
-		} else {
 			sb.append(";type=");
+			sb.append(indexType);
+		} else {
+			if (ctx != null && ctx.length > 0) {
+				byte[] bytes = Pack.pack(ctx);
+				String base64 = Crypto.encodeBase64(bytes);
+
+				sb.append(";context=");
+				sb.append(base64);
+			}
+
+			if (indexCollectionType != IndexCollectionType.DEFAULT) {
+				sb.append(";indextype=");
+				sb.append(indexCollectionType);
+			}
+
+			if (node.getServerVersion().isGreaterOrEqual(Version.SERVER_VERSION_8_1)) {
+				sb.append(";bin=");
+				sb.append(binName);
+				sb.append(";type=");
+				sb.append(indexType);
+			} else {
+				sb.append(";indexdata=");
+				sb.append(binName);
+				sb.append(',');
+				sb.append(indexType);
+			}
 		}
-		sb.append(indexType);
+
 		return sb.toString();
 	}
 
 	private String buildDropIndexInfoCommand(Node node, String namespace, String setName, String indexName) {
 		StringBuilder sb = new StringBuilder(500);
-		Version currentServerVersion = node.getVersion();
+		Version currentServerVersion = node.getServerVersion();
 		String deleteIndexCommand = currentServerVersion.isGreaterOrEqual(Version.SERVER_VERSION_8_1) ? "sindex-delete:namespace=": "sindex-delete:ns=";
 
 		sb.append(deleteIndexCommand);

client/src/com/aerospike/client/Info.java

@@ -126,6 +126,7 @@ public static Map<String,String> request(InfoPolicy policy, Node node, String...
 	 * @param policy	info command configuration parameters, pass in null for defaults
 	 * @param node		server node
 	 */
+	@Deprecated
 	public static Map<String,String> request(InfoPolicy policy, Node node) throws AerospikeException {
 		int timeout = (policy == null) ? DEFAULT_TIMEOUT : policy.timeout;
 		Connection conn = node.getConnection(timeout);

client/src/com/aerospike/client/admin/AdminCommand.java

@@ -232,7 +232,7 @@ public void createUser(Cluster cluster, AdminPolicy policy, String user, String
 
 	public void createPkiUser(Cluster cluster, AdminPolicy policy, String user, List<String> roles) {
 		Node node = cluster.getRandomNode();
-		Version nodeVer = node.getVersion();
+		Version nodeVer = node.getServerVersion();
 		if (nodeVer.compareTo(Version.SERVER_VERSION_8_1) < 0 ) {
 			throw new AerospikeException("Node version " + nodeVer + " is less than required minimum version " + Version.SERVER_VERSION_8_1);
 		}

client/src/com/aerospike/client/async/AsyncIndexTask.java

@@ -56,7 +56,7 @@ public void queryStatus(EventLoop eventLoop, InfoPolicy policy, Node node, TaskS
 			listener.onFailure(new AerospikeException("Cluster is empty"));
 		}
 
-		String command = buildStatusCommand(namespace, indexName);
+		String command = buildStatusCommand(namespace, indexName, node.getServerVersion());
 
 		client.info(eventLoop, new InfoListener() {
 			@Override

client/src/com/aerospike/client/cluster/Node.java

@@ -96,7 +96,7 @@ public class Node implements Closeable {
 	protected boolean rebalanceChanged;
 	protected volatile boolean performLogin;
 	protected volatile boolean active;
-	private final Version version;
+	private final Version serverVersion;
 
 	/**
 	 * Initialize server node with connection parameters.
@@ -113,7 +113,7 @@ public Node(Cluster cluster, NodeValidator nv) {
 		this.sessionToken = nv.sessionToken;
 		this.sessionExpiration = nv.sessionExpiration;
 		this.features = nv.features;
-		this.version = nv.version;
+		this.serverVersion = nv.serverVersion;
 		this.connsOpened = new AtomicInteger(1);
 		this.connsClosed = new AtomicInteger(0);
 		this.errorRateCount = new AtomicInteger(0);
@@ -1300,8 +1300,8 @@ public final int getRebalanceGeneration() {
 	/**
 	 * Return this node's build version
 	 */
-	public Version getVersion() {
-		return version;
+	public Version getServerVersion() {
+		return serverVersion;
 	}
 
 	/**

client/src/com/aerospike/client/cluster/NodeValidator.java

@@ -44,7 +44,7 @@ public final class NodeValidator {
 	byte[] sessionToken;
 	long sessionExpiration;
 	int features;
-	Version version;
+	Version serverVersion;
 
 	/**
 	 * Return first valid node referenced by seed host aliases. In most cases, aliases
@@ -226,7 +226,6 @@ private void validateAddress(Cluster cluster, InetAddress address, String tlsNam
 			commands.add("node");
 			commands.add("partition-generation");
 			commands.add("build");
-			commands.add("features");
 
 			boolean validateCluster = cluster.validateClusterName();
 			if (validateCluster) {
@@ -262,11 +261,11 @@ private void validateAddress(Cluster cluster, InetAddress address, String tlsNam
 			validatePartitionGeneration(map);
 			validateServerBuildVersion(map);
 
-			boolean sendUserAgent = version.isGreaterOrEqual(Version.SERVER_VERSION_8_1);
+			boolean sendUserAgent = serverVersion.isGreaterOrEqual(Version.SERVER_VERSION_8_1);
 			if (sendUserAgent) {
 				Info.request(conn, "user-agent-set:value=" + getB64userAgent(cluster));
 			}
-			setFeatures(map);
+			setFeatures(serverVersion);
 
 			if (validateCluster) {
 				validateClusterName(cluster, map);
@@ -308,49 +307,29 @@ private void validatePartitionGeneration(HashMap<String,String> map) {
 
 	private void validateServerBuildVersion(HashMap<String,String> map) {
 		String build = map.get("build");
-		version = Version.convertStringToVersion(build, name, primaryAddress);
+		serverVersion = Version.convertStringToVersion(build, name, primaryAddress);
 	}
 
-	private void setFeatures(HashMap<String,String> map) {
-		try {
-			String featuresString = map.get("features");
-			int begin = 0;
-			int end = 0;
-
-			while (end < featuresString.length()) {
-				end = featuresString.indexOf(';', begin);
-
-				if (end < 0) {
-					end = featuresString.length();
-				}
-
-				int len = end - begin;
-
-				if (featuresString.regionMatches(begin, "pscans", 0, len)) {
-					this.features |= Node.HAS_PARTITION_SCAN;
-				}
-				else if (featuresString.regionMatches(begin, "query-show", 0, len)) {
-					this.features |= Node.HAS_QUERY_SHOW;
-				}
-				else if (featuresString.regionMatches(begin, "batch-any", 0, len)) {
-					this.features |= Node.HAS_BATCH_ANY;
-				}
-				else if (featuresString.regionMatches(begin, "pquery", 0, len)) {
-					this.features |= Node.HAS_PARTITION_QUERY;
-				}
-				begin = end + 1;
+	private void setFeatures(Version serverVersion) {
+		if (serverVersion.isGreaterOrEqual(Version.SERVER_VERSION_PSCAN)) {
+			this.features |= Node.HAS_PARTITION_SCAN;
+		} else {
+			// This client requires partition scan support. Partition scans were first
+			// supported in server version 4.9. Do not allow any server node into the
+			// cluster that is running server version < 4.9.
+			if ((this.features & Node.HAS_PARTITION_SCAN) == 0) {
+				throw new AerospikeException("Node " + this.name + ' ' + this.primaryHost +
+					" version < 4.9. This client requires server version >= 4.9");
 			}
 		}
-		catch (Throwable e) {
-			// Unexpected exception. Use defaults.
+
+		if (serverVersion.isGreaterOrEqual(Version.SERVER_VERSION_QUERY_SHOW)) {
+			features |= Node.HAS_QUERY_SHOW;
 		}
 
-		// This client requires partition scan support. Partition scans were first
-		// supported in server version 4.9. Do not allow any server node into the
-		// cluster that is running server version < 4.9.
-		if ((this.features & Node.HAS_PARTITION_SCAN) == 0) {
-			throw new AerospikeException("Node " + this.name + ' ' + this.primaryHost +
-					" version < 4.9. This client requires server version >= 4.9");
+		if (serverVersion.isGreaterOrEqual(Version.SERVER_VERSION_PQUERY_BATCH_ANY)) {
+			features |= Node.HAS_BATCH_ANY;
+			features |= Node.HAS_PARTITION_QUERY;
 		}
 	}
 

client/src/com/aerospike/client/policy/ClientPolicy.java

@@ -113,6 +113,10 @@ public class ClientPolicy {
 	 * Server proto-fd-idle-ms and client {@link ClientPolicy#maxSocketIdle} should be set to zero
 	 * (no reap) if minConnsPerNode is greater than zero.  Reaping connections can defeat the purpose
 	 * of keeping connections in reserve for a future burst of activity.
+	 * <p>
+	 * <p>
+	 * Servers 8.1+ have deprecated proto-fd-idle-ms. When proto-fd-idle-ms is ultimately removed,
+     * the server will stop automatically reaping based on socket idle timeouts.
 	 * <p>
 	 * Default: 0
 	 */
@@ -187,6 +191,10 @@ public class ClientPolicy {
 	 * when maxSocketIdle is zero.  Idle connections will still be trimmed down from peak
 	 * connections to min connections (minConnsPerNode and asyncMinConnsPerNode) using a
 	 * hard-coded 55 second limit in the cluster tend thread.
+	 * <p>
+	 * <p>
+	 * Servers 8.1+ have deprecated proto-fd-idle-ms. When proto-fd-idle-ms is ultimately removed,
+     * the server will stop automatically reaping based on socket idle timeouts.
 	 * <p>
 	 * Default: 0
 	 */

client/src/com/aerospike/client/task/ExecuteTask.java

@@ -74,7 +74,7 @@ public int queryStatus() throws AerospikeException {
 		String module = (scan) ? "scan" : "query";
 
 		for (Node node : nodes) {
-			Version serverVersion = node.getVersion();
+			Version serverVersion = node.getServerVersion();
 			String cmd1 = serverVersion.isGreaterOrEqual(Version.SERVER_VERSION_8_1) ? "query-show:id=" + tid : "query-show:trid=" + tid;
 			String cmd2 = serverVersion.isGreaterOrEqual(Version.SERVER_VERSION_8_1) ? module + "-show:id=" + tid : module + "-show:trid=" + tid;
 			String cmd3 = serverVersion.isGreaterOrEqual(Version.SERVER_VERSION_8_1) ? "jobs:module=" + module + ";cmd=get-job;id=" + tid : "jobs:module=" + module + ";cmd=get-job;trid=" + tid;

client/src/com/aerospike/client/task/IndexTask.java

@@ -53,11 +53,11 @@ public int queryStatus() {
 		Node[] nodes = cluster.validateNodes();
 
 		for (Node node : nodes) {
-			Version currentServerVersion = node.getVersion();
+			Version currentServerVersion = node.getServerVersion();
 			if (isCreate) {
 				// Check index status.
 				if (statusCommand == null) {
-					statusCommand = IndexTask.buildStatusCommand(namespace, indexName);
+					statusCommand = IndexTask.buildStatusCommand(namespace, indexName, node.getServerVersion());
 				}
 
 				String response = Info.request(policy, node, statusCommand);
@@ -84,8 +84,10 @@ public int queryStatus() {
 		return Task.COMPLETE;
 	}
 
-	public static String buildStatusCommand(String namespace, String indexName) {
-		return "sindex/" + namespace + '/' + indexName;
+	public static String buildStatusCommand(String namespace, String indexName, Version serverVersion) {
+		return serverVersion.isGreaterOrEqual(Version.SERVER_VERSION_8_1) ? 
+			"sindex-stat:namespace=" + namespace + ";indexname=" + indexName : 
+			"sindex/" + namespace + "/" + indexName;
 	}
 
 	public static String buildExistsCommand(String namespace, String indexName, Version currentServerVersion) {

client/src/com/aerospike/client/util/Version.java

@@ -26,6 +26,9 @@
 
 public final class Version implements Comparable<Version> {
 	public static final Version SERVER_VERSION_8_1 = new Version(8, 1, 0, 0);
+	public static final Version SERVER_VERSION_PSCAN = new Version(4, 9, 0, 3);
+	public static final Version SERVER_VERSION_QUERY_SHOW = new Version(5, 7, 0, 0);
+	public static final Version SERVER_VERSION_PQUERY_BATCH_ANY = new Version(6, 0, 0, 0);
 
 	public static Version getServerVersion(IAerospikeClient client, InfoPolicy policy) {
 		Node node = client.getCluster().getRandomNode();