Merge pull request #327 from aerospike/stage-jdk8

REL-2539 Java Client 8.1.2 for JDK8

benchmarks/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.aerospike</groupId>
     <artifactId>aerospike-parent</artifactId>
-    <version>8.1.0</version>
+    <version>8.1.2</version>
   </parent>
   <artifactId>aerospike-benchmarks</artifactId>
   <packaging>jar</packaging>

benchmarks/src/com/aerospike/benchmarks/InsertTaskSync.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 Aerospike, Inc.
+ * Copyright 2012-2024 Aerospike, Inc.
  *
  * Portions may be licensed to Aerospike, Inc. under one or more contributor
  * license agreements WHICH ARE COMPATIBLE WITH THE APACHE LICENSE, VERSION 2.0.
@@ -16,9 +16,6 @@
  */
 package com.aerospike.benchmarks;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import com.aerospike.client.AerospikeException;
 import com.aerospike.client.Bin;
 import com.aerospike.client.IAerospikeClient;
@@ -87,11 +84,11 @@ private void runCommand(long keyCurrent, RandomShift random) {
 	private void put(Key key, Bin[] bins) {
 		if (counters.write.latency != null) {
 			long begin = System.nanoTime();
-			
+
 			if (! skipKey(key)) {
 				client.put(args.writePolicy, key, bins);
 			}
-			
+
 			long elapsed = System.nanoTime() - begin;
 			counters.write.count.getAndIncrement();
 			counters.write.latency.add(elapsed);
@@ -103,11 +100,8 @@ private void put(Key key, Bin[] bins) {
 			counters.write.count.getAndIncrement();
 		}
 	}
-	
+
 	private boolean skipKey(Key key) {
-		if (args.partitionIds != null && !args.partitionIds.contains(Partition.getPartitionId(key.digest))) {
-			return true;
-		}
-		return false;
-	}
+        return args.partitionIds != null && !args.partitionIds.contains(Partition.getPartitionId(key.digest));
+    }
 }

benchmarks/src/com/aerospike/benchmarks/KeyType.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 Aerospike, Inc.
+ * Copyright 2012-2024 Aerospike, Inc.
  *
  * Portions may be licensed to Aerospike, Inc. under one or more contributor
  * license agreements WHICH ARE COMPATIBLE WITH THE APACHE LICENSE, VERSION 2.0.
@@ -17,5 +17,5 @@
 package com.aerospike.benchmarks;
 
 public enum KeyType {
-	STRING, INTEGER;
+	STRING, INTEGER
 }

benchmarks/src/com/aerospike/benchmarks/LatencyManager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 Aerospike, Inc.
+ * Copyright 2012-2024 Aerospike, Inc.
  *
  * Portions may be licensed to Aerospike, Inc. under one or more contributor
  * license agreements WHICH ARE COMPATIBLE WITH THE APACHE LICENSE, VERSION 2.0.
@@ -20,9 +20,9 @@
 
 public interface LatencyManager {
 
-	public void add(long elapsed);
+	void add(long elapsed);
 
-	public void printHeader(PrintStream stream);
+	void printHeader(PrintStream stream);
 
 	/**
 	 * Print latency percents for specified cumulative ranges.
@@ -32,9 +32,9 @@ public interface LatencyManager {
 	 * affects performance.  Fortunately, the values will even out over time
 	 * (ie. no double counting).
 	 */
-	public void printResults(PrintStream stream, String prefix);
+	void printResults(PrintStream stream, String prefix);
 
-	public void printSummaryHeader(PrintStream stream);
+	void printSummaryHeader(PrintStream stream);
 
-	public void printSummary(PrintStream stream, String prefix);
+	void printSummary(PrintStream stream, String prefix);
 }

benchmarks/src/com/aerospike/benchmarks/LatencyManagerYcsb.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 Aerospike, Inc.
+ * Copyright 2012-2024 Aerospike, Inc.
  *
  * Portions may be licensed to Aerospike, Inc. under one or more contributor
  * license agreements WHICH ARE COMPATIBLE WITH THE APACHE LICENSE, VERSION 2.0.
