Repository: ignite Updated Branches: refs/heads/master 89e7df044 -> 02739a57c
http://git-wip-us.apache.org/repos/asf/ignite/blob/02739a57/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java index 25b26a7..1f68490 100644 --- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java @@ -22,6 +22,7 @@ import java.util.Map; import java.util.Random; import java.util.TreeMap; import java.util.concurrent.Callable; +import java.util.concurrent.atomic.LongAdder; import javax.cache.configuration.Factory; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; @@ -41,7 +42,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.transactions.Transaction; -import org.jsr166.LongAdder8; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -253,8 +253,8 @@ public class GridCacheJdbcBlobStoreMultithreadedSelfTest extends GridCommonAbstr CacheStore store = cctx.store().configuredStore(); - long opened = ((LongAdder8)U.field(store, "opened")).sum(); - long closed = ((LongAdder8)U.field(store, "closed")).sum(); + long opened = ((LongAdder)U.field(store, "opened")).sum(); + long closed = ((LongAdder)U.field(store, "closed")).sum(); assert opened > 0; assert closed > 0; http://git-wip-us.apache.org/repos/asf/ignite/blob/02739a57/modules/core/src/test/java/org/apache/ignite/internal/TestDelayingCommunicationSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/TestDelayingCommunicationSpi.java b/modules/core/src/test/java/org/apache/ignite/internal/TestDelayingCommunicationSpi.java index e49d5da..4068c6a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/TestDelayingCommunicationSpi.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/TestDelayingCommunicationSpi.java @@ -17,6 +17,7 @@ package org.apache.ignite.internal; +import java.util.concurrent.ThreadLocalRandom; import org.apache.ignite.IgniteException; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.internal.managers.communication.GridIoMessage; @@ -25,7 +26,6 @@ import org.apache.ignite.lang.IgniteInClosure; import org.apache.ignite.plugin.extensions.communication.Message; import org.apache.ignite.spi.IgniteSpiException; import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi; -import org.jsr166.ThreadLocalRandom8; /** * @@ -38,7 +38,7 @@ public abstract class TestDelayingCommunicationSpi extends TcpCommunicationSpi { GridIoMessage ioMsg = (GridIoMessage)msg; if (delayMessage(ioMsg.message(), ioMsg)) - U.sleep(ThreadLocalRandom8.current().nextInt(delayMillis()) + 1); + U.sleep(ThreadLocalRandom.current().nextInt(delayMillis()) + 1); } catch (IgniteInterruptedCheckedException e) { throw new IgniteSpiException(e); http://git-wip-us.apache.org/repos/asf/ignite/blob/02739a57/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractDataStreamerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractDataStreamerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractDataStreamerSelfTest.java index 3ad1ec8..2f8c2a5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractDataStreamerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractDataStreamerSelfTest.java @@ -22,7 +22,13 @@ import java.util.Arrays; import java.util.concurrent.Callable; import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.LongAdder; import org.apache.ignite.IgniteDataStreamer; +import org.apache.ignite.binary.BinaryObjectException; +import org.apache.ignite.binary.BinaryReader; +import org.apache.ignite.binary.BinaryTypeConfiguration; +import org.apache.ignite.binary.BinaryWriter; +import org.apache.ignite.binary.Binarylizable; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cache.CacheWriteSynchronizationMode; @@ -32,13 +38,7 @@ import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.NearCacheConfiguration; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.binary.BinaryMarshaller; -import org.apache.ignite.binary.BinaryObjectException; -import org.apache.ignite.binary.Binarylizable; -import org.apache.ignite.binary.BinaryReader; -import org.apache.ignite.binary.BinaryTypeConfiguration; -import org.apache.ignite.binary.BinaryWriter; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import org.jsr166.LongAdder8; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.PRIMARY_SYNC; @@ -119,7 +119,7 @@ public abstract class GridCacheBinaryObjectsAbstractDataStreamerSelfTest extends public void testGetPut() throws Exception { final AtomicBoolean flag = new AtomicBoolean(); - final LongAdder8 cnt = new LongAdder8(); + final LongAdder cnt = new LongAdder(); try (IgniteDataStreamer<Object, Object> ldr = grid(0).dataStreamer(DEFAULT_CACHE_NAME)) { IgniteInternalFuture<?> f = multithreadedAsync( http://git-wip-us.apache.org/repos/asf/ignite/blob/02739a57/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractMultiThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractMultiThreadedSelfTest.java index f1e9dd1..5129d83 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractMultiThreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractMultiThreadedSelfTest.java @@ -23,7 +23,14 @@ import java.util.concurrent.Callable; import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.LongAdder; import org.apache.ignite.IgniteCache; +import org.apache.ignite.binary.BinaryObject; +import org.apache.ignite.binary.BinaryObjectException; +import org.apache.ignite.binary.BinaryReader; +import org.apache.ignite.binary.BinaryTypeConfiguration; +import org.apache.ignite.binary.BinaryWriter; +import org.apache.ignite.binary.Binarylizable; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cache.CacheWriteSynchronizationMode; @@ -32,19 +39,12 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.NearCacheConfiguration; import org.apache.ignite.internal.IgniteInternalFuture; -import org.apache.ignite.internal.processors.cache.IgniteCacheProxy; import org.apache.ignite.internal.binary.BinaryMarshaller; -import org.apache.ignite.binary.BinaryObjectException; -import org.apache.ignite.binary.Binarylizable; -import org.apache.ignite.binary.BinaryObject; -import org.apache.ignite.binary.BinaryReader; -import org.apache.ignite.binary.BinaryTypeConfiguration; -import org.apache.ignite.binary.BinaryWriter; +import org.apache.ignite.internal.processors.cache.IgniteCacheProxy; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import org.jsr166.LongAdder8; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.PRIMARY_SYNC; @@ -132,7 +132,7 @@ public abstract class GridCacheBinaryObjectsAbstractMultiThreadedSelfTest extend @SuppressWarnings("BusyWait") public void testGetPut() throws Exception { final AtomicBoolean flag = new AtomicBoolean(); - final LongAdder8 cnt = new LongAdder8(); + final LongAdder cnt = new LongAdder(); IgniteInternalFuture<?> f = multithreadedAsync( new Callable<Object>() { http://git-wip-us.apache.org/repos/asf/ignite/blob/02739a57/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCache150ClientsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCache150ClientsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCache150ClientsTest.java index 7ec9587..e71d3ee 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCache150ClientsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCache150ClientsTest.java @@ -21,6 +21,7 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.atomic.AtomicInteger; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; @@ -35,7 +36,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import org.jsr166.ThreadLocalRandom8; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; @@ -141,7 +141,7 @@ public class IgniteCache150ClientsTest extends GridCommonAbstractTest { log.info("Started [node=" + ignite.name() + ", left=" + latch.getCount() + ']'); - ThreadLocalRandom8 rnd = ThreadLocalRandom8.current(); + ThreadLocalRandom rnd = ThreadLocalRandom.current(); while (latch.getCount() > 0) { Thread.sleep(1000); http://git-wip-us.apache.org/repos/asf/ignite/blob/02739a57/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxSelfTest.java index d9529da..6dcb539 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxSelfTest.java @@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache.distributed.dht; import java.util.HashMap; import java.util.Map; +import java.util.concurrent.ThreadLocalRandom; import org.apache.ignite.IgniteCache; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.configuration.CacheConfiguration; @@ -32,7 +33,6 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.transactions.Transaction; import org.apache.ignite.transactions.TransactionConcurrency; import org.apache.ignite.transactions.TransactionIsolation; -import org.jsr166.ThreadLocalRandom8; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; @@ -154,17 +154,17 @@ public class IgniteCrossCacheTxSelfTest extends GridCommonAbstractTest { Map<Integer, String> secondCheck = new HashMap<>(); for (int i = 0; i < TX_CNT; i++) { - int grid = ThreadLocalRandom8.current().nextInt(nodeCount()); + int grid = ThreadLocalRandom.current().nextInt(nodeCount()); IgniteCache<Integer, String> first = grid(grid).cache(FIRST_CACHE); IgniteCache<Integer, String> second = grid(grid).cache(SECOND_CACHE); try (Transaction tx = grid(grid).transactions().txStart(concurrency, isolation)) { try { - int size = ThreadLocalRandom8.current().nextInt(24) + 1; + int size = ThreadLocalRandom.current().nextInt(24) + 1; for (int k = 0; k < size; k++) { - boolean rnd = ThreadLocalRandom8.current().nextBoolean(); + boolean rnd = ThreadLocalRandom.current().nextBoolean(); IgniteCache<Integer, String> cache = rnd ? first : second; Map<Integer, String> check = rnd ? firstCheck : secondCheck; http://git-wip-us.apache.org/repos/asf/ignite/blob/02739a57/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/sorted/SortedEvictionPolicyPerformanceTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/sorted/SortedEvictionPolicyPerformanceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/sorted/SortedEvictionPolicyPerformanceTest.java index f7ad491..c0a55fe 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/sorted/SortedEvictionPolicyPerformanceTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/sorted/SortedEvictionPolicyPerformanceTest.java @@ -18,7 +18,9 @@ package org.apache.ignite.internal.processors.cache.eviction.sorted; import java.util.concurrent.Callable; +import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.LongAdder; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; import org.apache.ignite.cache.CacheAtomicityMode; @@ -28,8 +30,6 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import org.jsr166.LongAdder8; -import org.jsr166.ThreadLocalRandom8; /** * {@link SortedEvictionPolicy} performance test. @@ -51,7 +51,7 @@ public class SortedEvictionPolicyPerformanceTest extends GridCommonAbstractTest private static final int P_GET = 30; /** Rnd. */ - private static final ThreadLocalRandom8 RND = ThreadLocalRandom8.current(); + private static final ThreadLocalRandom RND = ThreadLocalRandom.current(); /** Ignite. */ private static Ignite ignite; @@ -93,7 +93,7 @@ public class SortedEvictionPolicyPerformanceTest extends GridCommonAbstractTest * Tests throughput. */ public void testThroughput() throws Exception { - final LongAdder8 cnt = new LongAdder8(); + final LongAdder cnt = new LongAdder(); final AtomicBoolean finished = new AtomicBoolean(); final int pPut = P_PUT; http://git-wip-us.apache.org/repos/asf/ignite/blob/02739a57/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsTransactionsHangTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsTransactionsHangTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsTransactionsHangTest.java index 22d1665..bf8d984 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsTransactionsHangTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsTransactionsHangTest.java @@ -24,6 +24,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.LongAdder; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; import org.apache.ignite.cache.CacheAtomicityMode; @@ -45,7 +46,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.transactions.Transaction; import org.apache.ignite.transactions.TransactionIsolation; -import org.jsr166.LongAdder8; import static org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.DFLT_STORE_DIR; import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC; @@ -177,7 +177,7 @@ public class IgnitePdsTransactionsHangTest extends GridCommonAbstractTest { final CyclicBarrier cyclicBarrier = new CyclicBarrier(THREADS_CNT); final AtomicBoolean interrupt = new AtomicBoolean(false); - final LongAdder8 operationCnt = new LongAdder8(); + final LongAdder operationCnt = new LongAdder(); final IgniteCache<Long, TestEntity> cache = g.cache(CACHE_NAME); http://git-wip-us.apache.org/repos/asf/ignite/blob/02739a57/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsThreadInterruptionTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsThreadInterruptionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsThreadInterruptionTest.java index 6cd3c1f..e88118f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsThreadInterruptionTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsThreadInterruptionTest.java @@ -17,6 +17,7 @@ package org.apache.ignite.internal.processors.cache.persistence.db.file; +import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.atomic.AtomicReference; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; @@ -31,7 +32,6 @@ import org.apache.ignite.configuration.WALMode; import org.apache.ignite.internal.processors.cache.persistence.file.AsyncFileIOFactory; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import org.jsr166.ThreadLocalRandom8; /** * Test what interruptions of writing threads do not affect PDS. @@ -135,7 +135,7 @@ public class IgnitePdsThreadInterruptionTest extends GridCommonAbstractTest { Runnable clo = new Runnable() { @Override public void run() { - cache.get(ThreadLocalRandom8.current().nextInt(maxKey / 5)); + cache.get(ThreadLocalRandom.current().nextInt(maxKey / 5)); } }; for (int i = 0; i < workers.length; i++) { @@ -212,7 +212,7 @@ public class IgnitePdsThreadInterruptionTest extends GridCommonAbstractTest { IgniteCache<Object, Object> cache = ignite.cache(CACHE_NAME); while (!stop) - cache.put(ThreadLocalRandom8.current().nextInt(maxKey), payload); + cache.put(ThreadLocalRandom.current().nextInt(maxKey), payload); } }; http://git-wip-us.apache.org/repos/asf/ignite/blob/02739a57/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackOnTimeoutTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackOnTimeoutTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackOnTimeoutTest.java index 6aa3bdd..c5be40e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackOnTimeoutTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackOnTimeoutTest.java @@ -22,6 +22,7 @@ import java.util.Random; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.LongAdder; import javax.cache.CacheException; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; @@ -53,7 +54,6 @@ import org.apache.ignite.transactions.TransactionDeadlockException; import org.apache.ignite.transactions.TransactionIsolation; import org.apache.ignite.transactions.TransactionOptimisticException; import org.apache.ignite.transactions.TransactionTimeoutException; -import org.jsr166.LongAdder8; import static java.lang.Thread.sleep; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; @@ -409,10 +409,10 @@ public class TxRollbackOnTimeoutTest extends GridCommonAbstractTest { final TransactionConcurrency[] TC_VALS = TransactionConcurrency.values(); final TransactionIsolation[] TI_VALS = TransactionIsolation.values(); - final LongAdder8 cntr0 = new LongAdder8(); - final LongAdder8 cntr1 = new LongAdder8(); - final LongAdder8 cntr2 = new LongAdder8(); - final LongAdder8 cntr3 = new LongAdder8(); + final LongAdder cntr0 = new LongAdder(); + final LongAdder cntr1 = new LongAdder(); + final LongAdder cntr2 = new LongAdder(); + final LongAdder cntr3 = new LongAdder(); final IgniteInternalFuture<?> fut = multithreadedAsync(new Runnable() { @Override public void run() { http://git-wip-us.apache.org/repos/asf/ignite/blob/02739a57/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/IgniteDataStreamerPerformanceTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/IgniteDataStreamerPerformanceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/IgniteDataStreamerPerformanceTest.java index 3ae176d..f7c8294 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/IgniteDataStreamerPerformanceTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/IgniteDataStreamerPerformanceTest.java @@ -18,6 +18,8 @@ package org.apache.ignite.internal.processors.datastreamer; import java.util.concurrent.Callable; +import java.util.concurrent.ThreadLocalRandom; +import java.util.concurrent.atomic.LongAdder; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteDataStreamer; import org.apache.ignite.configuration.CacheConfiguration; @@ -27,8 +29,6 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import org.jsr166.LongAdder8; -import org.jsr166.ThreadLocalRandom8; import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; @@ -99,12 +99,12 @@ public class IgniteDataStreamerPerformanceTest extends GridCommonAbstractTest { super.beforeTestsStarted(); for (int i = 0; i < vals.length; i++) { - int valLen = ThreadLocalRandom8.current().nextInt(128, 512); + int valLen = ThreadLocalRandom.current().nextInt(128, 512); StringBuilder sb = new StringBuilder(); for (int j = 0; j < valLen; j++) - sb.append('a' + ThreadLocalRandom8.current().nextInt(20)); + sb.append('a' + ThreadLocalRandom.current().nextInt(20)); vals[i] = sb.toString(); @@ -142,7 +142,7 @@ public class IgniteDataStreamerPerformanceTest extends GridCommonAbstractTest { ldr.receiver(DataStreamerCacheUpdaters.<Integer, String>batchedSorted()); ldr.autoFlushFrequency(0); - final LongAdder8 cnt = new LongAdder8(); + final LongAdder cnt = new LongAdder(); long start = U.currentTimeMillis(); @@ -171,7 +171,7 @@ public class IgniteDataStreamerPerformanceTest extends GridCommonAbstractTest { multithreaded(new Callable<Object>() { @SuppressWarnings("InfiniteLoopStatement") @Override public Object call() throws Exception { - ThreadLocalRandom8 rnd = ThreadLocalRandom8.current(); + ThreadLocalRandom rnd = ThreadLocalRandom.current(); while (true) { int i = rnd.nextInt(ENTRY_CNT); http://git-wip-us.apache.org/repos/asf/ignite/blob/02739a57/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java index 0acb1d3..d891ee4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java @@ -18,16 +18,23 @@ package org.apache.ignite.internal.processors.igfs; import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.UUID; import java.util.concurrent.Callable; +import java.util.concurrent.ThreadLocalRandom; import org.apache.ignite.Ignite; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cache.CacheWriteSynchronizationMode; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.DataRegionConfiguration; import org.apache.ignite.configuration.DataStorageConfiguration; import org.apache.ignite.configuration.FileSystemConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.configuration.DataRegionConfiguration; import org.apache.ignite.configuration.NearCacheConfiguration; import org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper; import org.apache.ignite.igfs.IgfsInputStream; @@ -45,14 +52,6 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; -import org.jsr166.ThreadLocalRandom8; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.UUID; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -597,7 +596,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest { private Collection<IgfsFile> write() throws Exception { Collection<IgfsFile> res = new HashSet<>(FILES_CNT, 1.0f); - ThreadLocalRandom8 rand = ThreadLocalRandom8.current(); + ThreadLocalRandom rand = ThreadLocalRandom.current(); for (int i = 0; i < FILES_CNT; i++) { // Create empty file locally. http://git-wip-us.apache.org/repos/asf/ignite/blob/02739a57/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFutureListenPerformanceTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFutureListenPerformanceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFutureListenPerformanceTest.java index f2f5e02..8528a08 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFutureListenPerformanceTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFutureListenPerformanceTest.java @@ -22,11 +22,11 @@ import java.util.Random; import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import java.util.concurrent.atomic.LongAdder; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.lang.IgniteInClosure; import org.jsr166.ConcurrentLinkedDeque8; -import org.jsr166.LongAdder8; /** * @@ -40,7 +40,7 @@ public class GridFutureListenPerformanceTest { * @throws InterruptedException If failed. */ public static void main(String[] args) throws InterruptedException { - final LongAdder8 cnt = new LongAdder8(); + final LongAdder cnt = new LongAdder(); final ConcurrentLinkedDeque8<GridFutureAdapter<Object>> futs = new ConcurrentLinkedDeque8<>(); http://git-wip-us.apache.org/repos/asf/ignite/blob/02739a57/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemorySpaceSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemorySpaceSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemorySpaceSelfTest.java index 55398a8..a06d020 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemorySpaceSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemorySpaceSelfTest.java @@ -22,6 +22,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.UUID; import java.util.concurrent.Callable; +import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.atomic.AtomicReference; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteSystemProperties; @@ -29,7 +30,6 @@ import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.util.lang.GridAbsPredicate; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import org.jsr166.ThreadLocalRandom8; /** * @@ -82,7 +82,7 @@ public class IpcSharedMemorySpaceSelfTest extends GridCommonAbstractTest { for (; ; ) { int len = Math.min(DATA.length - bytesWritten, - ThreadLocalRandom8.current().nextInt(256) + 1); + ThreadLocalRandom.current().nextInt(256) + 1); space.write(DATA, bytesWritten, len, 0); @@ -125,7 +125,7 @@ public class IpcSharedMemorySpaceSelfTest extends GridCommonAbstractTest { for (; ; ) { int len = Math.min(DATA.length - bytesRead, - ThreadLocalRandom8.current().nextInt(32) + 1); + ThreadLocalRandom.current().nextInt(32) + 1); int len0 = space.read(buf, bytesRead, len, 0); http://git-wip-us.apache.org/repos/asf/ignite/blob/02739a57/modules/core/src/test/java/org/apache/ignite/jvmtest/BlockingQueueTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/jvmtest/BlockingQueueTest.java b/modules/core/src/test/java/org/apache/ignite/jvmtest/BlockingQueueTest.java index 137612d..99d0758 100644 --- a/modules/core/src/test/java/org/apache/ignite/jvmtest/BlockingQueueTest.java +++ b/modules/core/src/test/java/org/apache/ignite/jvmtest/BlockingQueueTest.java @@ -22,10 +22,10 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.Callable; import java.util.concurrent.LinkedBlockingDeque; import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.atomic.LongAdder; import org.apache.ignite.internal.util.GridTimer; import org.apache.ignite.internal.util.typedef.X; import org.apache.ignite.testframework.GridTestUtils; -import org.jsr166.LongAdder8; /** * Blocking queue performance benchmark. @@ -109,7 +109,7 @@ public class BlockingQueueTest { X.println(">>> Starting test for: " + testName); - final LongAdder8 adder = new LongAdder8(); + final LongAdder adder = new LongAdder(); GridTestUtils.runMultiThreaded(new Callable<Object>() { @Override public Object call() throws Exception { http://git-wip-us.apache.org/repos/asf/ignite/blob/02739a57/modules/core/src/test/java/org/apache/ignite/jvmtest/ConcurrentMapTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/jvmtest/ConcurrentMapTest.java b/modules/core/src/test/java/org/apache/ignite/jvmtest/ConcurrentMapTest.java index b32a60f..e9b3dd1 100644 --- a/modules/core/src/test/java/org/apache/ignite/jvmtest/ConcurrentMapTest.java +++ b/modules/core/src/test/java/org/apache/ignite/jvmtest/ConcurrentMapTest.java @@ -24,6 +24,7 @@ import java.util.Random; import java.util.concurrent.Callable; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import org.apache.ignite.internal.IgniteInternalFuture; @@ -31,7 +32,6 @@ import org.apache.ignite.internal.util.lang.IgnitePair; import org.apache.ignite.internal.util.typedef.X; import org.apache.ignite.testframework.GridTestUtils; import org.jsr166.ConcurrentHashMap8; -import org.jsr166.ThreadLocalRandom8; /** * @@ -155,7 +155,7 @@ public class ConcurrentMapTest { GridTestUtils.runMultiThreaded(new Callable<Object>() { @Override public Object call() throws Exception { - ThreadLocalRandom8 rnd = ThreadLocalRandom8.current(); + ThreadLocalRandom rnd = ThreadLocalRandom.current(); for (int i = 0; i < iterCnt; i++) { // Put random. http://git-wip-us.apache.org/repos/asf/ignite/blob/02739a57/modules/core/src/test/java/org/apache/ignite/lang/GridBasicPerformanceTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/lang/GridBasicPerformanceTest.java b/modules/core/src/test/java/org/apache/ignite/lang/GridBasicPerformanceTest.java index 1bbae51..a9a5600 100644 --- a/modules/core/src/test/java/org/apache/ignite/lang/GridBasicPerformanceTest.java +++ b/modules/core/src/test/java/org/apache/ignite/lang/GridBasicPerformanceTest.java @@ -30,6 +30,7 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.CountDownLatch; import java.util.concurrent.LinkedBlockingDeque; import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; @@ -49,7 +50,6 @@ import org.apache.ignite.internal.util.typedef.X; import org.apache.ignite.testframework.GridTestUtils; import org.jetbrains.annotations.Nullable; import org.jsr166.ConcurrentLinkedDeque8; -import org.jsr166.ThreadLocalRandom8; /** * Tests synchronization performance vs. lock. @@ -712,7 +712,7 @@ public class GridBasicPerformanceTest { int lim = 10000; for (int i = 0; i < arr.length; i++) - arr[i] = ThreadLocalRandom8.current().nextInt(lim); + arr[i] = ThreadLocalRandom.current().nextInt(lim); Arrays.sort(arr); @@ -720,9 +720,9 @@ public class GridBasicPerformanceTest { for (int i = 0; i < MAX; i++) { if (sort) - Arrays.binarySearch(arr, ThreadLocalRandom8.current().nextInt(lim)); + Arrays.binarySearch(arr, ThreadLocalRandom.current().nextInt(lim)); else - F.contains(arr, ThreadLocalRandom8.current().nextInt(lim)); + F.contains(arr, ThreadLocalRandom.current().nextInt(lim)); } long time = System.currentTimeMillis() - start; @@ -738,7 +738,7 @@ public class GridBasicPerformanceTest { int lim = 10000; for (int i = 0; i < arr.length; i++) - arr[i] = ThreadLocalRandom8.current().nextLong(lim); + arr[i] = ThreadLocalRandom.current().nextLong(lim); Arrays.sort(arr); @@ -746,9 +746,9 @@ public class GridBasicPerformanceTest { for (int i = 0; i < MAX; i++) { if (sort) - Arrays.binarySearch(arr, ThreadLocalRandom8.current().nextInt(lim)); + Arrays.binarySearch(arr, ThreadLocalRandom.current().nextInt(lim)); else - F.contains(arr, ThreadLocalRandom8.current().nextInt(lim)); + F.contains(arr, ThreadLocalRandom.current().nextInt(lim)); } long time = System.currentTimeMillis() - start; http://git-wip-us.apache.org/repos/asf/ignite/blob/02739a57/modules/core/src/test/java/org/apache/ignite/lang/GridFutureListenPerformanceTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/lang/GridFutureListenPerformanceTest.java b/modules/core/src/test/java/org/apache/ignite/lang/GridFutureListenPerformanceTest.java index 1faf1f3..d2f29b6 100644 --- a/modules/core/src/test/java/org/apache/ignite/lang/GridFutureListenPerformanceTest.java +++ b/modules/core/src/test/java/org/apache/ignite/lang/GridFutureListenPerformanceTest.java @@ -23,11 +23,11 @@ import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.LongAdder; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.util.future.GridFutureAdapter; import org.jsr166.ConcurrentLinkedDeque8; -import org.jsr166.LongAdder8; /** * @@ -41,7 +41,7 @@ public class GridFutureListenPerformanceTest { * @throws InterruptedException If failed. */ public static void main(String[] args) throws InterruptedException { - final LongAdder8 cnt = new LongAdder8(); + final LongAdder cnt = new LongAdder(); final ConcurrentLinkedDeque8<GridFutureAdapter<Object>> futs = new ConcurrentLinkedDeque8<>(); http://git-wip-us.apache.org/repos/asf/ignite/blob/02739a57/modules/core/src/test/java/org/apache/ignite/lang/utils/GridCircularBufferPerformanceTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/lang/utils/GridCircularBufferPerformanceTest.java b/modules/core/src/test/java/org/apache/ignite/lang/utils/GridCircularBufferPerformanceTest.java index 1c1207a..26b160a 100644 --- a/modules/core/src/test/java/org/apache/ignite/lang/utils/GridCircularBufferPerformanceTest.java +++ b/modules/core/src/test/java/org/apache/ignite/lang/utils/GridCircularBufferPerformanceTest.java @@ -21,11 +21,11 @@ import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; +import java.util.concurrent.atomic.LongAdder; import org.apache.ignite.internal.util.GridCircularBuffer; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.jsr166.ConcurrentLinkedDeque8; -import org.jsr166.LongAdder8; /** * @@ -38,7 +38,7 @@ public class GridCircularBufferPerformanceTest extends GridCommonAbstractTest { int size = 256 * 1024; final GridCircularBuffer<Integer> buf = new GridCircularBuffer<>(size); - final LongAdder8 cnt = new LongAdder8(); + final LongAdder cnt = new LongAdder(); final AtomicBoolean finished = new AtomicBoolean(); multithreadedAsync(new Callable<Object>() { @@ -76,7 +76,7 @@ public class GridCircularBufferPerformanceTest extends GridCommonAbstractTest { public void testDequeueThroughput() throws Exception { final ConcurrentLinkedDeque8<Integer> buf = new ConcurrentLinkedDeque8<>(); - final LongAdder8 cnt = new LongAdder8(); + final LongAdder cnt = new LongAdder(); final AtomicBoolean finished = new AtomicBoolean(); multithreadedAsync(new Callable<Object>() { @@ -120,7 +120,7 @@ public class GridCircularBufferPerformanceTest extends GridCommonAbstractTest { final int size = 256 * 1024; final ArrayBlockingQueue<Integer> buf = new ArrayBlockingQueue<>(size); - final LongAdder8 cnt = new LongAdder8(); + final LongAdder cnt = new LongAdder(); final AtomicBoolean finished = new AtomicBoolean(); multithreadedAsync(new Callable<Object>() { @@ -161,7 +161,7 @@ public class GridCircularBufferPerformanceTest extends GridCommonAbstractTest { final int size = 256 * 1024; final ArrayBlockingQueue<Integer> buf = new ArrayBlockingQueue<>(size); - final LongAdder8 cnt = new LongAdder8(); + final LongAdder cnt = new LongAdder(); final AtomicBoolean finished = new AtomicBoolean(); multithreadedAsync(new Callable<Object>() { http://git-wip-us.apache.org/repos/asf/ignite/blob/02739a57/modules/core/src/test/java/org/apache/ignite/lang/utils/GridConcurrentHashMapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/lang/utils/GridConcurrentHashMapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/lang/utils/GridConcurrentHashMapSelfTest.java index b09c7ce..dbf453d 100644 --- a/modules/core/src/test/java/org/apache/ignite/lang/utils/GridConcurrentHashMapSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/lang/utils/GridConcurrentHashMapSelfTest.java @@ -20,9 +20,9 @@ package org.apache.ignite.lang.utils; import java.util.Map; import java.util.concurrent.Callable; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ThreadLocalRandom; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.jsr166.ConcurrentHashMap8; -import org.jsr166.ThreadLocalRandom8; /** * Tests for {@link org.jsr166.ConcurrentHashMap8}. @@ -66,7 +66,7 @@ public class GridConcurrentHashMapSelfTest extends GridCommonAbstractTest { multithreaded(new Callable<Object>() { @Override public Object call() throws Exception { - ThreadLocalRandom8 rnd = ThreadLocalRandom8.current(); + ThreadLocalRandom rnd = ThreadLocalRandom.current(); for (int i = 0; i < iterCnt; i++) { // Put random. http://git-wip-us.apache.org/repos/asf/ignite/blob/02739a57/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestCacheStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestCacheStore.java b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestCacheStore.java index d0cacab..0f28055 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestCacheStore.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestCacheStore.java @@ -22,6 +22,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorCompletionService; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import java.util.concurrent.atomic.LongAdder; import javax.cache.integration.CacheLoaderException; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; @@ -30,7 +31,6 @@ import org.apache.ignite.cache.store.CacheStoreAdapter; import org.apache.ignite.lang.IgniteBiInClosure; import org.apache.ignite.resources.IgniteInstanceResource; import org.apache.ignite.resources.LoggerResource; -import org.jsr166.LongAdder8; /** * Accenture cache store. @@ -67,7 +67,7 @@ public class GridTestCacheStore extends CacheStoreAdapter<GridTestKey, Long> { assert cache != null; - final LongAdder8 adder = new LongAdder8(); + final LongAdder adder = new LongAdder(); for (int i = 0; i < numThreads; i++) { final int threadId = i; http://git-wip-us.apache.org/repos/asf/ignite/blob/02739a57/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark.java b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark.java index 5671158..ef3fc9f 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark.java @@ -26,6 +26,8 @@ import java.util.Random; import java.util.UUID; import java.util.concurrent.CountDownLatch; import java.util.concurrent.Semaphore; +import java.util.concurrent.ThreadLocalRandom; +import java.util.concurrent.atomic.LongAdder; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.internal.IgniteInterruptedCheckedException; @@ -42,8 +44,6 @@ import org.apache.ignite.loadtests.util.GridCumulativeAverage; import org.apache.ignite.testframework.GridLoadTestUtils; import org.jetbrains.annotations.Nullable; import org.jsr166.ConcurrentHashMap8; -import org.jsr166.LongAdder8; -import org.jsr166.ThreadLocalRandom8; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.apache.ignite.internal.managers.communication.GridIoPolicy.PUBLIC_POOL; @@ -75,7 +75,7 @@ public class GridIoManagerBenchmark { public static final int TEST_TOPIC = 1; /** */ - private static final LongAdder8 msgCntr = new LongAdder8(); + private static final LongAdder msgCntr = new LongAdder(); /** */ private static final Map<IgniteUuid, CountDownLatch> latches = new ConcurrentHashMap8<>(); @@ -93,7 +93,7 @@ public class GridIoManagerBenchmark { * */ static { - ThreadLocalRandom8 rnd = ThreadLocalRandom8.current(); + ThreadLocalRandom rnd = ThreadLocalRandom.current(); arrs = new byte[64][]; @@ -281,7 +281,7 @@ public class GridIoManagerBenchmark { GridIoManager io = g.context().io(); - Random rnd = ThreadLocalRandom8.current(); + Random rnd = ThreadLocalRandom.current(); IgniteUuid msgId = IgniteUuid.randomUuid(); http://git-wip-us.apache.org/repos/asf/ignite/blob/02739a57/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java index 7b1d972..8adb2b3 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java @@ -26,6 +26,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.Semaphore; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; +import java.util.concurrent.atomic.LongAdder; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.configuration.IgniteConfiguration; @@ -46,7 +47,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.jsr166.ConcurrentHashMap8; -import org.jsr166.LongAdder8; import static org.apache.ignite.internal.managers.communication.GridIoPolicy.PUBLIC_POOL; @@ -123,7 +123,7 @@ public class GridIoManagerBenchmark0 extends GridCommonAbstractTest { info("Messages: " + CONCUR_MSGS); final Semaphore sem = new Semaphore(CONCUR_MSGS); - final LongAdder8 msgCntr = new LongAdder8(); + final LongAdder msgCntr = new LongAdder(); final String topic = "test-topic"; @@ -215,7 +215,7 @@ public class GridIoManagerBenchmark0 extends GridCommonAbstractTest { final GridIoManager snd = sndKernal.context().io(); final GridIoManager rcv = rcvKernal.context().io(); - final LongAdder8 msgCntr = new LongAdder8(); + final LongAdder msgCntr = new LongAdder(); final Integer topic = 1; @@ -315,7 +315,7 @@ public class GridIoManagerBenchmark0 extends GridCommonAbstractTest { info("Messages: " + CONCUR_MSGS); final Semaphore sem = new Semaphore(CONCUR_MSGS); - final LongAdder8 msgCntr = new LongAdder8(); + final LongAdder msgCntr = new LongAdder(); final String topic = "test-topic"; http://git-wip-us.apache.org/repos/asf/ignite/blob/02739a57/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java index 74150d7..f32b836 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java @@ -19,6 +19,7 @@ package org.apache.ignite.loadtests.continuous; import java.util.UUID; import java.util.concurrent.Callable; +import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; import javax.cache.event.CacheEntryEvent; @@ -41,7 +42,6 @@ import org.apache.ignite.internal.util.typedef.PX2; import org.apache.ignite.internal.util.typedef.X; import org.apache.ignite.internal.util.typedef.internal.U; import org.jetbrains.annotations.Nullable; -import org.jsr166.ThreadLocalRandom8; import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_PUT; import static org.apache.ignite.loadtests.util.GridLoadTestArgs.CACHE_NAME; @@ -209,7 +209,7 @@ public class GridContinuousOperationsLoadTest { IgniteInternalFuture<Long> genFut = runMultiThreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { byte[] val = new byte[valSize]; - ThreadLocalRandom8 rnd = ThreadLocalRandom8.current(); + ThreadLocalRandom rnd = ThreadLocalRandom.current(); while (!stop.get() && !Thread.currentThread().isInterrupted()) { Integer key = rnd.nextInt(keyRange); http://git-wip-us.apache.org/repos/asf/ignite/blob/02739a57/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridBoundedConcurrentLinkedHashSetLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridBoundedConcurrentLinkedHashSetLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridBoundedConcurrentLinkedHashSetLoadTest.java index 3a35e74..211857b 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridBoundedConcurrentLinkedHashSetLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridBoundedConcurrentLinkedHashSetLoadTest.java @@ -24,11 +24,11 @@ import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.LongAdder; import org.apache.ignite.internal.util.GridBoundedConcurrentLinkedHashSet; import org.apache.ignite.internal.util.typedef.X; import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.loadtests.util.GridCumulativeAverage; -import org.jsr166.LongAdder8; import static org.jsr166.ConcurrentLinkedHashMap.QueuePolicy; import static org.jsr166.ConcurrentLinkedHashMap.QueuePolicy.SINGLE_Q; @@ -57,7 +57,7 @@ public class GridBoundedConcurrentLinkedHashSetLoadTest { X.println("Set: " + set); - final LongAdder8 execCnt = new LongAdder8(); + final LongAdder execCnt = new LongAdder(); final AtomicBoolean finish = new AtomicBoolean(); http://git-wip-us.apache.org/repos/asf/ignite/blob/02739a57/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionLoadTestClient.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionLoadTestClient.java b/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionLoadTestClient.java index 993a622..c14bc53 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionLoadTestClient.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionLoadTestClient.java @@ -24,6 +24,7 @@ import java.util.Date; import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import java.util.concurrent.atomic.LongAdder; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCompute; import org.apache.ignite.IgniteException; @@ -34,7 +35,6 @@ import org.apache.ignite.loadtests.util.GridCumulativeAverage; import org.apache.ignite.testframework.GridFileLock; import org.apache.ignite.testframework.GridLoadTestUtils; import org.jetbrains.annotations.Nullable; -import org.jsr166.LongAdder8; /** * @@ -50,7 +50,7 @@ public class GridJobExecutionLoadTestClient implements Callable<Object> { private static Ignite g; /** Transaction count. */ - private static LongAdder8 txCnt = new LongAdder8(); + private static LongAdder txCnt = new LongAdder(); /** Finish flag. */ private static volatile boolean finish; http://git-wip-us.apache.org/repos/asf/ignite/blob/02739a57/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionLoadTestClientSemaphore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionLoadTestClientSemaphore.java b/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionLoadTestClientSemaphore.java index 53c6f50..4168357 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionLoadTestClientSemaphore.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionLoadTestClientSemaphore.java @@ -25,6 +25,7 @@ import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Semaphore; +import java.util.concurrent.atomic.LongAdder; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCompute; import org.apache.ignite.IgniteException; @@ -39,7 +40,6 @@ import org.apache.ignite.loadtests.util.GridCumulativeAverage; import org.apache.ignite.testframework.GridFileLock; import org.apache.ignite.testframework.GridLoadTestUtils; import org.jetbrains.annotations.Nullable; -import org.jsr166.LongAdder8; /** * @@ -55,7 +55,7 @@ public class GridJobExecutionLoadTestClientSemaphore implements Callable<Object> private static Ignite g; /** Transaction count. */ - private static LongAdder8 txCnt = new LongAdder8(); + private static LongAdder txCnt = new LongAdder(); /** Finish flag. */ private static volatile boolean finish; http://git-wip-us.apache.org/repos/asf/ignite/blob/02739a57/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionSingleNodeSemaphoreLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionSingleNodeSemaphoreLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionSingleNodeSemaphoreLoadTest.java index 2f94b48..bceb217 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionSingleNodeSemaphoreLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/job/GridJobExecutionSingleNodeSemaphoreLoadTest.java @@ -23,6 +23,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.Callable; import java.util.concurrent.Semaphore; +import java.util.concurrent.atomic.LongAdder; import org.apache.ignite.Ignite; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.compute.ComputeJob; @@ -43,7 +44,6 @@ import org.apache.ignite.testframework.GridFileLock; import org.apache.ignite.testframework.GridLoadTestUtils; import org.apache.ignite.testframework.GridTestUtils; import org.jetbrains.annotations.Nullable; -import org.jsr166.LongAdder8; import static org.apache.ignite.compute.ComputeJobResultPolicy.REDUCE; @@ -84,7 +84,7 @@ public class GridJobExecutionSingleNodeSemaphoreLoadTest { final int duration = args.length > 2 ? Integer.parseInt(args[2]) : 0; final String outputFileName = args.length > 3 ? args[3] : null; - final LongAdder8 execCnt = new LongAdder8(); + final LongAdder execCnt = new LongAdder(); try { final Ignite g = G.start("modules/tests/config/grid-job-load.xml"); @@ -173,7 +173,7 @@ public class GridJobExecutionSingleNodeSemaphoreLoadTest { * @param iterCntr Iteration counter. */ private static void runTest(final Ignite g, int threadCnt, int taskCnt, long dur, - final LongAdder8 iterCntr) { + final LongAdder iterCntr) { final Semaphore sem = new Semaphore(taskCnt); final IgniteInClosure<IgniteFuture> lsnr = new CI1<IgniteFuture>() { http://git-wip-us.apache.org/repos/asf/ignite/blob/02739a57/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingSendAsyncTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingSendAsyncTest.java b/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingSendAsyncTest.java index 03e7210..d51a5dd 100644 --- a/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingSendAsyncTest.java +++ b/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingSendAsyncTest.java @@ -25,6 +25,7 @@ import java.util.Map; import java.util.UUID; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.atomic.AtomicReference; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteMessaging; @@ -35,7 +36,6 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import org.jsr166.ThreadLocalRandom8; import org.junit.Assert; /** @@ -468,7 +468,7 @@ public class IgniteMessagingSendAsyncTest extends GridCommonAbstractTest impleme final List<String> msgs = Lists.newArrayList(); for (int i = 0; i < 1000; i++) - msgs.add(String.valueOf(ThreadLocalRandom8.current().nextInt())); + msgs.add(String.valueOf(ThreadLocalRandom.current().nextInt())); return msgs; } http://git-wip-us.apache.org/repos/asf/ignite/blob/02739a57/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfs20FileSystemAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfs20FileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfs20FileSystemAbstractSelfTest.java index 3b0553f..70434e3 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfs20FileSystemAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfs20FileSystemAbstractSelfTest.java @@ -33,6 +33,7 @@ import java.util.Map; import java.util.concurrent.Callable; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.CyclicBarrier; +import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import org.apache.hadoop.conf.Configuration; @@ -79,7 +80,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; import org.jetbrains.annotations.Nullable; -import org.jsr166.ThreadLocalRandom8; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -1584,7 +1584,7 @@ public abstract class HadoopIgfs20FileSystemAbstractSelfTest extends IgfsCommonA FSDataInputStream is = null; try { - int pos = ThreadLocalRandom8.current().nextInt(2048); + int pos = ThreadLocalRandom.current().nextInt(2048); try { is = fs.open(file); http://git-wip-us.apache.org/repos/asf/ignite/blob/02739a57/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemAbstractSelfTest.java index 6434182..b5efffa 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemAbstractSelfTest.java @@ -38,6 +38,7 @@ import java.util.UUID; import java.util.concurrent.Callable; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.CyclicBarrier; +import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; @@ -84,7 +85,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; import org.jetbrains.annotations.Nullable; -import org.jsr166.ThreadLocalRandom8; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -1855,7 +1855,7 @@ public abstract class IgniteHadoopFileSystemAbstractSelfTest extends IgfsCommonA FSDataInputStream is = null; try { - int pos = ThreadLocalRandom8.current().nextInt(2048); + int pos = ThreadLocalRandom.current().nextInt(2048); try { is = fs.open(file); http://git-wip-us.apache.org/repos/asf/ignite/blob/02739a57/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/taskexecutor/HadoopExecutorServiceTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/taskexecutor/HadoopExecutorServiceTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/taskexecutor/HadoopExecutorServiceTest.java index 845afae..3486a14 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/taskexecutor/HadoopExecutorServiceTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/taskexecutor/HadoopExecutorServiceTest.java @@ -19,11 +19,11 @@ package org.apache.ignite.internal.processors.hadoop.impl.taskexecutor; import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.LongAdder; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.processors.hadoop.taskexecutor.HadoopExecutorService; import org.apache.ignite.internal.util.typedef.X; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import org.jsr166.LongAdder8; /** * @@ -39,7 +39,7 @@ public class HadoopExecutorServiceTest extends GridCommonAbstractTest { final int loops = 5000; int threads = 17; - final LongAdder8 sum = new LongAdder8(); + final LongAdder sum = new LongAdder(); multithreaded(new Callable<Object>() { @Override public Object call() throws Exception { @@ -78,7 +78,7 @@ public class HadoopExecutorServiceTest extends GridCommonAbstractTest { for (int i = 0; i < 5; i++) { final HadoopExecutorService exec = new HadoopExecutorService(log, "_GRID_NAME_", 10, 5); - final LongAdder8 sum = new LongAdder8(); + final LongAdder sum = new LongAdder(); final AtomicBoolean finish = new AtomicBoolean(); http://git-wip-us.apache.org/repos/asf/ignite/blob/02739a57/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java index c4a8c08..6fa561f 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java @@ -22,6 +22,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.atomic.LongAdder; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; @@ -54,7 +55,6 @@ import org.h2.table.TableType; import org.h2.value.DataType; import org.jetbrains.annotations.Nullable; import org.jsr166.ConcurrentHashMap8; -import org.jsr166.LongAdder8; import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.internal.processors.query.h2.opt.GridH2KeyValueRowOnheap.DEFAULT_COLUMNS_COUNT; @@ -98,7 +98,7 @@ public class GridH2Table extends TableBase { private IndexColumn affKeyCol; /** */ - private final LongAdder8 size = new LongAdder8(); + private final LongAdder size = new LongAdder(); /** */ private final H2RowFactory rowFactory; http://git-wip-us.apache.org/repos/asf/ignite/blob/02739a57/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/MapQueryLazyWorker.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/MapQueryLazyWorker.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/MapQueryLazyWorker.java index 01dd8ba..50e2af5 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/MapQueryLazyWorker.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/MapQueryLazyWorker.java @@ -17,6 +17,10 @@ package org.apache.ignite.internal.processors.query.h2.twostep; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.LinkedBlockingDeque; +import java.util.concurrent.atomic.LongAdder; import org.apache.ignite.IgniteException; import org.apache.ignite.IgniteLogger; import org.apache.ignite.internal.IgniteInterruptedCheckedException; @@ -24,11 +28,6 @@ import org.apache.ignite.internal.processors.query.h2.opt.GridH2QueryContext; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.internal.util.worker.GridWorker; import org.jetbrains.annotations.Nullable; -import org.jsr166.LongAdder8; - -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.LinkedBlockingDeque; /** * Worker for lazy query execution. @@ -38,7 +37,7 @@ public class MapQueryLazyWorker extends GridWorker { private static final ThreadLocal<MapQueryLazyWorker> LAZY_WORKER = new ThreadLocal<>(); /** Active lazy worker count (for testing purposes). */ - private static final LongAdder8 ACTIVE_CNT = new LongAdder8(); + private static final LongAdder ACTIVE_CNT = new LongAdder(); /** Task to be executed. */ private final BlockingQueue<Runnable> tasks = new LinkedBlockingDeque<>(); http://git-wip-us.apache.org/repos/asf/ignite/blob/02739a57/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java index cc1a484..fb20b41 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java @@ -23,6 +23,7 @@ import java.io.ObjectOutput; import java.util.Random; import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.LongAdder; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; import org.apache.ignite.cache.CacheAtomicityMode; @@ -39,7 +40,6 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import org.jsr166.LongAdder8; /** * @@ -112,7 +112,7 @@ public class GridCacheQuerySimpleBenchmark extends GridCommonAbstractTest { final AtomicBoolean end = new AtomicBoolean(); - final LongAdder8 puts = new LongAdder8(); + final LongAdder puts = new LongAdder(); IgniteInternalFuture<?> fut0 = multithreadedAsync(new Callable<Void>() { @Override public Void call() throws Exception { @@ -130,7 +130,7 @@ public class GridCacheQuerySimpleBenchmark extends GridCommonAbstractTest { } }, 10); - final LongAdder8 qrys = new LongAdder8(); + final LongAdder qrys = new LongAdder(); IgniteInternalFuture<?> fut1 = multithreadedAsync(new Callable<Void>() { @Override public Void call() throws Exception { http://git-wip-us.apache.org/repos/asf/ignite/blob/02739a57/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedPartitionQueryAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedPartitionQueryAbstractSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedPartitionQueryAbstractSelfTest.java index 079dcdf..2a54821 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedPartitionQueryAbstractSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedPartitionQueryAbstractSelfTest.java @@ -27,6 +27,7 @@ import java.util.Map; import java.util.NavigableMap; import java.util.TreeMap; import java.util.UUID; +import java.util.concurrent.ThreadLocalRandom; import javax.cache.Cache; import javax.cache.CacheException; import org.apache.ignite.Ignite; @@ -55,7 +56,6 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.util.AttributeNodeFilter; -import org.jsr166.ThreadLocalRandom8; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheRebalanceMode.SYNC; @@ -350,7 +350,7 @@ public abstract class IgniteCacheDistributedPartitionQueryAbstractSelfTest exten DepositKey dk = new DepositKey(depositId++, new ClientKey(clientId, regionId)); Deposit depo = new Deposit(); - depo.amount = ThreadLocalRandom8.current().nextLong(1_000_001); + depo.amount = ThreadLocalRandom.current().nextLong(1_000_001); depStr.addData(dk, depo); } http://git-wip-us.apache.org/repos/asf/ignite/blob/02739a57/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSkipReducerOnUpdateDmlSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSkipReducerOnUpdateDmlSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSkipReducerOnUpdateDmlSelfTest.java index a2a6bf8..25a3dfb 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSkipReducerOnUpdateDmlSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSkipReducerOnUpdateDmlSelfTest.java @@ -25,6 +25,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ThreadLocalRandom; import javax.cache.CacheException; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; @@ -53,7 +54,6 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import org.jsr166.ThreadLocalRandom8; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.apache.ignite.events.EventType.EVT_CACHE_QUERY_EXECUTED; @@ -552,7 +552,7 @@ public class IgniteSqlSkipReducerOnUpdateDmlSelfTest extends GridCommonAbstractT for (String s1 : a) { for (String s2 : b) { if (!s1.equals(s2)) { - String end = ends[ThreadLocalRandom8.current().nextInt(ends.length)]; + String end = ends[ThreadLocalRandom.current().nextInt(ends.length)]; res.add(s1 + " " + s2 + end); } http://git-wip-us.apache.org/repos/asf/ignite/blob/02739a57/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IntMaxValueEntriesTest.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IntMaxValueEntriesTest.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IntMaxValueEntriesTest.java index 06ca3b7..134da4f 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IntMaxValueEntriesTest.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IntMaxValueEntriesTest.java @@ -21,10 +21,10 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.concurrent.ThreadLocalRandom; +import java.util.concurrent.atomic.LongAdder; import javax.cache.Cache; import org.apache.ignite.IgniteCache; import org.apache.ignite.IgniteDataStreamer; -import org.jsr166.LongAdder8; import static org.yardstickframework.BenchmarkUtils.println; @@ -55,7 +55,7 @@ public class IntMaxValueEntriesTest extends IgniteCacheAbstractBenchmark { final List<Thread> threads = new ArrayList<>(THREADS); - final LongAdder8 addedCnt = new LongAdder8(); + final LongAdder addedCnt = new LongAdder(); int delta = (int)((KEYS_HI + Math.abs(KEYS_LO)) / THREADS);
