http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java index bcd2bde..4a7d5d5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java @@ -97,7 +97,6 @@ import org.apache.ignite.testframework.junits.GridTestKernalContext; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; import static java.nio.charset.StandardCharsets.UTF_8; import static org.apache.ignite.internal.binary.streams.BinaryMemoryAllocator.INSTANCE; @@ -498,7 +497,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest { testMap(new HashMap<Integer, String>()); testMap(new LinkedHashMap<Integer, String>()); testMap(new TreeMap<Integer, String>()); - testMap(new ConcurrentHashMap8<Integer, String>()); + testMap(new ConcurrentHashMap<Integer, String>()); testMap(new ConcurrentHashMap<Integer, String>()); }
http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java index ce3f6a6..9ef688a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal.managers.deployment; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; import org.apache.ignite.IgniteCache; import org.apache.ignite.IgniteException; @@ -36,7 +37,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.ConcurrentHashMap8; import static org.apache.ignite.cache.CacheMode.REPLICATED; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; @@ -55,7 +55,7 @@ public class GridDeploymentMessageCountSelfTest extends GridCommonAbstractTest { private static final String TEST_VALUE = "org.apache.ignite.tests.p2p.CacheDeploymentTestValue"; /** SPIs. */ - private Map<String, MessageCountingCommunicationSpi> commSpis = new ConcurrentHashMap8<>(); + private Map<String, MessageCountingCommunicationSpi> commSpis = new ConcurrentHashMap<>(); /** {@inheritDoc} */ @Override protected void afterTestsStopped() throws Exception { http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectStreamSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectStreamSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectStreamSelfTest.java index d018714..ed0862b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectStreamSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectStreamSelfTest.java @@ -67,7 +67,7 @@ import org.apache.ignite.marshaller.MarshallerExclusions; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; +import java.util.concurrent.ConcurrentHashMap; import static org.junit.Assert.assertArrayEquals; @@ -79,7 +79,7 @@ public class OptimizedObjectStreamSelfTest extends GridCommonAbstractTest { private static final MarshallerContext CTX = new MarshallerContextTestImpl(); /** */ - private ConcurrentMap<Class, OptimizedClassDescriptor> clsMap = new ConcurrentHashMap8<>(); + private ConcurrentMap<Class, OptimizedClassDescriptor> clsMap = new ConcurrentHashMap<>(); /** * @throws Exception If failed. http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNearReaderUpdateTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNearReaderUpdateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNearReaderUpdateTest.java index c00fe16..1a02184 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNearReaderUpdateTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheNearReaderUpdateTest.java @@ -21,6 +21,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.concurrent.Callable; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CyclicBarrier; import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.atomic.AtomicInteger; @@ -47,7 +48,6 @@ import org.apache.ignite.transactions.Transaction; import org.apache.ignite.transactions.TransactionConcurrency; import org.apache.ignite.transactions.TransactionIsolation; import org.apache.ignite.transactions.TransactionOptimisticException; -import org.jsr166.ConcurrentHashMap8; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -74,7 +74,7 @@ public class CacheNearReaderUpdateTest extends GridCommonAbstractTest { private static final int CLIENTS = 3; /** */ - private static Map<Integer, Integer> storeMap = new ConcurrentHashMap8<>(); + private static Map<Integer, Integer> storeMap = new ConcurrentHashMap<>(); /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java index 6ee4c99..9ca73d9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java @@ -29,6 +29,7 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; import java.util.concurrent.Callable; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentSkipListSet; import java.util.concurrent.CountDownLatch; import java.util.concurrent.CyclicBarrier; @@ -75,7 +76,6 @@ import org.apache.ignite.transactions.Transaction; import org.apache.ignite.transactions.TransactionConcurrency; import org.apache.ignite.transactions.TransactionIsolation; import org.apache.ignite.transactions.TransactionOptimisticException; -import org.jsr166.ConcurrentHashMap8; import static java.util.concurrent.TimeUnit.SECONDS; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; @@ -100,7 +100,7 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest { private static final boolean FAST = false; /** */ - private static Map<Integer, Integer> storeMap = new ConcurrentHashMap8<>(); + private static Map<Integer, Integer> storeMap = new ConcurrentHashMap<>(); /** */ private static final int SRVS = 4; http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java index 11f19b2..7f373b4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java @@ -54,7 +54,7 @@ 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.ConcurrentHashMap8; +import java.util.concurrent.ConcurrentHashMap; import static org.apache.ignite.IgniteSystemProperties.IGNITE_ATOMIC_CACHE_DELETE_HISTORY_SIZE; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -218,7 +218,7 @@ public abstract class GridCacheAbstractRemoveFailureTest extends GridCommonAbstr final AtomicLong errCntr = new AtomicLong(); // Expected values in cache. - final Map<Integer, GridTuple<Integer>> expVals = new ConcurrentHashMap8<>(); + final Map<Integer, GridTuple<Integer>> expVals = new ConcurrentHashMap<>(); final AtomicReference<CyclicBarrier> cmp = new AtomicReference<>(); http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java index fdca159..432011e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java @@ -44,7 +44,7 @@ import org.apache.ignite.transactions.Transaction; import org.apache.ignite.transactions.TransactionConcurrency; import org.apache.ignite.transactions.TransactionIsolation; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; +import java.util.concurrent.ConcurrentHashMap; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheMode.LOCAL; @@ -1511,19 +1511,19 @@ public abstract class GridCacheInterceptorAbstractSelfTest extends GridCacheAbst */ private static class Interceptor implements CacheInterceptor { /** */ - private final Map<Object, Object> getMap = new ConcurrentHashMap8<>(); + private final Map<Object, Object> getMap = new ConcurrentHashMap<>(); /** */ - private final Map<Object, Object> afterPutMap = new ConcurrentHashMap8<>(); + private final Map<Object, Object> afterPutMap = new ConcurrentHashMap<>(); /** */ - private final Map<Object, IgniteBiTuple> beforePutMap = new ConcurrentHashMap8<>(); + private final Map<Object, IgniteBiTuple> beforePutMap = new ConcurrentHashMap<>(); /** */ - private final Map<Object, Object> beforeRmvMap = new ConcurrentHashMap8<>(); + private final Map<Object, Object> beforeRmvMap = new ConcurrentHashMap<>(); /** */ - private final Map<Object, Object> afterRmvMap = new ConcurrentHashMap8<>(); + private final Map<Object, Object> afterRmvMap = new ConcurrentHashMap<>(); /** */ private final AtomicInteger invokeCnt = new AtomicInteger(); http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOrderedPreloadingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOrderedPreloadingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOrderedPreloadingSelfTest.java index bc4f2cb..34b5876 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOrderedPreloadingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOrderedPreloadingSelfTest.java @@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache; import java.util.HashMap; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; import org.apache.ignite.cache.CacheMode; @@ -34,7 +35,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.ConcurrentHashMap8; import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.cache.CacheMode.REPLICATED; @@ -66,16 +66,16 @@ public class GridCacheOrderedPreloadingSelfTest extends GridCommonAbstractTest { private CacheMode secondCacheMode; /** Caches rebalance finish times. */ - private ConcurrentHashMap8<Integer, ConcurrentHashMap8<String, Long>> times; + private ConcurrentHashMap<Integer, ConcurrentHashMap<String, Long>> times; /** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { super.beforeTestsStarted(); - times = new ConcurrentHashMap8<>(); + times = new ConcurrentHashMap<>(); for (int i = 0; i < GRID_CNT; i++) - times.put(i, new ConcurrentHashMap8<String, Long>()); + times.put(i, new ConcurrentHashMap<String, Long>()); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManagerDeserializationTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManagerDeserializationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManagerDeserializationTest.java index 7a21714..a1623d2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManagerDeserializationTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManagerDeserializationTest.java @@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache; import java.io.Serializable; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import javax.cache.Cache; import javax.cache.integration.CacheLoaderException; import javax.cache.integration.CacheWriterException; @@ -42,7 +43,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.ConcurrentHashMap8; import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.cache.CacheRebalanceMode.SYNC; @@ -295,7 +295,7 @@ public class GridCacheStoreManagerDeserializationTest extends GridCommonAbstract @CacheLocalStore protected static class GridCacheLocalTestStore<K, V> extends CacheStoreAdapter<K, V> { /** */ - public final Map<K, V> map = new ConcurrentHashMap8<>(); + public final Map<K, V> map = new ConcurrentHashMap<>(); /** {@inheritDoc} */ @Override public V load(final K key) throws CacheLoaderException { http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java index 34a811b..409c0af 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java @@ -38,10 +38,8 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.spi.eventstorage.memory.MemoryEventStorageSpi; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import org.jsr166.ConcurrentHashMap8; +import java.util.concurrent.ConcurrentHashMap; -import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; -import static org.apache.ignite.cache.CacheMode.LOCAL; import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; @@ -53,7 +51,7 @@ public abstract class IgniteCacheAbstractTest extends GridCommonAbstractTest { private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); /** */ - public static final Map<Object, Object> storeMap = new ConcurrentHashMap8<>(); + public static final Map<Object, Object> storeMap = new ConcurrentHashMap<>(); /** * @return Grids count to start. http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheReadThroughStoreCallTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheReadThroughStoreCallTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheReadThroughStoreCallTest.java index 381a044..423c4a1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheReadThroughStoreCallTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheReadThroughStoreCallTest.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal.processors.cache; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; import javax.cache.Cache; import javax.cache.configuration.Factory; @@ -43,7 +44,6 @@ import org.apache.ignite.transactions.Transaction; import org.apache.ignite.transactions.TransactionConcurrency; import org.apache.ignite.transactions.TransactionIsolation; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; @@ -59,7 +59,7 @@ public class IgniteCacheReadThroughStoreCallTest extends GridCommonAbstractTest private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** */ - private static final Map<Object, Object> storeMap = new ConcurrentHashMap8<>(); + private static final Map<Object, Object> storeMap = new ConcurrentHashMap<>(); /** */ protected boolean client; http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/MapCacheStoreStrategy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/MapCacheStoreStrategy.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/MapCacheStoreStrategy.java index 800d781..3de3d7a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/MapCacheStoreStrategy.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/MapCacheStoreStrategy.java @@ -26,7 +26,7 @@ import org.apache.ignite.cache.store.CacheStore; import org.apache.ignite.cache.store.CacheStoreAdapter; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.lang.IgniteBiInClosure; -import org.jsr166.ConcurrentHashMap8; +import java.util.concurrent.ConcurrentHashMap; /** * {@link TestCacheStoreStrategy} implemented as a wrapper around {@link #map} @@ -42,7 +42,7 @@ public class MapCacheStoreStrategy implements TestCacheStoreStrategy { private final static AtomicInteger reads = new AtomicInteger(); /** Store map. */ - private final static Map<Object, Object> map = new ConcurrentHashMap8<>(); + private final static Map<Object, Object> map = new ConcurrentHashMap<>(); /** {@inheritDoc} */ @Override public int getReads() { http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreAbstractSelfTest.java index b505f38..f1ca871 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreAbstractSelfTest.java @@ -36,7 +36,7 @@ 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.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; +import java.util.concurrent.ConcurrentHashMap; /** * Tests for cache store with binary. @@ -283,7 +283,7 @@ public abstract class GridCacheBinaryStoreAbstractSelfTest extends GridCommonAbs */ private static class TestStore extends CacheStoreAdapter<Object, Object> { /** */ - private final Map<Object, Object> map = new ConcurrentHashMap8<>(); + private final Map<Object, Object> map = new ConcurrentHashMap<>(); /** {@inheritDoc} */ @Nullable @Override public Object load(Object key) { http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java index 87e121e..2b7f2a8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java @@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.cache.distributed; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import javax.cache.integration.CompletionListenerFuture; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; @@ -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.ConcurrentHashMap8; import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; @@ -58,7 +58,7 @@ public abstract class GridCachePartitionedReloadAllAbstractSelfTest extends Grid private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); /** Map where dummy cache store values are stored. */ - private final Map<Integer, String> map = new ConcurrentHashMap8<>(); + private final Map<Integer, String> map = new ConcurrentHashMap<>(); /** Collection of caches, one per grid node. */ private List<IgniteCache<Integer, String>> caches; http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGlobalLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGlobalLoadTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGlobalLoadTest.java index 82823a9..6024030 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGlobalLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGlobalLoadTest.java @@ -17,6 +17,7 @@ package org.apache.ignite.internal.processors.cache.distributed.dht; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import javax.cache.Cache; import javax.cache.configuration.Factory; @@ -32,7 +33,6 @@ import org.apache.ignite.lang.IgniteBiInClosure; import org.apache.ignite.lang.IgniteBiPredicate; import org.apache.ignite.resources.IgniteInstanceResource; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; import org.junit.Assert; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; @@ -102,7 +102,7 @@ public class GridCacheGlobalLoadTest extends IgniteCacheAbstractTest { assertTrue(asyncCache.isAsync()); - map = new ConcurrentHashMap8<>(); + map = new ConcurrentHashMap<>(); if (async) { if (oldAsyncApi) { @@ -129,7 +129,7 @@ public class GridCacheGlobalLoadTest extends IgniteCacheAbstractTest { assertEquals(cache.get(2), (Integer)2); assertEquals(cache.get(3), (Integer)3); - map = new ConcurrentHashMap8<>(); + map = new ConcurrentHashMap<>(); if (async) { asyncCache.loadCache(new IgniteBiPredicate<Integer, Integer>() { http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRabalancingDelayedPartitionMapExchangeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRabalancingDelayedPartitionMapExchangeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRabalancingDelayedPartitionMapExchangeSelfTest.java index f307b6a..96127aa 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRabalancingDelayedPartitionMapExchangeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRabalancingDelayedPartitionMapExchangeSelfTest.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal.processors.cache.distributed.rebalancing; import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; import org.apache.ignite.IgniteException; import org.apache.ignite.cache.CacheMode; @@ -39,7 +40,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.ConcurrentHashMap8; /** * @@ -50,7 +50,7 @@ public class GridCacheRabalancingDelayedPartitionMapExchangeSelfTest extends Gri /** Map of destination node ID to runnable with logic for real message sending. * To apply real message sending use run method */ - private final ConcurrentHashMap8<UUID, Runnable> rs = new ConcurrentHashMap8<>(); + private final ConcurrentHashMap<UUID, Runnable> rs = new ConcurrentHashMap<>(); /** * Flag to redirect {@link GridDhtPartitionsFullMessage}s from real communication channel to {@link #rs} map. http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheLoadAllAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheLoadAllAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheLoadAllAbstractTest.java index 2e9753f..6b4f976 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheLoadAllAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheLoadAllAbstractTest.java @@ -34,7 +34,7 @@ import org.apache.ignite.cache.affinity.Affinity; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.internal.processors.cache.IgniteCacheAbstractTest; -import org.jsr166.ConcurrentHashMap8; +import java.util.concurrent.ConcurrentHashMap; /** * Test for {@link Cache#loadAll(Set, boolean, CompletionListener)}. @@ -44,7 +44,7 @@ public abstract class IgniteCacheLoadAllAbstractTest extends IgniteCacheAbstract private volatile boolean writeThrough = true; /** */ - private static ConcurrentHashMap8<Object, Object> storeMap; + private static ConcurrentHashMap<Object, Object> storeMap; /** {@inheritDoc} */ @SuppressWarnings("unchecked") @@ -64,7 +64,7 @@ public abstract class IgniteCacheLoadAllAbstractTest extends IgniteCacheAbstract @Override protected void beforeTest() throws Exception { super.beforeTest(); - storeMap = new ConcurrentHashMap8<>(); + storeMap = new ConcurrentHashMap<>(); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheLoaderWriterAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheLoaderWriterAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheLoaderWriterAbstractTest.java index dd6b268..5cdac5b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheLoaderWriterAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheLoaderWriterAbstractTest.java @@ -23,6 +23,7 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Map; import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; import javax.cache.Cache; import javax.cache.configuration.Factory; @@ -37,7 +38,6 @@ import org.apache.ignite.IgniteCache; import org.apache.ignite.internal.processors.cache.IgniteCacheAbstractTest; import org.apache.ignite.lifecycle.LifecycleAware; import org.apache.ignite.resources.IgniteInstanceResource; -import org.jsr166.ConcurrentHashMap8; /** * @@ -50,7 +50,7 @@ public abstract class IgniteCacheLoaderWriterAbstractTest extends IgniteCacheAbs private static AtomicInteger writerCallCnt = new AtomicInteger(); /** */ - private static ConcurrentHashMap8<Object, Object> storeMap = new ConcurrentHashMap8<>(); + private static ConcurrentHashMap<Object, Object> storeMap = new ConcurrentHashMap<>(); /** */ private static Set<Object> unaccessableKeys = new HashSet<>(); http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryCounterAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryCounterAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryCounterAbstractTest.java index 3b1c361..c68dafe 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryCounterAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryCounterAbstractTest.java @@ -52,7 +52,7 @@ import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; +import java.util.concurrent.ConcurrentHashMap; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; @@ -547,7 +547,7 @@ public abstract class CacheContinuousQueryCounterAbstractTest extends GridCommon ContinuousQuery<Integer, Integer> qry = new ContinuousQuery<>(); - final Map<Integer, T2<Integer, Long>> map = new ConcurrentHashMap8<>(); + final Map<Integer, T2<Integer, Long>> map = new ConcurrentHashMap<>(); final CountDownLatch latch = new CountDownLatch(10); qry.setLocalListener(new CacheEntryUpdatedListener<Integer, Integer>() { http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java index 119ed7e..8287a9b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java @@ -28,6 +28,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.concurrent.Callable; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; import javax.cache.Cache; @@ -72,7 +73,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.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.SECONDS; @@ -851,7 +851,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo } })); - final Map<Integer, Integer> map = new ConcurrentHashMap8<>(); + final Map<Integer, Integer> map = new ConcurrentHashMap<>(); final CountDownLatch latch = new CountDownLatch(2); qry.setLocalListener(new CacheEntryUpdatedListener<Integer, Integer>() { @@ -907,7 +907,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo ContinuousQuery<Integer, Integer> qry = new ContinuousQuery<>(); - final Map<Integer, Integer> map = new ConcurrentHashMap8<>(); + final Map<Integer, Integer> map = new ConcurrentHashMap<>(); final CountDownLatch latch = new CountDownLatch(10); qry.setLocalListener(new CacheEntryUpdatedListener<Integer, Integer>() { @@ -943,7 +943,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo ContinuousQuery<Object, Object> qry = new ContinuousQuery<>(); - final Map<Object, Object> map = new ConcurrentHashMap8<>(); + final Map<Object, Object> map = new ConcurrentHashMap<>(); final CountDownLatch latch = new CountDownLatch(2); qry.setLocalListener(new CacheEntryUpdatedListener<Object, Object>() { @@ -1106,7 +1106,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo IgniteCache<Object, Object> cache = grid(0).cache(DEFAULT_CACHE_NAME). withExpiryPolicy(new CreatedExpiryPolicy(new Duration(MILLISECONDS, 1000))); - final Map<Object, Object> map = new ConcurrentHashMap8<>(); + final Map<Object, Object> map = new ConcurrentHashMap<>(); final CountDownLatch latch = new CountDownLatch(2); ContinuousQuery<Object, Object> qry = new ContinuousQuery<>(); http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryMultiNodesFilteringTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryMultiNodesFilteringTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryMultiNodesFilteringTest.java index c9bcdf1..b316042 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryMultiNodesFilteringTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryMultiNodesFilteringTest.java @@ -54,7 +54,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.ConcurrentHashMap8; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -74,7 +73,7 @@ public class GridCacheContinuousQueryMultiNodesFilteringTest extends GridCommonA public static final int KEYS = 2_000; /** Cache entry operations' counts. */ - private static final ConcurrentMap<String, AtomicInteger> opCounts = new ConcurrentHashMap8<>(); + private static final ConcurrentMap<String, AtomicInteger> opCounts = new ConcurrentHashMap<>(); /** Client. */ private static boolean client = false; http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java index 85d269f..72d2e0f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java @@ -31,6 +31,7 @@ import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; import java.util.concurrent.BrokenBarrierException; import java.util.concurrent.Callable; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.CyclicBarrier; import java.util.concurrent.TimeUnit; @@ -72,7 +73,6 @@ import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; import org.jsr166.ConcurrentLinkedHashMap; import static org.apache.ignite.internal.pagemem.PageIdUtils.effectivePageId; @@ -2114,7 +2114,7 @@ public class BPlusTreeSelfTest extends GridCommonAbstractTest { private void doTestRandomPutRemoveMultithreaded(boolean canGetRow) throws Exception { final TestTree tree = createTestTree(canGetRow); - final Map<Long,Long> map = new ConcurrentHashMap8<>(); + final Map<Long,Long> map = new ConcurrentHashMap<>(); final int loops = reuseList == null ? 20_000 : 60_000; @@ -2338,16 +2338,16 @@ public class BPlusTreeSelfTest extends GridCommonAbstractTest { */ protected static class TestTree extends BPlusTree<Long, Long> { /** */ - private static ConcurrentMap<Object, Long> beforeReadLock = new ConcurrentHashMap8<>(); + private static ConcurrentMap<Object, Long> beforeReadLock = new ConcurrentHashMap<>(); /** */ - private static ConcurrentMap<Object, Long> beforeWriteLock = new ConcurrentHashMap8<>(); + private static ConcurrentMap<Object, Long> beforeWriteLock = new ConcurrentHashMap<>(); /** */ - private static ConcurrentMap<Object, Map<Long, Long>> readLocks = new ConcurrentHashMap8<>(); + private static ConcurrentMap<Object, Map<Long, Long>> readLocks = new ConcurrentHashMap<>(); /** */ - private static ConcurrentMap<Object, Map<Long, Long>> writeLocks = new ConcurrentHashMap8<>(); + private static ConcurrentMap<Object, Map<Long, Long>> writeLocks = new ConcurrentHashMap<>(); /** * @param reuseList Reuse list. http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/test/java/org/apache/ignite/internal/processors/service/DummyService.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/DummyService.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/DummyService.java index 0a33922..b4dea45 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/DummyService.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/DummyService.java @@ -17,12 +17,12 @@ package org.apache.ignite.internal.processors.service; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; import org.apache.ignite.services.Service; import org.apache.ignite.services.ServiceContext; -import org.jsr166.ConcurrentHashMap8; /** * Dummy service. @@ -32,19 +32,19 @@ public class DummyService implements Service { private static final long serialVersionUID = 0L; /** Inited counter per service. */ - public static final ConcurrentMap<String, AtomicInteger> started = new ConcurrentHashMap8<>(); + public static final ConcurrentMap<String, AtomicInteger> started = new ConcurrentHashMap<>(); /** Started counter per service. */ - public static final ConcurrentMap<String, AtomicInteger> inited = new ConcurrentHashMap8<>(); + public static final ConcurrentMap<String, AtomicInteger> inited = new ConcurrentHashMap<>(); /** Latches per service. */ - private static final ConcurrentMap<String, CountDownLatch> exeLatches = new ConcurrentHashMap8<>(); + private static final ConcurrentMap<String, CountDownLatch> exeLatches = new ConcurrentHashMap<>(); /** Cancel latches per service. */ - private static final ConcurrentMap<String, CountDownLatch> cancelLatches = new ConcurrentHashMap8<>(); + private static final ConcurrentMap<String, CountDownLatch> cancelLatches = new ConcurrentHashMap<>(); /** Cancelled flags per service. */ - private static final ConcurrentMap<String, AtomicInteger> cancelled = new ConcurrentHashMap8<>(); + private static final ConcurrentMap<String, AtomicInteger> cancelled = new ConcurrentHashMap<>(); /** {@inheritDoc} */ @Override public void cancel(ServiceContext ctx) { http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapMapAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapMapAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapMapAbstractSelfTest.java index ac6e531..a772cde 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapMapAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapMapAbstractSelfTest.java @@ -32,7 +32,7 @@ import org.apache.ignite.internal.util.typedef.X; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteBiTuple; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import org.jsr166.ConcurrentHashMap8; +import java.util.concurrent.ConcurrentHashMap; /** * Tests off-heap map. @@ -421,7 +421,7 @@ public abstract class GridOffHeapMapAbstractSelfTest extends GridCommonAbstractT int threads = 5; - final Map<String, String> m = new ConcurrentHashMap8<>(max); + final Map<String, String> m = new ConcurrentHashMap<>(max); multithreaded(new Callable() { @Override public Object call() throws Exception { http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java index c40c10f..3b68d24 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java @@ -33,7 +33,6 @@ import org.apache.ignite.internal.util.lang.GridCloseableIterator; import org.apache.ignite.internal.util.lang.GridTuple; import org.apache.ignite.lang.IgniteBiTuple; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import org.jsr166.ConcurrentHashMap8; /** * Tests off-heap map. @@ -509,7 +508,7 @@ public abstract class GridOffHeapPartitionedMapAbstractSelfTest extends GridComm final int max = 1024; - final ConcurrentMap<String, String> m = new ConcurrentHashMap8<>(max * parts); + final ConcurrentMap<String, String> m = new ConcurrentHashMap<>(max * parts); final AtomicInteger part = new AtomicInteger(); @@ -739,7 +738,7 @@ public abstract class GridOffHeapPartitionedMapAbstractSelfTest extends GridComm int threads = 5; - final Map<String, String> m = new ConcurrentHashMap8<>(max); + final Map<String, String> m = new ConcurrentHashMap<>(max); multithreaded(new Callable() { @Override public Object call() throws Exception { http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java index ccb9584..86432fc 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java @@ -20,6 +20,7 @@ package org.apache.ignite.internal.util.offheap; import java.util.Map; import java.util.Random; import java.util.concurrent.Callable; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; import org.apache.ignite.cache.affinity.AffinityFunction; @@ -28,7 +29,6 @@ import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.util.typedef.T3; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import org.jsr166.ConcurrentHashMap8; /** * Performance test for partitioned offheap hash map. @@ -285,7 +285,7 @@ public abstract class GridOffHeapPartitionedMapPerformanceAbstractTest extends G * @throws Exception If failed. */ private void checkPutsConcurrentMap(int threadCnt, long duration) throws Exception { - final Map<GridByteArrayWrapper, byte[]> map = new ConcurrentHashMap8<>(); + final Map<GridByteArrayWrapper, byte[]> map = new ConcurrentHashMap<>(); final AtomicLong opCnt = new AtomicLong(); final AtomicLong totalOpCnt = new AtomicLong(); @@ -340,7 +340,7 @@ public abstract class GridOffHeapPartitionedMapPerformanceAbstractTest extends G * @throws Exception If failed. */ private void checkPutRemovesConcurrentMap(int threadCnt, long duration) throws Exception { - final Map<GridByteArrayWrapper, byte[]> map = new ConcurrentHashMap8<>(); + final Map<GridByteArrayWrapper, byte[]> map = new ConcurrentHashMap<>(); final AtomicLong opCnt = new AtomicLong(); final AtomicLong totalOpCnt = new AtomicLong(); http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/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 deleted file mode 100644 index e9b3dd1..0000000 --- a/modules/core/src/test/java/org/apache/ignite/jvmtest/ConcurrentMapTest.java +++ /dev/null @@ -1,200 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.jvmtest; - -import java.util.Collection; -import java.util.LinkedList; -import java.util.Map; -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; -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; - -/** - * - */ -public class ConcurrentMapTest { - /** */ - private static Random rnd = new Random(); - - /** - * - */ - private ConcurrentMapTest() { - // No-op. - } - - /** - * @param args Args. - * @throws Exception If failed. - */ - public static void main(String args[]) throws Exception { - Thread.sleep(5000); - - Collection<IgnitePair<Integer>> ress = new LinkedList<>(); - - for (int lvl = 16; lvl <= 16384; lvl *= 2) { - System.gc(); - - X.println("Testing map with concurrency level: " + lvl); - - int cap = 256 / lvl < 16 ? 16 * lvl : 256; - - int writes = testMap(100000, new ConcurrentHashMap8<String, Integer>(cap, 0.75f, lvl)); - - ress.add(new IgnitePair<>(lvl, writes)); - } - - X.println("Test summary."); - - for (IgnitePair<Integer> p : ress) - X.println("Performance [lvl=" + p.get1() + ", writes=" + p.get2() + ']'); - - testPut(); - - testOpsSpeed(); - - testCreationTime(); - } - - /** - * @param keyRange Key range. - * @param map Map. - * @return Writes count. - * @throws Exception If failed. - */ - public static int testMap(final int keyRange, final ConcurrentMap<String, Integer> map) throws Exception { - final AtomicBoolean done = new AtomicBoolean(); - - final AtomicInteger writes = new AtomicInteger(); - - IgniteInternalFuture fut1 = GridTestUtils.runMultiThreadedAsync( - new Runnable() { - @Override public void run() { - while (!done.get()) { - map.put(rnd.nextInt(keyRange) + "very.long.string.for.key", 1); - - writes.incrementAndGet(); - } - } - }, - 40, - "thread" - ); - - long duration = 20 * 1000; - - for (long time = 0; time < duration;) { - Thread.sleep(5000); - - time += 5000; - - X.println(">>> Stats [duration=" + time + ", writes=" + writes.get() + ']'); - } - - done.set(true); - - fut1.get(); - - X.println(">>> Test finished [duration=" + duration + ", writes=" + writes.get() + ']'); - - return writes.get(); - } - - /** - * @throws Exception If failed. - */ - public static void testPut() throws Exception { - Map<Integer, Integer> map = new ConcurrentHashMap8<>(); - - map.put(0, 0); - map.put(0, 0); - } - - /** - * @throws Exception If failed. - */ - public static void testOpsSpeed() throws Exception { - for (int i = 0; i < 4; i++) { - X.println("New map ops time: " + runOps(new ConcurrentHashMap8<Integer, Integer>(), 1000000, 100)); - - X.println("Jdk6 map ops time: " + runOps(new ConcurrentHashMap<Integer, Integer>(), 1000000, 100)); - } - } - - /** - * @param iterCnt Iterations count. - * @param threadCnt Threads count. - * @return Time taken. - */ - private static long runOps(final Map<Integer,Integer> map, final int iterCnt, int threadCnt) throws Exception { - long start = System.currentTimeMillis(); - - GridTestUtils.runMultiThreaded(new Callable<Object>() { - @Override public Object call() throws Exception { - ThreadLocalRandom rnd = ThreadLocalRandom.current(); - - for (int i = 0; i < iterCnt; i++) { - // Put random. - map.put(rnd.nextInt(0, 10000), 0); - - // Read random. - map.get(rnd.nextInt(0, 10000)); - - // Remove random. - map.remove(rnd.nextInt(0, 10000)); - } - - return null; - } - }, threadCnt, "thread"); - - return System.currentTimeMillis() - start; - } - - /** - * @throws Exception If failed. - */ - @SuppressWarnings("ResultOfObjectAllocationIgnored") - public static void testCreationTime() throws Exception { - for (int i = 0; i < 5; i++) { - long now = System.currentTimeMillis(); - - for (int j = 0; j < 1000000; j++) - new ConcurrentHashMap8<Integer, Integer>(); - - X.println("New map creation time: " + (System.currentTimeMillis() - now)); - - now = System.currentTimeMillis(); - - for (int j = 0; j < 1000000; j++) - new ConcurrentHashMap<Integer, Integer>(); - - X.println("Jdk6 map creation time: " + (System.currentTimeMillis() - now)); - } - } - -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/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 deleted file mode 100644 index dbf453d..0000000 --- a/modules/core/src/test/java/org/apache/ignite/lang/utils/GridConcurrentHashMapSelfTest.java +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -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; - -/** - * Tests for {@link org.jsr166.ConcurrentHashMap8}. - */ -public class GridConcurrentHashMapSelfTest extends GridCommonAbstractTest { - /** */ - private Map<Integer,Integer> map; - - /** - * @throws Exception If failed. - */ - public void testPut() throws Exception { - map = new ConcurrentHashMap8<>(); - - map.put(0, 0); - map.put(0, 0); - } - - /** - * @throws Exception If failed. - */ - public void testOpsSpeed() throws Exception { - for (int i = 0; i < 4; i++) { - map = new ConcurrentHashMap8<>(); - - info("New map ops time: " + runOps(1000000, 100)); - - map = new ConcurrentHashMap<>(); - - info("Jdk6 map ops time: " + runOps(1000000, 100)); - } - } - - /** - * @param iterCnt Iterations count. - * @param threadCnt Threads count. - * @return Time taken. - */ - private long runOps(final int iterCnt, int threadCnt) throws Exception { - long start = System.currentTimeMillis(); - - multithreaded(new Callable<Object>() { - @Override public Object call() throws Exception { - ThreadLocalRandom rnd = ThreadLocalRandom.current(); - - for (int i = 0; i < iterCnt; i++) { - // Put random. - map.put(rnd.nextInt(0, 10000), 0); - - // Read random. - map.get(rnd.nextInt(0, 10000)); - - // Remove random. - map.remove(rnd.nextInt(0, 10000)); - } - - return null; - } - }, threadCnt); - - return System.currentTimeMillis() - start; - } - - /** - * @throws Exception If failed. - */ - @SuppressWarnings("ResultOfObjectAllocationIgnored") - public void testCreationTime() throws Exception { - for (int i = 0; i < 5; i++) { - long now = System.currentTimeMillis(); - - for (int j = 0; j < 1000000; j++) - new ConcurrentHashMap8<Integer, Integer>(); - - info("New map creation time: " + (System.currentTimeMillis() - now)); - - now = System.currentTimeMillis(); - - for (int j = 0; j < 1000000; j++) - new ConcurrentHashMap<Integer, Integer>(); - - info("Jdk6 map creation time: " + (System.currentTimeMillis() - now)); - } - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/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 ef3fc9f..58e1aa1 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 @@ -43,7 +43,7 @@ import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.loadtests.util.GridCumulativeAverage; import org.apache.ignite.testframework.GridLoadTestUtils; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; +import java.util.concurrent.ConcurrentHashMap; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.apache.ignite.internal.managers.communication.GridIoPolicy.PUBLIC_POOL; @@ -78,7 +78,7 @@ public class GridIoManagerBenchmark { private static final LongAdder msgCntr = new LongAdder(); /** */ - private static final Map<IgniteUuid, CountDownLatch> latches = new ConcurrentHashMap8<>(); + private static final Map<IgniteUuid, CountDownLatch> latches = new ConcurrentHashMap<>(); /** */ private static final byte[][] arrs; http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/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 8adb2b3..063c790 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 @@ -22,6 +22,7 @@ import java.util.Timer; import java.util.TimerTask; import java.util.UUID; import java.util.concurrent.Callable; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CountDownLatch; import java.util.concurrent.Semaphore; import java.util.concurrent.atomic.AtomicBoolean; @@ -46,7 +47,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.ConcurrentHashMap8; import static org.apache.ignite.internal.managers.communication.GridIoPolicy.PUBLIC_POOL; @@ -219,7 +219,7 @@ public class GridIoManagerBenchmark0 extends GridCommonAbstractTest { final Integer topic = 1; - final Map<IgniteUuid, CountDownLatch> map = new ConcurrentHashMap8<>(); + final Map<IgniteUuid, CountDownLatch> map = new ConcurrentHashMap<>(); rcv.addMessageListener( topic, @@ -319,7 +319,7 @@ public class GridIoManagerBenchmark0 extends GridCommonAbstractTest { final String topic = "test-topic"; - final Map<IgniteUuid, CountDownLatch> latches = new ConcurrentHashMap8<>(); + final Map<IgniteUuid, CountDownLatch> latches = new ConcurrentHashMap<>(); rcv.addMessageListener( topic, http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java index 6dd3df5..8c8fc74 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java @@ -19,6 +19,7 @@ package org.apache.ignite.loadtests.dsi; import java.util.HashMap; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicLong; import javax.cache.Cache; @@ -40,7 +41,6 @@ import org.apache.ignite.internal.util.typedef.X; import org.apache.ignite.resources.IgniteInstanceResource; import org.apache.ignite.transactions.Transaction; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; /** * @@ -48,7 +48,7 @@ import org.jsr166.ConcurrentHashMap8; public class GridDsiPerfJob extends ComputeJobAdapter { /** */ private static final ConcurrentMap<Thread, ConcurrentMap<String, T3<Long, Long, Long>>> timers = - new ConcurrentHashMap8<>(); + new ConcurrentHashMap<>(); /** */ @AffinityKeyMapped @@ -146,7 +146,7 @@ public class GridDsiPerfJob extends ComputeJobAdapter { if (m == null) { ConcurrentMap<String, T3<Long, Long, Long>> old = timers.putIfAbsent(Thread.currentThread(), - m = new ConcurrentHashMap8<>()); + m = new ConcurrentHashMap<>()); if (old != null) m = old; http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java index a243c29..60accfa 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java @@ -30,7 +30,7 @@ import org.apache.ignite.internal.util.offheap.GridOffHeapPartitionedMap; import org.apache.ignite.internal.util.typedef.T3; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import org.jsr166.ConcurrentHashMap8; +import java.util.concurrent.ConcurrentHashMap; /** * Performance test for partitioned offheap hash map. @@ -287,7 +287,7 @@ public abstract class GridOffHeapPartitionedMapPerformanceAbstractTest extends G * @throws Exception If failed. */ private void checkPutsConcurrentMap(int threadCnt, long duration) throws Exception { - final Map<GridByteArrayWrapper, byte[]> map = new ConcurrentHashMap8<>(); + final Map<GridByteArrayWrapper, byte[]> map = new ConcurrentHashMap<>(); final AtomicLong opCnt = new AtomicLong(); final AtomicLong totalOpCnt = new AtomicLong(); @@ -342,7 +342,7 @@ public abstract class GridOffHeapPartitionedMapPerformanceAbstractTest extends G * @throws Exception If failed. */ private void checkPutRemovesConcurrentMap(int threadCnt, long duration) throws Exception { - final Map<GridByteArrayWrapper, byte[]> map = new ConcurrentHashMap8<>(); + final Map<GridByteArrayWrapper, byte[]> map = new ConcurrentHashMap<>(); final AtomicLong opCnt = new AtomicLong(); final AtomicLong totalOpCnt = new AtomicLong(); http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/test/java/org/apache/ignite/marshaller/MarshallerContextTestImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/MarshallerContextTestImpl.java b/modules/core/src/test/java/org/apache/ignite/marshaller/MarshallerContextTestImpl.java index 2d6383c..ae057ee 100644 --- a/modules/core/src/test/java/org/apache/ignite/marshaller/MarshallerContextTestImpl.java +++ b/modules/core/src/test/java/org/apache/ignite/marshaller/MarshallerContextTestImpl.java @@ -19,19 +19,19 @@ package org.apache.ignite.marshaller; import java.util.Collection; import java.util.List; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.internal.MarshallerContextImpl; import org.apache.ignite.plugin.PluginProvider; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; /** * Test marshaller context. */ public class MarshallerContextTestImpl extends MarshallerContextImpl { /** */ - private static final ConcurrentMap<Integer, String> map = new ConcurrentHashMap8<>(); + private static final ConcurrentMap<Integer, String> map = new ConcurrentHashMap<>(); /** */ private final Collection<String> excluded; http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/direct-io/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/AlignedBuffersDirectFileIO.java ---------------------------------------------------------------------- diff --git a/modules/direct-io/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/AlignedBuffersDirectFileIO.java b/modules/direct-io/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/AlignedBuffersDirectFileIO.java index 62e1db3..3cb4886 100644 --- a/modules/direct-io/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/AlignedBuffersDirectFileIO.java +++ b/modules/direct-io/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/AlignedBuffersDirectFileIO.java @@ -29,13 +29,13 @@ import java.nio.file.OpenOption; import java.nio.file.StandardOpenOption; import java.util.Arrays; import java.util.List; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicReferenceArray; import org.apache.ignite.IgniteLogger; import org.apache.ignite.configuration.DataStorageConfiguration; import org.apache.ignite.internal.util.GridUnsafe; import org.apache.ignite.internal.util.typedef.internal.U; import org.jetbrains.annotations.NotNull; -import org.jsr166.ConcurrentHashMap8; /** * Limited capabilities Direct IO, which enables file write and read using aligned buffers and O_DIRECT mode. @@ -62,7 +62,7 @@ public class AlignedBuffersDirectFileIO implements FileIO { private ThreadLocal<ByteBuffer> tlbOnePageAligned; /** Managed aligned buffers. Used to check if buffer is applicable for direct IO our data should be copied. */ - private ConcurrentHashMap8<Long, Thread> managedAlignedBuffers; + private ConcurrentHashMap<Long, Thread> managedAlignedBuffers; /** File descriptor. */ private int fd = -1; @@ -95,7 +95,7 @@ public class AlignedBuffersDirectFileIO implements FileIO { File file, OpenOption[] modes, ThreadLocal<ByteBuffer> tlbOnePageAligned, - ConcurrentHashMap8<Long, Thread> managedAlignedBuffers, + ConcurrentHashMap<Long, Thread> managedAlignedBuffers, IgniteLogger log) throws IOException { this.log = log; http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/direct-io/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/AlignedBuffersDirectFileIOFactory.java ---------------------------------------------------------------------- diff --git a/modules/direct-io/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/AlignedBuffersDirectFileIOFactory.java b/modules/direct-io/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/AlignedBuffersDirectFileIOFactory.java index b9d11cd..8a28e9e 100644 --- a/modules/direct-io/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/AlignedBuffersDirectFileIOFactory.java +++ b/modules/direct-io/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/AlignedBuffersDirectFileIOFactory.java @@ -22,13 +22,13 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.nio.file.OpenOption; +import java.util.concurrent.ConcurrentHashMap; import org.apache.ignite.IgniteLogger; import org.apache.ignite.IgniteSystemProperties; import org.apache.ignite.configuration.DataStorageConfiguration; import org.apache.ignite.internal.util.GridUnsafe; import org.apache.ignite.internal.util.typedef.internal.U; import org.jetbrains.annotations.NotNull; -import org.jsr166.ConcurrentHashMap8; import static java.nio.file.StandardOpenOption.CREATE; import static java.nio.file.StandardOpenOption.READ; @@ -65,7 +65,7 @@ public class AlignedBuffersDirectFileIOFactory implements FileIOFactory { * Managed aligned buffers. This collection is used to free buffers, an for checking if buffer is known to be * already aligned. */ - private final ConcurrentHashMap8<Long, Thread> managedAlignedBuffers = new ConcurrentHashMap8<>(); + private final ConcurrentHashMap<Long, Thread> managedAlignedBuffers = new ConcurrentHashMap<>(); /** * Creates direct native IO factory. @@ -171,7 +171,7 @@ public class AlignedBuffersDirectFileIOFactory implements FileIOFactory { * * @return map address->thread. */ - ConcurrentHashMap8<Long, Thread> managedAlignedBuffers() { + ConcurrentHashMap<Long, Thread> managedAlignedBuffers() { return managedAlignedBuffers; } } http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/direct-io/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/LinuxNativeIoPluginProvider.java ---------------------------------------------------------------------- diff --git a/modules/direct-io/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/LinuxNativeIoPluginProvider.java b/modules/direct-io/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/LinuxNativeIoPluginProvider.java index 918ff5c..085d9f2 100644 --- a/modules/direct-io/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/LinuxNativeIoPluginProvider.java +++ b/modules/direct-io/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/LinuxNativeIoPluginProvider.java @@ -23,6 +23,7 @@ import java.nio.ByteBuffer; import java.nio.channels.FileChannel; import java.util.Map; import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteLogger; import org.apache.ignite.cluster.ClusterNode; @@ -41,14 +42,13 @@ import org.apache.ignite.plugin.PluginContext; import org.apache.ignite.plugin.PluginProvider; import org.apache.ignite.plugin.PluginValidationException; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; /** * Plugin provider for setting up {@link IgniteNativeIoLib}. */ public class LinuxNativeIoPluginProvider implements PluginProvider { /** Managed buffers map from address to thread requested buffer. */ - @Nullable private ConcurrentHashMap8<Long, Thread> managedBuffers; + @Nullable private ConcurrentHashMap<Long, Thread> managedBuffers; /** Logger. */ private IgniteLogger log; @@ -95,7 +95,7 @@ public class LinuxNativeIoPluginProvider implements PluginProvider { * Free direct thread local buffer allocated for Direct IO user's threads. */ private void freeDirectBuffers() { - ConcurrentHashMap8<Long, Thread> buffers = managedBuffers; + ConcurrentHashMap<Long, Thread> buffers = managedBuffers; if (buffers == null) return; @@ -159,7 +159,7 @@ public class LinuxNativeIoPluginProvider implements PluginProvider { * @return Managed aligned buffers and its associated threads. This collection is used to free buffers. May return * {@code null}. */ - @Nullable private ConcurrentHashMap8<Long, Thread> setupDirect(IgniteEx ignite) { + @Nullable private ConcurrentHashMap<Long, Thread> setupDirect(IgniteEx ignite) { GridCacheSharedContext<Object, Object> cacheCtx = ignite.context().cache().context(); IgnitePageStoreManager ignitePageStoreMgr = cacheCtx.pageStore(); http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/counter/HadoopCountersImpl.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/counter/HadoopCountersImpl.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/counter/HadoopCountersImpl.java index f3b5463..5bfa534 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/counter/HadoopCountersImpl.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/counter/HadoopCountersImpl.java @@ -23,12 +23,12 @@ import java.io.ObjectInput; import java.io.ObjectOutput; import java.lang.reflect.Constructor; import java.util.Collection; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import org.apache.ignite.IgniteException; import org.apache.ignite.internal.util.lang.GridTuple3; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; -import org.jsr166.ConcurrentHashMap8; /** * Default in-memory counters store. @@ -38,7 +38,7 @@ public class HadoopCountersImpl implements HadoopCounters, Externalizable { private static final long serialVersionUID = 0L; /** */ - private final ConcurrentMap<CounterKey, HadoopCounter> cntrsMap = new ConcurrentHashMap8<>(); + private final ConcurrentMap<CounterKey, HadoopCounter> cntrsMap = new ConcurrentHashMap<>(); /** * Default constructor. Creates new instance without counters. http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/fs/HadoopLazyConcurrentMap.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/fs/HadoopLazyConcurrentMap.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/fs/HadoopLazyConcurrentMap.java index ea1f664..34cdc31 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/fs/HadoopLazyConcurrentMap.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/fs/HadoopLazyConcurrentMap.java @@ -17,10 +17,10 @@ package org.apache.ignite.internal.processors.hadoop.impl.fs; +import java.util.concurrent.ConcurrentHashMap; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteException; import org.apache.ignite.internal.util.future.GridFutureAdapter; -import org.jsr166.ConcurrentHashMap8; import java.io.Closeable; import java.io.IOException; @@ -37,7 +37,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; */ public class HadoopLazyConcurrentMap<K, V extends Closeable> { /** The map storing the actual values. */ - private final ConcurrentMap<K, ValueWrapper> map = new ConcurrentHashMap8<>(); + private final ConcurrentMap<K, ValueWrapper> map = new ConcurrentHashMap<>(); /** The factory passed in by the client. Will be used for lazy value creation. */ private final ValueFactory<K, V> factory; http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsIpcIo.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsIpcIo.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsIpcIo.java index a2ec977..163524d 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsIpcIo.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsIpcIo.java @@ -38,7 +38,7 @@ import org.apache.ignite.internal.util.ipc.shmem.IpcOutOfSystemResourcesExceptio import org.apache.ignite.internal.util.ipc.shmem.IpcSharedMemoryServerEndpoint; import org.apache.ignite.internal.util.typedef.internal.U; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; +import java.util.concurrent.ConcurrentHashMap; import java.io.BufferedOutputStream; import java.io.EOFException; @@ -63,7 +63,7 @@ public class HadoopIgfsIpcIo implements HadoopIgfsIo { /** Request futures map. */ private ConcurrentMap<Long, HadoopIgfsFuture> reqMap = - new ConcurrentHashMap8<>(); + new ConcurrentHashMap<>(); /** Request ID counter. */ private AtomicLong reqIdCnt = new AtomicLong(); @@ -98,7 +98,7 @@ public class HadoopIgfsIpcIo implements HadoopIgfsIo { /** Cached connections. */ private static final ConcurrentMap<String, HadoopIgfsIpcIo> ipcCache = - new ConcurrentHashMap8<>(); + new ConcurrentHashMap<>(); /** Striped lock that prevents multiple instance creation in {@link #get(Log, String)}. */ private static final GridStripedLock initLock = new GridStripedLock(32); http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsOutProc.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsOutProc.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsOutProc.java index 2780966..32c06fa 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsOutProc.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsOutProc.java @@ -17,6 +17,7 @@ package org.apache.ignite.internal.processors.hadoop.impl.igfs; +import java.util.concurrent.ConcurrentHashMap; import org.apache.commons.logging.Log; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.igfs.IgfsBlockLocation; @@ -41,7 +42,6 @@ import org.apache.ignite.internal.util.future.GridFinishedFuture; import org.apache.ignite.internal.util.lang.GridClosureException; import org.apache.ignite.lang.IgniteClosure; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; import java.io.IOException; import java.util.Collection; @@ -54,7 +54,6 @@ import static org.apache.ignite.internal.igfs.common.IgfsIpcCommand.INFO; import static org.apache.ignite.internal.igfs.common.IgfsIpcCommand.LIST_FILES; import static org.apache.ignite.internal.igfs.common.IgfsIpcCommand.LIST_PATHS; import static org.apache.ignite.internal.igfs.common.IgfsIpcCommand.MAKE_DIRECTORIES; -import static org.apache.ignite.internal.igfs.common.IgfsIpcCommand.MODE_RESOLVER; import static org.apache.ignite.internal.igfs.common.IgfsIpcCommand.OPEN_APPEND; import static org.apache.ignite.internal.igfs.common.IgfsIpcCommand.OPEN_CREATE; import static org.apache.ignite.internal.igfs.common.IgfsIpcCommand.OPEN_READ; @@ -123,7 +122,7 @@ public class HadoopIgfsOutProc implements HadoopIgfsEx, HadoopIgfsIpcIoListener private final HadoopIgfsIpcIo io; /** Event listeners. */ - private final Map<Long, HadoopIgfsStreamEventListener> lsnrs = new ConcurrentHashMap8<>(); + private final Map<Long, HadoopIgfsStreamEventListener> lsnrs = new ConcurrentHashMap<>(); /** * Constructor for TCP endpoint. http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2Job.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2Job.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2Job.java index 28b4d6b..13a893f 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2Job.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2Job.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal.processors.hadoop.impl.v2; import java.security.PrivilegedExceptionAction; +import java.util.concurrent.ConcurrentHashMap; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.FileSystem; @@ -57,7 +58,6 @@ import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.T2; import org.apache.ignite.internal.util.typedef.internal.U; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -116,7 +116,7 @@ public class HadoopV2Job extends HadoopJobEx { /** */ private final ConcurrentMap<T2<HadoopTaskType, Integer>, GridFutureAdapter<HadoopTaskContext>> ctxs = - new ConcurrentHashMap8<>(); + new ConcurrentHashMap<>(); /** Pooling task context class and thus class loading environment. */ private final Queue<Class<? extends HadoopTaskContext>> taskCtxClsPool = new ConcurrentLinkedQueue<>();