@@ -25,21 +25,21 @@ public class LatencyManagerYcsb implements LatencyManager {
 	public static final String BUCKETS = "histogram.buckets";
 	public static final String BUCKETS_DEFAULT = "1000";
 
-	private AtomicInteger _buckets;
-	private AtomicLongArray histogram;
-	private AtomicLong histogramoverflow;
-	private AtomicInteger operations;
-	private AtomicLong totallatency;
-	private AtomicInteger warmupCount;
+	private final AtomicInteger _buckets;
+	private final AtomicLongArray histogram;
+	private final AtomicLong histogramoverflow;
+	private final AtomicInteger operations;
+	private final AtomicLong totallatency;
+	private final AtomicInteger warmupCount;
 	private volatile boolean warmupComplete = false;
 
 	//keep a windowed version of these stats for printing status
-	private AtomicInteger windowoperations;
-	private AtomicLong windowtotallatency;
+	private final AtomicInteger windowoperations;
+	private final AtomicLong windowtotallatency;
 
-	private AtomicLong min;
-	private AtomicLong max;
-	private String name;
+	private final AtomicLong min;
+	private final AtomicLong max;
+	private final String name;
 
 	public LatencyManagerYcsb(String name, int warmupCount) {
 		this.name = name;
@@ -125,7 +125,7 @@ public void printResults(PrintStream exporter, String prefix) {
 			}
 		}
 		buffer.append(']');
-		exporter.println(buffer.toString());
+		exporter.println(buffer);
 		windowoperations.set(0);
 		windowtotallatency.set(0);
 	}

benchmarks/src/com/aerospike/benchmarks/Main.java

@@ -96,8 +96,8 @@ public static void main(String[] args) {
 		}
 	}
 
-	private Arguments args = new Arguments();
-	private Host[] hosts;
+	private final Arguments args = new Arguments();
+	private final Host[] hosts;
 	private EventLoopType eventLoopType = EventLoopType.DIRECT_NIO;
 	private int port = 3000;
 	private long nKeys;
