From 04d3031ec804237cf25ffff2c3153fc877204e5c Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Tue, 21 Dec 2021 13:08:03 -0600 Subject: [PATCH] cherry-pick transient fields for Gson compat with newer JLS --- .../engine/api/metrics/ThreadLocalNamedTimers.java | 2 +- .../functions/collectionclobs/StringMapClob.java | 2 +- .../functions/rainbow/TokenMapFileBaseFunction.java | 2 +- .../cql/errorhandling/HashedCQLErrorHandler.java | 2 +- .../activitytype/cql/statements/rowoperators/Save.java | 2 +- .../cql/statements/rowoperators/SaveThreadVars.java | 2 +- .../cql/statements/rsoperators/TraceLogger.java | 2 +- .../cql/statements/rowoperators/SaveThreadVars.java | 2 +- .../cql/statements/rsoperators/TraceLogger.java | 2 +- .../dsegraph/statements/ReadyGraphStatementTemplate.java | 4 ++-- .../io/nosqlbench/driver/pulsar/PulsarActivityType.java | 2 +- .../driver/pulsar/ops/PulsarBatchProducerStartOp.java | 4 ++-- .../java/io/nosqlbench/virtdata/core/bindings/Bindings.java | 6 +++--- .../shared/from_long/to_bytebuffer/DigestToByteBuffer.java | 2 +- .../from_long/to_bytebuffer/HashedByteBufferExtract.java | 2 +- .../shared/from_long/to_bytebuffer/ToMD5ByteBuffer.java | 2 +- .../library/basics/shared/from_long/to_int/Hash.java | 4 ++-- .../library/basics/shared/from_long/to_int/SignedHash.java | 4 ++-- .../library/basics/shared/from_long/to_long/Hash.java | 2 +- .../from_long/to_string/HashedFileExtractToString.java | 2 +- .../basics/shared/from_long/to_string/MD5HexString.java | 2 +- .../shared/from_long/to_string/Murmur3DivToString.java | 2 +- .../shared/from_long/to_string/NumberNameToString.java | 3 +-- .../basics/shared/from_long/to_string/ToBase64String.java | 2 +- .../basics/shared/nondeterministic/ThreadNumToLong.java | 2 +- .../basics/shared/nondeterministic/to_int/ThreadNum.java | 3 +-- .../basics/shared/nondeterministic/to_long/ThreadNum.java | 2 +- .../virtdata/library/basics/shared/stateful/Show.java | 2 +- .../library/basics/shared/stateful/from_long/Show.java | 2 +- .../virtdata/library/basics/shared/unary_int/Hash.java | 2 +- .../library/basics/shared/unary_string/ToBase64String.java | 2 +- .../library/curves4/discrete/common/ThreadSafeHash.java | 2 +- 32 files changed, 38 insertions(+), 40 deletions(-) diff --git a/adapters-api/src/main/java/io/nosqlbench/engine/api/metrics/ThreadLocalNamedTimers.java b/adapters-api/src/main/java/io/nosqlbench/engine/api/metrics/ThreadLocalNamedTimers.java index d8947ca5e..2fe56b706 100644 --- a/adapters-api/src/main/java/io/nosqlbench/engine/api/metrics/ThreadLocalNamedTimers.java +++ b/adapters-api/src/main/java/io/nosqlbench/engine/api/metrics/ThreadLocalNamedTimers.java @@ -16,7 +16,7 @@ public class ThreadLocalNamedTimers { private final static Logger logger = LogManager.getLogger(ThreadLocalNamedTimers.class); - public final static ThreadLocal TL_INSTANCE = ThreadLocal.withInitial(ThreadLocalNamedTimers::new); + public transient final static ThreadLocal TL_INSTANCE = ThreadLocal.withInitial(ThreadLocalNamedTimers::new); private final static Map timers = new HashMap<>(); private final Map contexts = new HashMap<>(); diff --git a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/collectionclobs/StringMapClob.java b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/collectionclobs/StringMapClob.java index a3e3b8b52..7849f1f77 100644 --- a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/collectionclobs/StringMapClob.java +++ b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/collectionclobs/StringMapClob.java @@ -27,7 +27,7 @@ import java.util.function.LongToIntFunction; @ThreadSafeMapper public class StringMapClob implements LongFunction { - private final static ThreadLocal tl_sb = ThreadLocal.withInitial(StringBuilder::new); + private transient final static ThreadLocal tl_sb = ThreadLocal.withInitial(StringBuilder::new); private final LongToIntFunction sizeFunc; private final LongFunction[] keyFuncs; diff --git a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileBaseFunction.java b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileBaseFunction.java index bcb83edde..c246cfac5 100644 --- a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileBaseFunction.java +++ b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileBaseFunction.java @@ -3,7 +3,7 @@ package io.nosqlbench.activitytype.cql.datamappers.functions.rainbow; import java.util.function.IntToLongFunction; public abstract class TokenMapFileBaseFunction implements IntToLongFunction { - protected static ThreadLocal tl_DataSvc; + protected transient static ThreadLocal tl_DataSvc; public TokenMapFileBaseFunction(String filename, boolean loopdata, boolean instanced, boolean ascending) { tl_DataSvc = ThreadLocal.withInitial(() -> new TokenMapFileAPIService(filename, loopdata, instanced, ascending)); diff --git a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/HashedCQLErrorHandler.java b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/HashedCQLErrorHandler.java index e23069ce2..899b66fa6 100644 --- a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/HashedCQLErrorHandler.java +++ b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/HashedCQLErrorHandler.java @@ -19,7 +19,7 @@ public class HashedCQLErrorHandler extends HashedErrorHandler tlResultCode = ThreadLocal.withInitial(() -> (0)); + private transient static final ThreadLocal tlResultCode = ThreadLocal.withInitial(() -> (0)); public HashedCQLErrorHandler(ExceptionCountMetrics exceptionCountMetrics) { this.exceptionCountMetrics = exceptionCountMetrics; diff --git a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/Save.java b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/Save.java index 6fae4d104..c8a0586ed 100644 --- a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/Save.java +++ b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/Save.java @@ -18,7 +18,7 @@ import java.util.stream.Collectors; public class Save implements RowCycleOperator { private final static Logger logger = LogManager.getLogger(Save.class); - ThreadLocal> tl_objectMap = SharedState.tl_ObjectMap; + private final transient ThreadLocal> tl_objectMap = SharedState.tl_ObjectMap; private final String[] varnames; diff --git a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/SaveThreadVars.java b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/SaveThreadVars.java index 9aebb9527..8138a6aed 100644 --- a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/SaveThreadVars.java +++ b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/SaveThreadVars.java @@ -14,7 +14,7 @@ import java.util.List; */ public class SaveThreadVars implements RowCycleOperator { - ThreadLocal> tl_objectMap = SharedState.tl_ObjectMap; + private final transient ThreadLocal> tl_objectMap = SharedState.tl_ObjectMap; @Override public int apply(Row row, long cycle) { diff --git a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/TraceLogger.java b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/TraceLogger.java index 81f86a243..7abf6f22e 100644 --- a/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/TraceLogger.java +++ b/driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/TraceLogger.java @@ -24,7 +24,7 @@ public class TraceLogger implements ResultSetCycleOperator, StatementModifier { private final long modulo; private final String filename; private final FileWriter writer; - private final ThreadLocal tlsb = ThreadLocal.withInitial(StringBuilder::new); + private final transient ThreadLocal tlsb = ThreadLocal.withInitial(StringBuilder::new); public TraceLogger(SimpleConfig conf) { this( diff --git a/driver-cqld3-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/SaveThreadVars.java b/driver-cqld3-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/SaveThreadVars.java index 9aebb9527..8138a6aed 100644 --- a/driver-cqld3-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/SaveThreadVars.java +++ b/driver-cqld3-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/SaveThreadVars.java @@ -14,7 +14,7 @@ import java.util.List; */ public class SaveThreadVars implements RowCycleOperator { - ThreadLocal> tl_objectMap = SharedState.tl_ObjectMap; + private final transient ThreadLocal> tl_objectMap = SharedState.tl_ObjectMap; @Override public int apply(Row row, long cycle) { diff --git a/driver-cqld3-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/TraceLogger.java b/driver-cqld3-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/TraceLogger.java index 81f86a243..7abf6f22e 100644 --- a/driver-cqld3-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/TraceLogger.java +++ b/driver-cqld3-shaded/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/TraceLogger.java @@ -24,7 +24,7 @@ public class TraceLogger implements ResultSetCycleOperator, StatementModifier { private final long modulo; private final String filename; private final FileWriter writer; - private final ThreadLocal tlsb = ThreadLocal.withInitial(StringBuilder::new); + private final transient ThreadLocal tlsb = ThreadLocal.withInitial(StringBuilder::new); public TraceLogger(SimpleConfig conf) { this( diff --git a/driver-dsegraph-shaded/src/main/java/com/datastax/ebdrivers/dsegraph/statements/ReadyGraphStatementTemplate.java b/driver-dsegraph-shaded/src/main/java/com/datastax/ebdrivers/dsegraph/statements/ReadyGraphStatementTemplate.java index f17e410be..60d8cbdc3 100644 --- a/driver-dsegraph-shaded/src/main/java/com/datastax/ebdrivers/dsegraph/statements/ReadyGraphStatementTemplate.java +++ b/driver-dsegraph-shaded/src/main/java/com/datastax/ebdrivers/dsegraph/statements/ReadyGraphStatementTemplate.java @@ -56,7 +56,7 @@ public class ReadyGraphStatementTemplate { implements ValuesBinder { private final String[] fields; private final Map valuesMap = new HashMap(); - private final ThreadLocal> mapTL; + private final transient ThreadLocal> mapTL; public ParameterizedGraphStatementValuesBinder(String[] fields) { this.fields = fields; @@ -76,4 +76,4 @@ public class ReadyGraphStatementTemplate { public ReadyGraphStatement resolve() { return new ReadyGraphStatement(contextualBindingsTemplate.resolveBindings()); } -} \ No newline at end of file +} diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/PulsarActivityType.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/PulsarActivityType.java index e0bb29496..fa4faa511 100644 --- a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/PulsarActivityType.java +++ b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/PulsarActivityType.java @@ -6,7 +6,7 @@ import io.nosqlbench.engine.api.activityapi.core.ActivityType; import io.nosqlbench.engine.api.activityimpl.ActivityDef; import io.nosqlbench.nb.annotations.Service; -@Service(value = ActivityType.class, selector = "pulsar") +@Service(value= ActivityType.class, selector="pulsar") public class PulsarActivityType implements ActivityType { @Override diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarBatchProducerStartOp.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarBatchProducerStartOp.java index eca7bbd56..6a163cd8f 100644 --- a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarBatchProducerStartOp.java +++ b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/PulsarBatchProducerStartOp.java @@ -10,8 +10,8 @@ import java.util.concurrent.CompletableFuture; public class PulsarBatchProducerStartOp extends SyncPulsarOp { // TODO: ensure sane container lifecycle management - public final static ThreadLocal>> threadLocalBatchMsgContainer = new ThreadLocal<>(); - public final static ThreadLocal> threadLocalProducer = new ThreadLocal<>(); + public final transient static ThreadLocal>> threadLocalBatchMsgContainer = new ThreadLocal<>(); + public final transient static ThreadLocal> threadLocalProducer = new ThreadLocal<>(); public PulsarBatchProducerStartOp(Producer batchProducer) { threadLocalProducer.set(batchProducer); diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/Bindings.java b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/Bindings.java index 9693df751..2e747dc8b 100644 --- a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/Bindings.java +++ b/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/Bindings.java @@ -37,9 +37,9 @@ import java.util.*; */ public class Bindings { private final static Logger logger = LogManager.getLogger(Bindings.class); - private BindingsTemplate template; + private final BindingsTemplate template; private List> dataMappers = new ArrayList>(); - private ThreadLocal>> nameCache; + private final transient ThreadLocal>> nameCache; public Bindings(BindingsTemplate template, List> dataMappers) { this.template = template; @@ -346,7 +346,7 @@ public class Bindings { return new LazyValuesMap(this, input); } - public static interface FieldSetter { + public interface FieldSetter { void setField(String name, Object value); } diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/DigestToByteBuffer.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/DigestToByteBuffer.java index 4e5269f10..5fd047bf6 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/DigestToByteBuffer.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/DigestToByteBuffer.java @@ -17,7 +17,7 @@ import java.util.stream.Collectors; @ThreadSafeMapper public class DigestToByteBuffer implements LongFunction { - private static ThreadLocal tl_state; + private transient static ThreadLocal tl_state; public DigestToByteBuffer(String digestType) { diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/HashedByteBufferExtract.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/HashedByteBufferExtract.java index 6f62b7486..264060cc7 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/HashedByteBufferExtract.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/HashedByteBufferExtract.java @@ -26,7 +26,7 @@ import java.util.function.LongToIntFunction; public class HashedByteBufferExtract implements LongFunction { private final LongToIntFunction sizefunc; - private final ThreadLocal bbaccessor; + private final transient ThreadLocal bbaccessor; private final Hash inthash = new Hash(); public HashedByteBufferExtract(Object initFunc, Object sizeFunc) { diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/ToMD5ByteBuffer.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/ToMD5ByteBuffer.java index 2c28e27c9..1b8a1ab77 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/ToMD5ByteBuffer.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/ToMD5ByteBuffer.java @@ -18,7 +18,7 @@ import java.util.function.LongFunction; public class ToMD5ByteBuffer implements LongFunction { private final MessageDigest md5; - private static final ThreadLocal tl_state = ThreadLocal.withInitial(TLState::new); + private transient static final ThreadLocal tl_state = ThreadLocal.withInitial(TLState::new); @Example({"MD5ByteBuffer()","convert the a input to an md5 digest of its bytes"}) public ToMD5ByteBuffer() { diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Hash.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Hash.java index 32255443e..dda9d818a 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Hash.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Hash.java @@ -12,8 +12,8 @@ import java.util.function.LongToIntFunction; @Categories({Category.general}) public class Hash implements LongToIntFunction { - ThreadLocal bb_TL = ThreadLocal.withInitial(() -> ByteBuffer.allocate(Long.BYTES)); - ThreadLocal murmur3f_TL = ThreadLocal.withInitial(Murmur3F::new); + private final transient ThreadLocal bb_TL = ThreadLocal.withInitial(() -> ByteBuffer.allocate(Long.BYTES)); + private final transient ThreadLocal murmur3f_TL = ThreadLocal.withInitial(Murmur3F::new); @Override public int applyAsInt(long value) { diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/SignedHash.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/SignedHash.java index a5fed9a9d..40a1a7632 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/SignedHash.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/SignedHash.java @@ -12,8 +12,8 @@ import java.util.function.LongToIntFunction; @Categories({Category.general}) public class SignedHash implements LongToIntFunction { - ThreadLocal bb_TL = ThreadLocal.withInitial(() -> ByteBuffer.allocate(Long.BYTES)); - ThreadLocal murmur3f_TL = ThreadLocal.withInitial(Murmur3F::new); + private final transient ThreadLocal bb_TL = ThreadLocal.withInitial(() -> ByteBuffer.allocate(Long.BYTES)); + private final transient ThreadLocal murmur3f_TL = ThreadLocal.withInitial(Murmur3F::new); @Override public int applyAsInt(long value) { diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Hash.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Hash.java index e4dc5a6c5..d5c8f4448 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Hash.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Hash.java @@ -19,7 +19,7 @@ import java.util.function.LongUnaryOperator; @Categories({Category.general, Category.general}) public class Hash implements LongUnaryOperator { - private final ThreadLocal murmur3f_TL = ThreadLocal.withInitial(Murmur3F::new); + private final transient ThreadLocal murmur3f_TL = ThreadLocal.withInitial(Murmur3F::new); @Override public long applyAsLong(long value) { diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/HashedFileExtractToString.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/HashedFileExtractToString.java index 76be1c8fe..12f6f797e 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/HashedFileExtractToString.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/HashedFileExtractToString.java @@ -48,7 +48,7 @@ public class HashedFileExtractToString implements LongFunction { private final CharBuffer buf; private final LongToIntFunction sizeFunc; private final LongToIntFunction positionRange = new HashRange(0, Integer.MAX_VALUE); - private final static ThreadLocal tl_sb = ThreadLocal.withInitial(StringBuilder::new); + private final static transient ThreadLocal tl_sb = ThreadLocal.withInitial(StringBuilder::new); private final String filename; @Example({"HashedFileExtractToString('data/adventures.txt',100,200)", "return a fragment from adventures.txt between 100 and 200 characters long"}) diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/MD5HexString.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/MD5HexString.java index 1d58dea19..5b6960cc7 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/MD5HexString.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/MD5HexString.java @@ -20,7 +20,7 @@ import java.util.function.LongFunction; public class MD5HexString implements LongFunction { private final MessageDigest md5; - private static final ThreadLocal tl_state = ThreadLocal.withInitial(TLState::new); + private static final transient ThreadLocal tl_state = ThreadLocal.withInitial(TLState::new); @Example({"MD5String()","Convert a long input to an md5 digest over its bytes, and then to a hexadecimal string."}) public MD5HexString() { diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Murmur3DivToString.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Murmur3DivToString.java index 2c4e0b3ad..cbf1977c1 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Murmur3DivToString.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Murmur3DivToString.java @@ -36,7 +36,7 @@ import java.util.function.LongFunction; @DeprecatedFunction("This function is easily replaced with other simpler functions.") public class Murmur3DivToString implements LongFunction { - private final ThreadLocal murmur3F_TL = ThreadLocal.withInitial(Murmur3F::new); + private final transient ThreadLocal murmur3F_TL = ThreadLocal.withInitial(Murmur3F::new); private final DivideToLong divideToLongMapper; public Murmur3DivToString(long divisor) { diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/NumberNameToString.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/NumberNameToString.java index f1a4f0466..e4238f578 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/NumberNameToString.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/NumberNameToString.java @@ -35,8 +35,7 @@ import java.util.function.LongFunction; @Categories({Category.general,Category.premade}) public class NumberNameToString implements LongFunction { - - private final static ThreadLocal tlsb = ThreadLocal.withInitial(StringBuilder::new); + private final transient static ThreadLocal tlsb = ThreadLocal.withInitial(StringBuilder::new); private final static String THOUSAND = "thousand"; private final static String MILLION = "million"; diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ToBase64String.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ToBase64String.java index cb9970ef0..95f29d447 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ToBase64String.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ToBase64String.java @@ -16,7 +16,7 @@ import java.util.function.LongFunction; @ThreadSafeMapper public class ToBase64String implements LongFunction { - private final static ThreadLocal tl_state = ThreadLocal.withInitial(TLState::new); + private final transient static ThreadLocal tl_state = ThreadLocal.withInitial(TLState::new); @Example({"ToBase64String()","Convert the bytes of a long input into a base64 String"}) public ToBase64String() { diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/nondeterministic/ThreadNumToLong.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/nondeterministic/ThreadNumToLong.java index 3ae18c13f..8694677a2 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/nondeterministic/ThreadNumToLong.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/nondeterministic/ThreadNumToLong.java @@ -39,7 +39,7 @@ import java.util.regex.Pattern; public class ThreadNumToLong implements LongUnaryOperator { private static final Pattern pattern = Pattern.compile("^.*?(\\d+).*$"); - private final ThreadLocal threadLocalInt = new ThreadLocal() { + private final transient ThreadLocal threadLocalInt = new ThreadLocal() { @Override protected Long initialValue() { Matcher matcher = pattern.matcher(Thread.currentThread().getName()); diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/nondeterministic/to_int/ThreadNum.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/nondeterministic/to_int/ThreadNum.java index 7fd61fbe1..c5298177e 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/nondeterministic/to_int/ThreadNum.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/nondeterministic/to_int/ThreadNum.java @@ -38,8 +38,7 @@ import java.util.regex.Pattern; public class ThreadNum implements LongToIntFunction { private static final Pattern pattern = Pattern.compile("^.*?(\\d+).*$"); - - private final ThreadLocal threadLocalInt = new ThreadLocal() { + private final transient ThreadLocal threadLocalInt = new ThreadLocal() { @Override protected Integer initialValue() { if (Thread.currentThread() instanceof Indexed ) { diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/nondeterministic/to_long/ThreadNum.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/nondeterministic/to_long/ThreadNum.java index f2b0951c2..e3cc65682 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/nondeterministic/to_long/ThreadNum.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/nondeterministic/to_long/ThreadNum.java @@ -32,7 +32,7 @@ import java.util.regex.Pattern; public class ThreadNum implements LongUnaryOperator { private static final Pattern pattern = Pattern.compile("^.*?(\\d+).*$"); - private final ThreadLocal threadLocalInt = new ThreadLocal() { + private final transient ThreadLocal threadLocalInt = new ThreadLocal() { @Override protected Long initialValue() { if (Thread.currentThread() instanceof Indexed) { diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/Show.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/Show.java index e1c1c8484..713120125 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/Show.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/Show.java @@ -17,7 +17,7 @@ import java.util.function.Function; public class Show implements Function { private final String[] names; - private final ThreadLocal tl_sb = ThreadLocal.withInitial(StringBuilder::new); + private final transient ThreadLocal tl_sb = ThreadLocal.withInitial(StringBuilder::new); @Example({"Show()","Show all values in a json-like format"}) public Show() { diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/Show.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/Show.java index daa01b9b9..4fc455db4 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/Show.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/Show.java @@ -14,7 +14,7 @@ import java.util.function.LongFunction; public class Show implements LongFunction { private final String[] names; - private final ThreadLocal tl_sb = ThreadLocal.withInitial(StringBuilder::new); + private final transient ThreadLocal tl_sb = ThreadLocal.withInitial(StringBuilder::new); @Example({"Show()","Show all values in a json-like format"}) public Show() { diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Hash.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Hash.java index 6ddbcae7d..9a319b1fd 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Hash.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Hash.java @@ -12,7 +12,7 @@ import java.util.function.IntUnaryOperator; @Categories({Category.general}) public class Hash implements IntUnaryOperator { - private final ThreadLocal murmur3f_TL = ThreadLocal.withInitial(Murmur3F::new); + private final transient ThreadLocal murmur3f_TL = ThreadLocal.withInitial(Murmur3F::new); @Override public int applyAsInt(int operand) { diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/ToBase64String.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/ToBase64String.java index cd05983a2..573986714 100644 --- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/ToBase64String.java +++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/ToBase64String.java @@ -14,7 +14,7 @@ import java.util.function.Function; @ThreadSafeMapper public class ToBase64String implements Function { - private final static ThreadLocal tl_state = ThreadLocal.withInitial(TLState::new); + private final transient static ThreadLocal tl_state = ThreadLocal.withInitial(TLState::new); @Example({"ToBase64String()","encode any input as Base64"}) public ToBase64String() { diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/ThreadSafeHash.java b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/ThreadSafeHash.java index dbe64781f..038c12c36 100644 --- a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/ThreadSafeHash.java +++ b/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/ThreadSafeHash.java @@ -16,7 +16,7 @@ public class ThreadSafeHash implements LongUnaryOperator { // private ByteBuffer bb = ByteBuffer.allocate(Long.BYTES); // private Murmur3F murmur3F= new Murmur3F(); - private static ThreadLocal tlstate = ThreadLocal.withInitial(HashState::new); + private final transient static ThreadLocal tlstate = ThreadLocal.withInitial(HashState::new); @Override public long applyAsLong(long value) {