@@ -112,8 +112,8 @@ public static void main(String[] args) {
 	private String filepath;
 
 	private EventLoops eventLoops;
-	private ClientPolicy clientPolicy = new ClientPolicy();
-	private CounterStore counters = new CounterStore();
+	private final ClientPolicy clientPolicy = new ClientPolicy();
+	private final CounterStore counters = new CounterStore();
 
 	public Main(String[] commandLineArgs) throws Exception {
 		boolean hasTxns = false;
@@ -221,6 +221,11 @@ public Main(String[] commandLineArgs) throws Exception {
 			"  0: Default to namespace expiration time\n" +
 			" >0: Actual given expiration time"
 			);
+		options.addOption("rt", "readTouchTtlPercent", true,
+			"Read touch TTL percent is expressed as a percentage of the TTL (or expiration) sent on the most\n" +
+			"recent write such that a read within this interval of the record’s end of life will generate a touch.\n" +
+			"Range: 0 - 100"
+		);
 		options.addOption("g", "throughput", true,
 			"Set a target transactions per second for the client. The client should not exceed this " +
 			"average throughput."
@@ -395,6 +400,14 @@ public Main(String[] commandLineArgs) throws Exception {
 			}
 		}
 
+		if (line.hasOption("readTouchTtlPercent")) {
+			args.readPolicy.readTouchTtlPercent = Integer.parseInt(line.getOptionValue("readTouchTtlPercent"));
+			if (args.readPolicy.readTouchTtlPercent < 0 || args.readPolicy.readTouchTtlPercent > 100) {
+				throw new Exception("Invalid readTouchTtlPercent: " + args.readPolicy.readTouchTtlPercent +
+					" Range: 0 - 100");
+			}
+		}
+
 		if (line.hasOption("port")) {
 			this.port = Integer.parseInt(line.getOptionValue("port"));
 		}
@@ -1053,19 +1066,21 @@ else if (! level.equals("all")) {
 		if (args.workload != Workload.INITIALIZE) {
 			System.out.println("read policy:");
 			System.out.println(
-					"    connectTimeout: " + args.readPolicy.connectTimeout
-					+ ", socketTimeout: " + args.readPolicy.socketTimeout
-					+ ", totalTimeout: " + args.readPolicy.totalTimeout
-					+ ", timeoutDelay: " + args.readPolicy.timeoutDelay
-					+ ", maxRetries: " + args.readPolicy.maxRetries
-					+ ", sleepBetweenRetries: " + args.readPolicy.sleepBetweenRetries
-					);
+				"    connectTimeout: " + args.readPolicy.connectTimeout
+				+ ", socketTimeout: " + args.readPolicy.socketTimeout
+				+ ", totalTimeout: " + args.readPolicy.totalTimeout
+				+ ", timeoutDelay: " + args.readPolicy.timeoutDelay
+				+ ", maxRetries: " + args.readPolicy.maxRetries
+				+ ", sleepBetweenRetries: " + args.readPolicy.sleepBetweenRetries
+				);
 
 			System.out.println(
-					"    readModeAP: " + args.readPolicy.readModeAP
-					+ ", readModeSC: " + args.readPolicy.readModeSC
-					+ ", replica: " + args.readPolicy.replica
-					+ ", reportNotFound: " + args.reportNotFound);
+				"    readModeAP: " + args.readPolicy.readModeAP
+				+ ", readModeSC: " + args.readPolicy.readModeSC
+				+ ", replica: " + args.readPolicy.replica
+				+ ", readTouchTtlPercent: " + args.readPolicy.readTouchTtlPercent
+				+ ", reportNotFound: " + args.reportNotFound
+				);
 		}
 
 		System.out.println("write policy:");
@@ -1078,7 +1093,10 @@ else if (! level.equals("all")) {
 			+ ", sleepBetweenRetries: " + args.writePolicy.sleepBetweenRetries
 			);
 
-		System.out.println("    commitLevel: " + args.writePolicy.commitLevel);
+		System.out.println(
+			"    commitLevel: " + args.writePolicy.commitLevel
+			+ ", expiration: " + args.writePolicy.expiration
+		);
 
 		if (args.batchSize > 1) {
 			System.out.println("batch size: " + args.batchSize
@@ -1100,25 +1118,25 @@ else if (! level.equals("all")) {
 			System.out.print("bin[" + binCount + "]: ");
 
 			switch (spec.type) {
-			case INTEGER:
-				System.out.println("integer");
-				break;
+				case INTEGER:
+					System.out.println("integer");
+					break;
 
-			case STRING:
-				System.out.println("string[" + spec.size + "]");
-				break;
+				case STRING:
+					System.out.println("string[" + spec.size + "]");
+					break;
 
-			case BYTES:
-				System.out.println("byte[" + spec.size + "]");
-				break;
+				case BYTES:
+					System.out.println("byte[" + spec.size + "]");
+					break;
 
-			case RANDOM:
-				System.out.println("random[" + (spec.size * 8) + "]");
-				break;
+				case RANDOM:
+					System.out.println("random[" + (spec.size * 8) + "]");
+					break;
 
-			case TIMESTAMP:
-				System.out.println("timestamp");
-				break;
+				case TIMESTAMP:
+					System.out.println("timestamp");
+					break;
 			}
 			binCount++;
 		}
@@ -1143,7 +1161,7 @@ private static void logUsage(Options options) {
 		String syntax = Main.class.getName() + " [<options>]";
 		formatter.printHelp(pw, 100, syntax, "options:", options, 0, 2, null);
 
-		System.out.println(sw.toString());
+		System.out.println(sw);
 	}
 
 	private static String getLatencyUsage(String latencyString) {

benchmarks/src/com/aerospike/benchmarks/RWTask.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 Aerospike, Inc.
+ * Copyright 2012-2024 Aerospike, Inc.
  *
  * Portions may be licensed to Aerospike, Inc. under one or more contributor
  * license agreements WHICH ARE COMPATIBLE WITH THE APACHE LICENSE, VERSION 2.0.
@@ -59,41 +59,41 @@ public void stop() {
 	protected void runCommand(RandomShift random) {
 		try {
 			switch (args.workload) {
-			case READ_UPDATE:
-			case READ_REPLACE:
-				readUpdate(random);
-				break;
+				case READ_UPDATE:
+				case READ_REPLACE:
+					readUpdate(random);
+					break;
 
-			case READ_MODIFY_UPDATE:
-				readModifyUpdate(random);
-				break;
+				case READ_MODIFY_UPDATE:
+					readModifyUpdate(random);
+					break;
 
-			case READ_MODIFY_INCREMENT:
-				readModifyIncrement(random);
-				break;
+				case READ_MODIFY_INCREMENT:
+					readModifyIncrement(random);
+					break;
 
-			case READ_MODIFY_DECREMENT:
-				readModifyDecrement(random);
-				break;
+				case READ_MODIFY_DECREMENT:
+					readModifyDecrement(random);
+					break;
 
-			case READ_FROM_FILE:
-				readFromFile(random);
-				break;
+				case READ_FROM_FILE:
+					readFromFile(random);
+					break;
 
-			case TRANSACTION:
-				runTransaction(random);
-				break;
+				case TRANSACTION:
+					runTransaction(random);
+					break;
 
-			default:
-				break;
+				default:
+					break;
 			}
 		}
 		catch (Exception e) {
 			if (args.debug) {
 				e.printStackTrace();
 			}
 			else {
-				System.out.println("Exception - " + e.toString());
+				System.out.println("Exception - " + e);
 			}
 		}
 	}