IGNITE-7513 Get rid of org.jsr166.ConcurrentHashMap8 Signed-off-by: Anton Vinogradov <a...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b4ece5fb Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b4ece5fb Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b4ece5fb Branch: refs/heads/master Commit: b4ece5fb3781f6cee74548d45c8987d452c0932e Parents: 2ab10ca Author: Andrey Kuznetsov <stku...@gmail.com> Authored: Tue Feb 13 15:14:15 2018 +0300 Committer: Anton Vinogradov <a...@apache.org> Committed: Wed Feb 14 17:29:02 2018 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/internal/IgnitionEx.java | 6 +- .../ignite/internal/MarshallerContextImpl.java | 8 +- .../ignite/internal/binary/BinaryContext.java | 12 +- .../ignite/internal/binary/BinaryEnumCache.java | 4 +- .../ignite/internal/binary/BinaryUtils.java | 6 - .../router/impl/GridRouterClientImpl.java | 4 +- .../cluster/ClusterNodeLocalMapImpl.java | 4 +- .../ignite/internal/igfs/common/IgfsLogger.java | 6 +- .../checkpoint/GridCheckpointManager.java | 4 +- .../managers/communication/GridIoManager.java | 9 +- .../communication/GridIoMessageFactory.java | 4 +- .../managers/deployment/GridDeployment.java | 16 +- .../deployment/GridDeploymentClassLoader.java | 6 +- .../deployment/GridDeploymentLocalStore.java | 4 +- .../GridDeploymentPerVersionStore.java | 6 +- .../discovery/GridDiscoveryManager.java | 3 +- .../eventstorage/GridEventStorageManager.java | 4 +- .../optimized/OptimizedMarshaller.java | 4 +- .../affinity/GridAffinityProcessor.java | 4 +- .../cache/CacheAffinitySharedManager.java | 3 +- .../cache/CacheStoreBalancingWrapper.java | 4 +- .../cache/CacheWeakQueryIteratorsHolder.java | 4 +- .../cache/GridCacheDeploymentManager.java | 6 +- .../processors/cache/GridCacheIoManager.java | 6 +- .../cache/GridCacheLocalConcurrentMap.java | 4 +- .../processors/cache/GridCacheMvccManager.java | 8 +- .../GridCachePartitionExchangeManager.java | 4 +- .../cache/GridCacheSharedContext.java | 15 +- .../processors/cache/GridCacheUtils.java | 4 +- .../cache/GridDeferredAckMessageSender.java | 4 +- .../cache/binary/BinaryMetadataTransport.java | 6 +- .../binary/CacheObjectBinaryProcessorImpl.java | 3 +- .../CacheDataStructuresManager.java | 8 +- .../distributed/GridCacheTxFinishSync.java | 6 +- .../distributed/dht/GridDhtCacheAdapter.java | 4 +- .../distributed/dht/GridDhtLocalPartition.java | 3 +- .../distributed/dht/GridDhtLockFuture.java | 4 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 6 +- .../colocated/GridDhtColocatedLockFuture.java | 4 +- .../GridDhtPartitionsExchangeFuture.java | 10 +- .../distributed/near/GridNearLockFuture.java | 4 +- .../distributed/near/IgniteTxMappingsImpl.java | 4 +- .../wal/FileWriteAheadLogManager.java | 4 +- .../query/GridCacheDistributedQueryManager.java | 6 +- .../cache/query/GridCacheQueryManager.java | 28 +- .../continuous/CacheContinuousQueryManager.java | 8 +- .../cache/transactions/IgniteTxManager.java | 6 +- .../continuous/GridContinuousProcessor.java | 16 +- .../datastreamer/DataStreamerImpl.java | 6 +- .../datastructures/DataStructuresProcessor.java | 6 +- .../processors/hadoop/HadoopClassLoader.java | 5 +- .../processors/igfs/IgfsClientSession.java | 4 +- .../processors/igfs/IgfsDataManager.java | 10 +- .../internal/processors/igfs/IgfsImpl.java | 4 +- .../internal/processors/igfs/IgfsProcessor.java | 4 +- .../processors/job/GridJobProcessor.java | 6 +- .../GridMarshallerMappingProcessor.java | 6 +- .../offheap/GridOffHeapProcessor.java | 6 +- .../processors/resource/GridResourceIoc.java | 4 +- .../service/GridServiceProcessor.java | 6 +- .../session/GridTaskSessionProcessor.java | 4 +- .../internal/util/GridAnnotationsCache.java | 6 +- .../internal/util/GridClassLoaderCache.java | 4 +- .../internal/util/GridConcurrentFactory.java | 4 +- .../internal/util/GridConcurrentHashSet.java | 10 +- .../ignite/internal/util/GridKeyLock.java | 4 +- .../ignite/internal/util/GridLogThrottle.java | 4 +- .../internal/util/GridSynchronizedMap.java | 4 +- .../ignite/internal/util/IgniteUtils.java | 9 +- .../gridfunc/ConcurrentMapFactoryCallable.java | 4 +- .../jobstealing/JobStealingCollisionSpi.java | 6 +- .../deployment/local/LocalDeploymentSpi.java | 4 +- .../ignite/spi/discovery/tcp/ClientImpl.java | 6 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 6 +- .../adaptive/AdaptiveLoadBalancingSpi.java | 4 +- .../roundrobin/RoundRobinLoadBalancingSpi.java | 4 +- .../WeightedRandomLoadBalancingSpi.java | 4 +- .../java/org/jsr166/ConcurrentHashMap8.java | 3810 ------------------ .../binary/BinaryMarshallerSelfTest.java | 3 +- .../GridDeploymentMessageCountSelfTest.java | 4 +- .../OptimizedObjectStreamSelfTest.java | 4 +- .../cache/CacheNearReaderUpdateTest.java | 4 +- .../CacheSerializableTransactionsTest.java | 4 +- .../GridCacheAbstractRemoveFailureTest.java | 4 +- .../GridCacheInterceptorAbstractSelfTest.java | 12 +- .../GridCacheOrderedPreloadingSelfTest.java | 8 +- ...ridCacheStoreManagerDeserializationTest.java | 4 +- .../cache/IgniteCacheAbstractTest.java | 6 +- .../IgniteCacheReadThroughStoreCallTest.java | 4 +- .../processors/cache/MapCacheStoreStrategy.java | 4 +- .../GridCacheBinaryStoreAbstractSelfTest.java | 4 +- ...chePartitionedReloadAllAbstractSelfTest.java | 4 +- .../dht/GridCacheGlobalLoadTest.java | 6 +- ...cingDelayedPartitionMapExchangeSelfTest.java | 4 +- .../IgniteCacheLoadAllAbstractTest.java | 6 +- .../IgniteCacheLoaderWriterAbstractTest.java | 4 +- ...CacheContinuousQueryCounterAbstractTest.java | 4 +- ...ridCacheContinuousQueryAbstractSelfTest.java | 10 +- ...eContinuousQueryMultiNodesFilteringTest.java | 3 +- .../processors/database/BPlusTreeSelfTest.java | 12 +- .../processors/service/DummyService.java | 12 +- .../offheap/GridOffHeapMapAbstractSelfTest.java | 4 +- ...idOffHeapPartitionedMapAbstractSelfTest.java | 5 +- ...apPartitionedMapPerformanceAbstractTest.java | 6 +- .../ignite/jvmtest/ConcurrentMapTest.java | 200 - .../utils/GridConcurrentHashMapSelfTest.java | 110 - .../communication/GridIoManagerBenchmark.java | 4 +- .../communication/GridIoManagerBenchmark0.java | 6 +- .../ignite/loadtests/dsi/GridDsiPerfJob.java | 6 +- ...apPartitionedMapPerformanceAbstractTest.java | 6 +- .../marshaller/MarshallerContextTestImpl.java | 4 +- .../file/AlignedBuffersDirectFileIO.java | 6 +- .../file/AlignedBuffersDirectFileIOFactory.java | 6 +- .../file/LinuxNativeIoPluginProvider.java | 8 +- .../hadoop/counter/HadoopCountersImpl.java | 4 +- .../hadoop/impl/fs/HadoopLazyConcurrentMap.java | 4 +- .../hadoop/impl/igfs/HadoopIgfsIpcIo.java | 6 +- .../hadoop/impl/igfs/HadoopIgfsOutProc.java | 5 +- .../processors/hadoop/impl/v2/HadoopV2Job.java | 4 +- .../hadoop/jobtracker/HadoopJobTracker.java | 8 +- .../taskexecutor/HadoopExecutorService.java | 4 +- .../external/HadoopExternalTaskExecutor.java | 6 +- .../processors/hadoop/HadoopSharedMap.java | 6 +- .../hadoop/impl/HadoopAbstractSelfTest.java | 15 +- .../hadoop/impl/HadoopCommandLineTest.java | 4 +- .../processors/query/h2/IgniteH2Indexing.java | 11 +- .../query/h2/opt/GridH2MetaTable.java | 6 +- .../query/h2/opt/GridH2QueryContext.java | 4 +- .../processors/query/h2/opt/GridH2Table.java | 4 +- .../query/h2/twostep/GridMapQueryExecutor.java | 5 +- .../h2/twostep/GridReduceQueryExecutor.java | 3 +- .../query/h2/twostep/MapNodeResults.java | 6 +- .../cache/IgniteCacheAbstractQuerySelfTest.java | 5 +- .../org/apache/ignite/osgi/IgniteOsgiUtils.java | 4 +- .../classloaders/ContainerSweepClassLoader.java | 4 +- .../ignite/cache/spring/SpringCacheManager.java | 13 +- 136 files changed, 380 insertions(+), 4522 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java index ed31f00..f5cb798 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java @@ -113,7 +113,7 @@ import org.apache.ignite.thread.IgniteStripedThreadPoolExecutor; import org.apache.ignite.thread.IgniteThread; import org.apache.ignite.thread.IgniteThreadPoolExecutor; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; +import java.util.concurrent.ConcurrentHashMap; import static org.apache.ignite.IgniteState.STARTED; import static org.apache.ignite.IgniteState.STOPPED; @@ -159,10 +159,10 @@ public class IgnitionEx { public static final String DFLT_CFG = "config/default-config.xml"; /** Map of named Ignite instances. */ - private static final ConcurrentMap<Object, IgniteNamedInstance> grids = new ConcurrentHashMap8<>(); + private static final ConcurrentMap<Object, IgniteNamedInstance> grids = new ConcurrentHashMap<>(); /** Map of grid states ever started in this JVM. */ - private static final Map<Object, IgniteState> gridStates = new ConcurrentHashMap8<>(); + private static final Map<Object, IgniteState> gridStates = new ConcurrentHashMap<>(); /** Mutex to synchronize updates of default grid reference. */ private static final Object dfltGridMux = new Object(); http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java index d82ab17..dae95ae 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java @@ -33,6 +33,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.CopyOnWriteArrayList; import org.apache.ignite.IgniteCheckedException; @@ -56,7 +57,6 @@ import org.apache.ignite.marshaller.jdk.JdkMarshaller; import org.apache.ignite.plugin.PluginProvider; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; import static org.apache.ignite.internal.MarshallerPlatformIds.JAVA_ID; import static org.apache.ignite.marshaller.MarshallerUtils.CLS_NAMES_FILE; @@ -156,7 +156,7 @@ public class MarshallerContextImpl implements MarshallerContext { /** */ private void initializeCaches() { - allCaches.add(new CombinedMap(new ConcurrentHashMap8<Integer, MappedName>(), sysTypesMap)); + allCaches.add(new CombinedMap(new ConcurrentHashMap<Integer, MappedName>(), sysTypesMap)); } /** */ @@ -469,12 +469,12 @@ public class MarshallerContextImpl implements MarshallerContext { map = allCaches.get(platformId); if (map == null) { - map = new ConcurrentHashMap8<>(); + map = new ConcurrentHashMap<>(); allCaches.set(platformId, map); } } else { - map = new ConcurrentHashMap8<>(); + map = new ConcurrentHashMap<>(); putAtIndex(map, allCaches, platformId, size); } http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java index b161129..9606139 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java @@ -41,6 +41,7 @@ import java.util.Set; import java.util.TreeMap; import java.util.TreeSet; import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.jar.JarEntry; import java.util.jar.JarFile; @@ -118,7 +119,6 @@ import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.marshaller.MarshallerContext; import org.apache.ignite.marshaller.MarshallerUtils; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; import static org.apache.ignite.internal.MarshallerPlatformIds.JAVA_ID; @@ -209,7 +209,7 @@ public class BinaryContext { } /** */ - private final ConcurrentMap<Class<?>, BinaryClassDescriptor> descByCls = new ConcurrentHashMap8<>(); + private final ConcurrentMap<Class<?>, BinaryClassDescriptor> descByCls = new ConcurrentHashMap<>(); /** */ private final Map<Integer, BinaryClassDescriptor> predefinedTypes = new HashMap<>(); @@ -224,16 +224,16 @@ public class BinaryContext { private final Map<Class<? extends Map>, Byte> mapTypes = new HashMap<>(); /** Maps typeId to mappers. */ - private final ConcurrentMap<Integer, BinaryInternalMapper> typeId2Mapper = new ConcurrentHashMap8<>(0); + private final ConcurrentMap<Integer, BinaryInternalMapper> typeId2Mapper = new ConcurrentHashMap<>(0); /** Affinity key field names. */ - private final ConcurrentMap<Integer, String> affKeyFieldNames = new ConcurrentHashMap8<>(0); + private final ConcurrentMap<Integer, String> affKeyFieldNames = new ConcurrentHashMap<>(0); /** Maps className to mapper */ - private final ConcurrentMap<String, BinaryInternalMapper> cls2Mappers = new ConcurrentHashMap8<>(0); + private final ConcurrentMap<String, BinaryInternalMapper> cls2Mappers = new ConcurrentHashMap<>(0); /** Affinity key field names. */ - private final ConcurrentMap<Integer, BinaryIdentityResolver> identities = new ConcurrentHashMap8<>(0); + private final ConcurrentMap<Integer, BinaryIdentityResolver> identities = new ConcurrentHashMap<>(0); /** */ private BinaryMetadataHandler metaHnd; http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumCache.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumCache.java index 6089cfd..895782e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumCache.java @@ -17,8 +17,8 @@ package org.apache.ignite.internal.binary; +import java.util.concurrent.ConcurrentHashMap; import org.apache.ignite.binary.BinaryObjectException; -import org.jsr166.ConcurrentHashMap8; import java.util.concurrent.ConcurrentMap; @@ -27,7 +27,7 @@ import java.util.concurrent.ConcurrentMap; */ public class BinaryEnumCache { /** Cache for enum constants. */ - private static final ConcurrentMap<Class<?>, Object[]> ENUM_CACHE = new ConcurrentHashMap8<>(); + private static final ConcurrentMap<Class<?>, Object[]> ENUM_CACHE = new ConcurrentHashMap<>(); /** * Get value for the given class and ordinal. http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java index 8970a4e..2ef57e1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java @@ -72,7 +72,6 @@ import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteBiTuple; import org.apache.ignite.lang.IgniteUuid; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; import static java.nio.charset.StandardCharsets.UTF_8; import static org.apache.ignite.IgniteSystemProperties.IGNITE_BINARY_MARSHALLER_USE_STRING_SERIALIZATION_VER_2; @@ -648,7 +647,6 @@ public class BinaryUtils { return cls == HashMap.class || cls == LinkedHashMap.class || (!wrapTrees() && cls == TreeMap.class) || - cls == ConcurrentHashMap8.class || cls == ConcurrentHashMap.class; } @@ -668,8 +666,6 @@ public class BinaryUtils { return U.newLinkedHashMap(((Map)map).size()); else if (!wrapTrees() && cls == TreeMap.class) return new TreeMap<>(((TreeMap<Object, Object>)map).comparator()); - else if (cls == ConcurrentHashMap8.class) - return new ConcurrentHashMap8<>(U.capacity(((Map)map).size())); else if (cls == ConcurrentHashMap.class) return new ConcurrentHashMap<>(U.capacity(((Map)map).size())); @@ -688,8 +684,6 @@ public class BinaryUtils { return U.newLinkedHashMap(map.size()); else if (map instanceof TreeMap) return new TreeMap<>(((TreeMap<Object, Object>)map).comparator()); - else if (map instanceof ConcurrentHashMap8) - return new ConcurrentHashMap8<>(U.capacity(map.size())); else if (map instanceof ConcurrentHashMap) return new ConcurrentHashMap<>(U.capacity(map.size())); http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridRouterClientImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridRouterClientImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridRouterClientImpl.java index 12e2cc8..59833fc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridRouterClientImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridRouterClientImpl.java @@ -41,7 +41,7 @@ import org.apache.ignite.internal.client.impl.connection.GridClientConnectionRes import org.apache.ignite.internal.client.impl.connection.GridClientTopology; import org.apache.ignite.internal.client.router.GridTcpRouterConfiguration; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; +import java.util.concurrent.ConcurrentHashMap; import static org.apache.ignite.internal.client.util.GridClientUtils.applyFilter; import static org.apache.ignite.internal.client.util.GridClientUtils.restAvailable; @@ -57,7 +57,7 @@ public class GridRouterClientImpl implements GridClient { private final GridClientConfiguration cliCfg; /** TCP connection managers. */ - private final ConcurrentMap<Byte, GridClientConnectionManager> connMgrMap = new ConcurrentHashMap8<>(); + private final ConcurrentMap<Byte, GridClientConnectionManager> connMgrMap = new ConcurrentHashMap<>(); /** * Creates a new TCP client based on the given configuration. http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterNodeLocalMapImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterNodeLocalMapImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterNodeLocalMapImpl.java index 1537bb8..86b690a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterNodeLocalMapImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterNodeLocalMapImpl.java @@ -29,7 +29,7 @@ import org.apache.ignite.internal.GridKernalContext; import org.apache.ignite.internal.IgnitionEx; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; -import org.jsr166.ConcurrentHashMap8; +import java.util.concurrent.ConcurrentHashMap; /** * Implementation for node-local storage. @@ -43,7 +43,7 @@ import org.jsr166.ConcurrentHashMap8; * <p> * You can get an instance of {@code ClusterNodeLocalMapImpl} by calling {@link IgniteCluster#nodeLocalMap()} method. */ -public class ClusterNodeLocalMapImpl<K, V> extends ConcurrentHashMap8<K, V> implements ConcurrentMap<K, V>, +public class ClusterNodeLocalMapImpl<K, V> extends ConcurrentHashMap<K, V> implements ConcurrentMap<K, V>, Externalizable { /** */ private static final long serialVersionUID = 0L; http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsLogger.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsLogger.java b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsLogger.java index 0882832..f95fd4c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsLogger.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsLogger.java @@ -36,7 +36,7 @@ import org.apache.ignite.internal.IgniteInterruptedCheckedException; import org.apache.ignite.internal.util.typedef.internal.A; import org.apache.ignite.internal.util.typedef.internal.SB; import org.apache.ignite.internal.util.typedef.internal.U; -import org.jsr166.ConcurrentHashMap8; +import java.util.concurrent.ConcurrentHashMap; import org.jsr166.ConcurrentLinkedDeque8; /** @@ -100,8 +100,8 @@ public final class IgfsLogger { private static final AtomicLong CNTR = new AtomicLong(); /** Loggers. */ - private static final ConcurrentHashMap8<String, IgfsLogger> loggers = - new ConcurrentHashMap8<>(); + private static final ConcurrentHashMap<String, IgfsLogger> loggers = + new ConcurrentHashMap<>(); /** Lock for atomic logger adds/removals. */ private static final ReadWriteLock logLock = new ReentrantReadWriteLock(); http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java index 2bd9e83..f0b19f3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java @@ -23,6 +23,7 @@ import java.util.Collection; import java.util.Collections; import java.util.Set; import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.cluster.ClusterNode; @@ -48,7 +49,6 @@ import org.apache.ignite.spi.IgniteSpiException; import org.apache.ignite.spi.checkpoint.CheckpointListener; import org.apache.ignite.spi.checkpoint.CheckpointSpi; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; import static org.apache.ignite.events.EventType.EVT_CHECKPOINT_LOADED; import static org.apache.ignite.events.EventType.EVT_CHECKPOINT_REMOVED; @@ -86,7 +86,7 @@ public class GridCheckpointManager extends GridManagerAdapter<CheckpointSpi> { marsh = ctx.config().getMarshaller(); if (enabled()) { - keyMap = new ConcurrentHashMap8<>(); + keyMap = new ConcurrentHashMap<>(); closedSess = new GridBoundedConcurrentLinkedHashSet<>(MAX_CLOSED_SESS, MAX_CLOSED_SESS, http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java index 3a7ac69..b2e9735 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java @@ -96,7 +96,6 @@ import org.apache.ignite.spi.communication.CommunicationListener; import org.apache.ignite.spi.communication.CommunicationSpi; import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; import org.jsr166.ConcurrentLinkedDeque8; import static org.apache.ignite.events.EventType.EVT_NODE_FAILED; @@ -140,7 +139,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa private static final ThreadLocal<Byte> CUR_PLC = new ThreadLocal<>(); /** Listeners by topic. */ - private final ConcurrentMap<Object, GridMessageListener> lsnrMap = new ConcurrentHashMap8<>(); + private final ConcurrentMap<Object, GridMessageListener> lsnrMap = new ConcurrentHashMap<>(); /** System listeners. */ private volatile GridMessageListener[] sysLsnrs; @@ -159,14 +158,14 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa /** */ private final ConcurrentMap<Object, ConcurrentMap<UUID, GridCommunicationMessageSet>> msgSetMap = - new ConcurrentHashMap8<>(); + new ConcurrentHashMap<>(); /** Local node ID. */ private final UUID locNodeId; /** Cache for messages that were received prior to discovery. */ private final ConcurrentMap<UUID, ConcurrentLinkedDeque8<DelayedMessage>> waitMap = - new ConcurrentHashMap8<>(); + new ConcurrentHashMap<>(); /** Communication message listener. */ private CommunicationListener<Serializable> commLsnr; @@ -2800,7 +2799,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa /** * */ - private static class ConcurrentHashMap0<K, V> extends ConcurrentHashMap8<K, V> { + private static class ConcurrentHashMap0<K, V> extends ConcurrentHashMap<K, V> { /** */ private static final long serialVersionUID = 0L; http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java index b220040..e29a316 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java @@ -159,14 +159,14 @@ import org.apache.ignite.spi.communication.tcp.messages.HandshakeMessage; import org.apache.ignite.spi.communication.tcp.messages.HandshakeMessage2; import org.apache.ignite.spi.communication.tcp.messages.NodeIdMessage; import org.apache.ignite.spi.communication.tcp.messages.RecoveryLastReceivedMessage; -import org.jsr166.ConcurrentHashMap8; +import java.util.concurrent.ConcurrentHashMap; /** * Message factory implementation. */ public class GridIoMessageFactory implements MessageFactory { /** Custom messages registry. Used for test purposes. */ - private static final Map<Short, IgniteOutClosure<Message>> CUSTOM = new ConcurrentHashMap8<>(); + private static final Map<Short, IgniteOutClosure<Message>> CUSTOM = new ConcurrentHashMap<>(); /** Extensions. */ private final MessageFactory[] ext; http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeployment.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeployment.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeployment.java index f5aafb2..c3efc59 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeployment.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeployment.java @@ -46,7 +46,7 @@ import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteBiTuple; import org.apache.ignite.lang.IgniteUuid; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; +import java.util.concurrent.ConcurrentHashMap; /** * Represents single class deployment. @@ -84,30 +84,30 @@ public class GridDeployment extends GridMetadataAwareAdapter implements GridDepl @GridToStringExclude private final ConcurrentMap<Class<?>, ConcurrentMap<Class<? extends Annotation>, GridTuple<Annotation>>> anns = - new ConcurrentHashMap8<>(); + new ConcurrentHashMap<>(); /** Classes. */ @GridToStringExclude - private final ConcurrentMap<String, Class<?>> clss = new ConcurrentHashMap8<>(); + private final ConcurrentMap<String, Class<?>> clss = new ConcurrentHashMap<>(); /** Task classes 'internal' flags. */ @GridToStringExclude - private final ConcurrentMap<Class<?>, Boolean> internalTasks = new ConcurrentHashMap8<>(); + private final ConcurrentMap<Class<?>, Boolean> internalTasks = new ConcurrentHashMap<>(); /** Field cache. */ @GridToStringExclude private final ConcurrentMap<Class<?>, ConcurrentMap<Class<? extends Annotation>, Collection<Field>>> fieldCache = - new ConcurrentHashMap8<>(); + new ConcurrentHashMap<>(); /** Method cache. */ @GridToStringExclude private final ConcurrentMap<Class<?>, ConcurrentMap<Class<? extends Annotation>, Collection<Method>>> mtdCache = - new ConcurrentHashMap8<>(); + new ConcurrentHashMap<>(); /** Default constructor cache. */ @GridToStringExclude private final ConcurrentMap<Class<?>, GridTuple<Constructor<?>>> dfltCtorsCache = - new ConcurrentHashMap8<>(); + new ConcurrentHashMap<>(); /** * @param depMode Deployment mode. @@ -342,7 +342,7 @@ public class GridDeployment extends GridMetadataAwareAdapter implements GridDepl if (clsAnns == null) { ConcurrentMap<Class<? extends Annotation>, GridTuple<Annotation>> old = anns.putIfAbsent(cls, - clsAnns = new ConcurrentHashMap8<>()); + clsAnns = new ConcurrentHashMap<>()); if (old != null) clsAnns = old; http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentClassLoader.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentClassLoader.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentClassLoader.java index 78f1066..ca9ce32 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentClassLoader.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentClassLoader.java @@ -26,6 +26,7 @@ import java.util.HashMap; import java.util.LinkedList; import java.util.Map; import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteLogger; @@ -40,7 +41,6 @@ import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteUuid; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; /** * Class loader that is able to resolve task subclasses and resources @@ -179,7 +179,7 @@ class GridDeploymentClassLoader extends ClassLoader implements GridDeploymentInf missedRsrcs = missedResourcesCacheSize > 0 ? new GridBoundedLinkedHashSet<String>(missedResourcesCacheSize) : null; - byteMap = clsBytesCacheEnabled ? new ConcurrentHashMap8<String, byte[]>() : null; + byteMap = clsBytesCacheEnabled ? new ConcurrentHashMap<String, byte[]>() : null; this.quiet = quiet; } @@ -251,7 +251,7 @@ class GridDeploymentClassLoader extends ClassLoader implements GridDeploymentInf missedRsrcs = missedResourcesCacheSize > 0 ? new GridBoundedLinkedHashSet<String>(missedResourcesCacheSize) : null; - byteMap = clsBytesCacheEnabled ? new ConcurrentHashMap8<String, byte[]>() : null; + byteMap = clsBytesCacheEnabled ? new ConcurrentHashMap<String, byte[]>() : null; this.quiet = quiet; } http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStore.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStore.java index ab45708..14581f6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStore.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStore.java @@ -25,6 +25,7 @@ import java.util.Iterator; import java.util.Map; import java.util.Map.Entry; import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.compute.ComputeTask; @@ -45,7 +46,6 @@ import org.apache.ignite.spi.deployment.DeploymentListener; import org.apache.ignite.spi.deployment.DeploymentResource; import org.apache.ignite.spi.deployment.DeploymentSpi; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; import org.jsr166.ConcurrentLinkedDeque8; import static org.apache.ignite.events.EventType.EVT_CLASS_DEPLOYED; @@ -61,7 +61,7 @@ import static org.apache.ignite.events.EventType.EVT_TASK_UNDEPLOYED; class GridDeploymentLocalStore extends GridDeploymentStoreAdapter { /** Deployment cache by class name. */ private final ConcurrentMap<String, ConcurrentLinkedDeque8<GridDeployment>> cache = - new ConcurrentHashMap8<>(); + new ConcurrentHashMap<>(); /** Mutex. */ private final Object mux = new Object(); http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java index 8447c97..14aa49f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java @@ -27,6 +27,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.configuration.DeploymentMode; @@ -49,7 +50,6 @@ import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.marshaller.AbstractMarshaller; import org.apache.ignite.spi.deployment.DeploymentSpi; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; import static org.apache.ignite.configuration.DeploymentMode.CONTINUOUS; import static org.apache.ignite.configuration.DeploymentMode.SHARED; @@ -99,7 +99,7 @@ public class GridDeploymentPerVersionStore extends GridDeploymentStoreAdapter { missedRsrcCacheSize = ctx.config().getPeerClassLoadingMissedResourcesCacheSize(); - rsrcCache = new ConcurrentHashMap8<>(); + rsrcCache = new ConcurrentHashMap<>(); } /** {@inheritDoc} */ @@ -722,7 +722,7 @@ public class GridDeploymentPerVersionStore extends GridDeploymentStoreAdapter { if (found || missedRsrcCacheSize > 0) { if (ldrRsrcCache == null) ldrRsrcCache = F.addIfAbsent(rsrcCache, meta.classLoaderId(), - new ConcurrentHashMap8<String, Boolean>()); + new ConcurrentHashMap<String, Boolean>()); // This is the only place where cache could have been changed, // so we remove only here if classloader have been undeployed http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java index 7f844ea..e336667 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java @@ -124,7 +124,6 @@ import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNode; import org.apache.ignite.thread.IgniteThread; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.apache.ignite.IgniteSystemProperties.IGNITE_BINARY_MARSHALLER_USE_STRING_SERIALIZATION_VER_2; @@ -267,7 +266,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> { /** Custom event listener. */ private ConcurrentMap<Class<?>, List<CustomEventListener<DiscoveryCustomMessage>>> customEvtLsnrs = - new ConcurrentHashMap8<>(); + new ConcurrentHashMap<>(); /** Local node initialization event listeners. */ private final Collection<IgniteInClosure<ClusterNode>> locNodeInitLsnrs = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java index 2b9a5ee..6808450 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java @@ -30,6 +30,7 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.locks.ReadWriteLock; @@ -68,7 +69,6 @@ import org.apache.ignite.spi.eventstorage.EventStorageSpi; import org.apache.ignite.spi.eventstorage.NoopEventStorageSpi; import org.apache.ignite.spi.eventstorage.memory.MemoryEventStorageSpi; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; import static org.apache.ignite.events.EventType.EVTS_ALL; import static org.apache.ignite.events.EventType.EVTS_DISCOVERY_ALL; @@ -84,7 +84,7 @@ import static org.apache.ignite.internal.managers.communication.GridIoPolicy.PUB */ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi> { /** Local event listeners. */ - private final ConcurrentMap<Integer, Listeners> lsnrs = new ConcurrentHashMap8<>(); + private final ConcurrentMap<Integer, Listeners> lsnrs = new ConcurrentHashMap<>(); /** Busy lock to control activity of threads. */ private final ReadWriteLock busyLock = new ReentrantReadWriteLock(); http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshaller.java index 0a54be2..d93daab 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshaller.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshaller.java @@ -29,7 +29,7 @@ import org.apache.ignite.IgniteSystemProperties; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.marshaller.AbstractNodeNameAwareMarshaller; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; +import java.util.concurrent.ConcurrentHashMap; import sun.misc.Unsafe; import static org.apache.ignite.IgniteSystemProperties.IGNITE_OPTIMIZED_MARSHALLER_USE_DEFAULT_SUID; @@ -97,7 +97,7 @@ public class OptimizedMarshaller extends AbstractNodeNameAwareMarshaller { private OptimizedMarshallerIdMapper mapper; /** Class descriptors by class. */ - private final ConcurrentMap<Class, OptimizedClassDescriptor> clsMap = new ConcurrentHashMap8<>(); + private final ConcurrentMap<Class, OptimizedClassDescriptor> clsMap = new ConcurrentHashMap<>(); /** * Creates new marshaller will all defaults. http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java index 9c9fb8f..128eaf0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java @@ -63,7 +63,7 @@ import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.lang.IgniteUuid; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; +import java.util.concurrent.ConcurrentHashMap; import static org.apache.ignite.cache.CacheMode.LOCAL; import static org.apache.ignite.events.EventType.EVT_NODE_FAILED; @@ -87,7 +87,7 @@ public class GridAffinityProcessor extends GridProcessorAdapter { private static final long ERROR_WAIT = 500; /** Affinity map. */ - private final ConcurrentMap<AffinityAssignmentKey, IgniteInternalFuture<AffinityInfo>> affMap = new ConcurrentHashMap8<>(); + private final ConcurrentMap<AffinityAssignmentKey, IgniteInternalFuture<AffinityInfo>> affMap = new ConcurrentHashMap<>(); /** Listener. */ private final GridLocalEventListener lsnr = new GridLocalEventListener() { http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java index 7bf793c..9ab052d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java @@ -73,7 +73,6 @@ import org.apache.ignite.lang.IgniteClosure; import org.apache.ignite.lang.IgniteInClosure; import org.apache.ignite.lang.IgniteUuid; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; import static org.apache.ignite.cache.CacheMode.LOCAL; import static org.apache.ignite.cache.CacheRebalanceMode.NONE; @@ -121,7 +120,7 @@ public class CacheAffinitySharedManager<K, V> extends GridCacheSharedManagerAdap /** Pending affinity assignment futures. */ private final ConcurrentMap<Long, GridDhtAssignmentFetchFuture> pendingAssignmentFetchFuts = - new ConcurrentHashMap8<>(); + new ConcurrentHashMap<>(); /** */ private final ThreadLocal<ClientCacheChangeDiscoveryMessage> clientCacheChanges = new ThreadLocal<>(); http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStoreBalancingWrapper.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStoreBalancingWrapper.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStoreBalancingWrapper.java index 5cc4ded..6abcfa8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStoreBalancingWrapper.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStoreBalancingWrapper.java @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import javax.cache.Cache; import javax.cache.integration.CacheLoaderException; @@ -34,7 +35,6 @@ import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.lang.IgniteBiInClosure; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; /** * Cache store wrapper that ensures that there will be no more that one thread loading value from underlying store. @@ -47,7 +47,7 @@ public class CacheStoreBalancingWrapper<K, V> implements CacheStore<K, V> { private CacheStore<K, V> delegate; /** Pending cache store loads. */ - private ConcurrentMap<K, LoadFuture> pendingLoads = new ConcurrentHashMap8<>(); + private ConcurrentMap<K, LoadFuture> pendingLoads = new ConcurrentHashMap<>(); /** Load all threshold. */ private int loadAllThreshold = DFLT_LOAD_ALL_THRESHOLD; http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheWeakQueryIteratorsHolder.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheWeakQueryIteratorsHolder.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheWeakQueryIteratorsHolder.java index 2e03b53..d414c80 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheWeakQueryIteratorsHolder.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheWeakQueryIteratorsHolder.java @@ -22,13 +22,13 @@ import java.lang.ref.ReferenceQueue; import java.lang.ref.WeakReference; import java.util.Map; import java.util.NoSuchElementException; +import java.util.concurrent.ConcurrentHashMap; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteLogger; import org.apache.ignite.internal.processors.cache.query.CacheQueryFuture; import org.apache.ignite.internal.util.GridCloseableIteratorAdapter; import org.apache.ignite.internal.util.lang.GridCloseableIterator; import org.apache.ignite.internal.util.typedef.internal.U; -import org.jsr166.ConcurrentHashMap8; /** * @param <V> Type for cache query future. @@ -38,7 +38,7 @@ public class CacheWeakQueryIteratorsHolder<V> { private final ReferenceQueue refQueue = new ReferenceQueue(); /** Iterators futures. */ - private final Map<WeakReference, AutoCloseable> refs = new ConcurrentHashMap8<>(); + private final Map<WeakReference, AutoCloseable> refs = new ConcurrentHashMap<>(); /** Logger. */ private final IgniteLogger log; http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java index c40ed98..b70439a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java @@ -23,6 +23,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.locks.ReadWriteLock; @@ -51,7 +52,6 @@ import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteUuid; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; import org.jsr166.ConcurrentLinkedHashMap; import static org.apache.ignite.configuration.DeploymentMode.CONTINUOUS; @@ -71,10 +71,10 @@ public class GridCacheDeploymentManager<K, V> extends GridCacheSharedManagerAdap private final Map<String, List<CA>> undeploys = new HashMap<>(); /** Per-thread deployment context. */ - private ConcurrentMap<IgniteUuid, CachedDeploymentInfo<K, V>> deps = new ConcurrentHashMap8<>(); + private ConcurrentMap<IgniteUuid, CachedDeploymentInfo<K, V>> deps = new ConcurrentHashMap<>(); /** Collection of all known participants (Node ID -> Loader ID). */ - private Map<UUID, IgniteUuid> allParticipants = new ConcurrentHashMap8<>(); + private Map<UUID, IgniteUuid> allParticipants = new ConcurrentHashMap<>(); /** Discovery listener. */ private GridLocalEventListener discoLsnr; http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java index e6e40e2..11a416f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java @@ -24,6 +24,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; @@ -88,7 +89,6 @@ import org.apache.ignite.lang.IgniteBiInClosure; import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.thread.IgniteThread; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; import static org.apache.ignite.internal.GridTopic.TOPIC_CACHE; import static org.apache.ignite.internal.util.IgniteUtils.nl; @@ -1572,11 +1572,11 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter { /** Handler registry. */ ConcurrentMap<ListenerKey, IgniteBiInClosure<UUID, GridCacheMessage>> - clsHandlers = new ConcurrentHashMap8<>(); + clsHandlers = new ConcurrentHashMap<>(); /** Ordered handler registry. */ ConcurrentMap<Object, IgniteBiInClosure<UUID, ? extends GridCacheMessage>> orderedHandlers = - new ConcurrentHashMap8<>(); + new ConcurrentHashMap<>(); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLocalConcurrentMap.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLocalConcurrentMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLocalConcurrentMap.java index 63cfe1f..8d2a1e3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLocalConcurrentMap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLocalConcurrentMap.java @@ -18,8 +18,8 @@ package org.apache.ignite.internal.processors.cache; +import java.util.concurrent.ConcurrentHashMap; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; /** * GridCacheConcurrentMap implementation for local and near caches. @@ -41,7 +41,7 @@ public class GridCacheLocalConcurrentMap extends GridCacheConcurrentMapImpl { this.cacheId = cctx.cacheId(); this.entryMap = new CacheMapHolder(cctx, - new ConcurrentHashMap8<KeyCacheObject, GridCacheMapEntry>(initCap, 0.75f, Runtime.getRuntime().availableProcessors() * 2)); + new ConcurrentHashMap<KeyCacheObject, GridCacheMapEntry>(initCap, 0.75f, Runtime.getRuntime().availableProcessors() * 2)); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java index a7d9ce7..a1c1792 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java @@ -64,7 +64,7 @@ import org.apache.ignite.lang.IgniteFuture; import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.lang.IgniteUuid; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; +import java.util.concurrent.ConcurrentHashMap; import org.jsr166.ConcurrentLinkedDeque8; import static org.apache.ignite.IgniteSystemProperties.IGNITE_MAX_NESTED_LISTENER_CALLS; @@ -110,13 +110,13 @@ public class GridCacheMvccManager extends GridCacheSharedManagerAdapter { private final ConcurrentMap<GridCacheVersion, Collection<GridCacheVersionedFuture<?>>> verFuts = newMap(); /** Pending atomic futures. */ - private final ConcurrentHashMap8<Long, GridCacheAtomicFuture<?>> atomicFuts = new ConcurrentHashMap8<>(); + private final ConcurrentHashMap<Long, GridCacheAtomicFuture<?>> atomicFuts = new ConcurrentHashMap<>(); /** Pending data streamer futures. */ private final GridConcurrentHashSet<DataStreamerFuture> dataStreamerFuts = new GridConcurrentHashSet<>(); /** */ - private final ConcurrentMap<IgniteUuid, GridCacheFuture<?>> futs = new ConcurrentHashMap8<>(); + private final ConcurrentMap<IgniteUuid, GridCacheFuture<?>> futs = new ConcurrentHashMap<>(); /** Near to DHT version mapping. */ private final ConcurrentMap<GridCacheVersion, GridCacheVersion> near2dht = newMap(); @@ -1195,7 +1195,7 @@ public class GridCacheMvccManager extends GridCacheSharedManagerAdapter { /** */ @GridToStringInclude private final Map<IgniteTxKey, Collection<GridCacheMvccCandidate>> pendingLocks = - new ConcurrentHashMap8<>(); + new ConcurrentHashMap<>(); /** * @param topVer Topology version. http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java index 8aa6db9..1bd5591 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java @@ -111,7 +111,7 @@ import org.apache.ignite.lang.IgniteProductVersion; import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.thread.IgniteThread; 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.IgniteSystemProperties.IGNITE_IO_DUMP_ON_TIMEOUT; @@ -160,7 +160,7 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana /** */ @GridToStringExclude - private final ConcurrentMap<Integer, GridClientPartitionTopology> clientTops = new ConcurrentHashMap8<>(); + private final ConcurrentMap<Integer, GridClientPartitionTopology> clientTops = new ConcurrentHashMap<>(); /** */ @Nullable private volatile GridDhtPartitionsExchangeFuture lastInitializedFut; http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java index cb01532..c2f9229 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java @@ -23,8 +23,10 @@ import java.util.LinkedList; import java.util.List; import java.util.ListIterator; import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicIntegerArray; +import java.util.function.BiFunction; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteLogger; import org.apache.ignite.IgniteSystemProperties; @@ -68,7 +70,6 @@ import org.apache.ignite.lang.IgniteInClosure; import org.apache.ignite.marshaller.Marshaller; import org.apache.ignite.plugin.PluginProvider; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; import static org.apache.ignite.IgniteSystemProperties.IGNITE_LOCAL_STORE_KEEPS_PRIMARY_ONLY; @@ -126,7 +127,7 @@ public class GridCacheSharedContext<K, V> { private GridCacheSharedTtlCleanupManager ttlMgr; /** Cache contexts map. */ - private ConcurrentHashMap8<Integer, GridCacheContext<K, V>> ctxMap; + private ConcurrentHashMap<Integer, GridCacheContext<K, V>> ctxMap; /** Tx metrics. */ private volatile TransactionMetricsAdapter txMetrics; @@ -210,7 +211,7 @@ public class GridCacheSharedContext<K, V> { txMetrics = new TransactionMetricsAdapter(); - ctxMap = new ConcurrentHashMap8<>(); + ctxMap = new ConcurrentHashMap<>(); locStoreCnt = new AtomicInteger(); @@ -464,12 +465,10 @@ public class GridCacheSharedContext<K, V> { void forAllCaches(final IgniteInClosure<GridCacheContext> c) { for (Integer cacheId : ctxMap.keySet()) { ctxMap.computeIfPresent(cacheId, - new ConcurrentHashMap8.BiFun<Integer, GridCacheContext<K, V>, GridCacheContext<K, V>>() { - @Override public GridCacheContext<K, V> apply(Integer cacheId, GridCacheContext<K, V> ctx) { - c.apply(ctx); + (cacheId1, ctx) -> { + c.apply(ctx); - return ctx; - } + return ctx; } ); } http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java index 0d63fc0..9875f64 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java @@ -29,6 +29,7 @@ import java.util.Map; import java.util.Set; import java.util.UUID; import java.util.concurrent.Callable; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.atomic.AtomicBoolean; import javax.cache.Cache; @@ -103,7 +104,6 @@ import org.apache.ignite.transactions.TransactionIsolation; import org.apache.ignite.transactions.TransactionRollbackException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; import static org.apache.ignite.IgniteSystemProperties.IGNITE_SKIP_CONFIGURATION_CONSISTENCY_CHECK; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; @@ -595,7 +595,7 @@ public class GridCacheUtils { */ public static <K, V> IgniteReducer<Map<K, V>, Map<K, V>> mapsReducer(final int size) { return new IgniteReducer<Map<K, V>, Map<K, V>>() { - private final Map<K, V> ret = new ConcurrentHashMap8<>(size); + private final Map<K, V> ret = new ConcurrentHashMap<>(size); @Override public boolean collect(Map<K, V> map) { if (map != null) http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridDeferredAckMessageSender.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridDeferredAckMessageSender.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridDeferredAckMessageSender.java index a8e8226..c3dbf3f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridDeferredAckMessageSender.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridDeferredAckMessageSender.java @@ -26,7 +26,7 @@ import org.apache.ignite.internal.processors.timeout.GridTimeoutObject; import org.apache.ignite.internal.processors.timeout.GridTimeoutProcessor; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteUuid; -import org.jsr166.ConcurrentHashMap8; +import java.util.concurrent.ConcurrentHashMap; import org.jsr166.ConcurrentLinkedDeque8; /** @@ -34,7 +34,7 @@ import org.jsr166.ConcurrentLinkedDeque8; */ public abstract class GridDeferredAckMessageSender<T> { /** Deferred message buffers. */ - private ConcurrentMap<UUID, DeferredAckMessageBuffer> deferredAckMsgBuffers = new ConcurrentHashMap8<>(); + private ConcurrentMap<UUID, DeferredAckMessageBuffer> deferredAckMsgBuffers = new ConcurrentHashMap<>(); /** Timeout processor. */ private GridTimeoutProcessor time; http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataTransport.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataTransport.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataTransport.java index def7caa..e2eef28 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataTransport.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataTransport.java @@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache.binary; import java.util.List; import java.util.Queue; import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.CopyOnWriteArrayList; @@ -44,7 +45,6 @@ import org.apache.ignite.internal.util.future.GridFutureAdapter; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteInClosure; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; import static org.apache.ignite.events.EventType.EVT_NODE_FAILED; import static org.apache.ignite.events.EventType.EVT_NODE_LEFT; @@ -81,10 +81,10 @@ final class BinaryMetadataTransport { private final Queue<MetadataUpdateResultFuture> unlabeledFutures = new ConcurrentLinkedQueue<>(); /** */ - private final ConcurrentMap<SyncKey, MetadataUpdateResultFuture> syncMap = new ConcurrentHashMap8<>(); + private final ConcurrentMap<SyncKey, MetadataUpdateResultFuture> syncMap = new ConcurrentHashMap<>(); /** */ - private final ConcurrentMap<Integer, ClientMetadataRequestFuture> clientReqSyncMap = new ConcurrentHashMap8<>(); + private final ConcurrentMap<Integer, ClientMetadataRequestFuture> clientReqSyncMap = new ConcurrentHashMap<>(); /** */ private volatile boolean stopping; http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java index 2a374a2..3a0ba3c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java @@ -86,7 +86,6 @@ import org.apache.ignite.spi.discovery.DiscoveryDataBag.GridDiscoveryData; import org.apache.ignite.spi.discovery.IgniteDiscoveryThread; import org.apache.ignite.thread.IgniteThread; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; import static org.apache.ignite.IgniteSystemProperties.IGNITE_SKIP_CONFIGURATION_CONSISTENCY_CHECK; import static org.apache.ignite.IgniteSystemProperties.getBoolean; @@ -135,7 +134,7 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm }; /** Locally cached metadata. This local cache is managed by exchanging discovery custom events. */ - private final ConcurrentMap<Integer, BinaryMetadataHolder> metadataLocCache = new ConcurrentHashMap8<>(); + private final ConcurrentMap<Integer, BinaryMetadataHolder> metadataLocCache = new ConcurrentHashMap<>(); /** */ private BinaryMetadataTransport transport; http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java index a9b60228..cd0edf3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java @@ -70,7 +70,7 @@ import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.resources.IgniteInstanceResource; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; +import java.util.concurrent.ConcurrentHashMap; import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.internal.GridClosureCallMode.BROADCAST; @@ -107,7 +107,7 @@ public class CacheDataStructuresManager extends GridCacheManagerAdapter { /** Set keys used for set iteration. */ private ConcurrentMap<IgniteUuid, GridConcurrentHashSet<SetItemKey>> setDataMap = - new ConcurrentHashMap8<>(); + new ConcurrentHashMap<>(); /** Queues map. */ private final ConcurrentMap<IgniteUuid, GridCacheQueueProxy> queuesMap; @@ -134,9 +134,9 @@ public class CacheDataStructuresManager extends GridCacheManagerAdapter { * */ public CacheDataStructuresManager() { - queuesMap = new ConcurrentHashMap8<>(10); + queuesMap = new ConcurrentHashMap<>(10); - setsMap = new ConcurrentHashMap8<>(10); + setsMap = new ConcurrentHashMap<>(10); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxFinishSync.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxFinishSync.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxFinishSync.java index 1e323d0..02d1e8e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxFinishSync.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxFinishSync.java @@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache.distributed; import java.util.Map; import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteLogger; @@ -30,7 +31,6 @@ import org.apache.ignite.internal.util.future.GridFutureAdapter; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.lang.IgniteFuture; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; /** * Synchronization structure for asynchronous waiting for near tx finish responses based on per-node per-thread @@ -44,7 +44,7 @@ public class GridCacheTxFinishSync<K, V> { private IgniteLogger log; /** Nodes map. */ - private ConcurrentMap<Long, ThreadFinishSync> threadMap = new ConcurrentHashMap8<>(); + private ConcurrentMap<Long, ThreadFinishSync> threadMap = new ConcurrentHashMap<>(); /** * @param cctx Cache context. @@ -125,7 +125,7 @@ public class GridCacheTxFinishSync<K, V> { private long threadId; /** Thread map. */ - private final Map<UUID, TxFinishSync> nodeMap = new ConcurrentHashMap8<>(); + private final Map<UUID, TxFinishSync> nodeMap = new ConcurrentHashMap<>(); /** * @param threadId Thread ID. http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java index 953b47d..ba55543 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java @@ -26,6 +26,7 @@ import java.util.List; import java.util.Map; import java.util.NoSuchElementException; import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import javax.cache.Cache; import javax.cache.expiry.ExpiryPolicy; @@ -85,7 +86,6 @@ import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.plugin.extensions.communication.Message; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; import static org.apache.ignite.events.EventType.EVT_NODE_FAILED; import static org.apache.ignite.events.EventType.EVT_NODE_LEFT; @@ -104,7 +104,7 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap private ThreadLocal<IgniteBiTuple<IgniteUuid, GridDhtTopologyFuture>> multiTxHolder = new ThreadLocal<>(); /** Multi tx futures. */ - private ConcurrentMap<IgniteUuid, MultiUpdateFuture> multiTxFuts = new ConcurrentHashMap8<>(); + private ConcurrentMap<IgniteUuid, MultiUpdateFuture> multiTxFuts = new ConcurrentHashMap<>(); /** Force key futures. */ private final ConcurrentMap<IgniteUuid, GridDhtForceKeysFuture<?, ?>> forceKeyFuts = newMap(); http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java index 7a982ce..077ccf8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java @@ -56,7 +56,6 @@ import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteUuid; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; import org.jsr166.ConcurrentLinkedDeque8; import static org.apache.ignite.IgniteSystemProperties.IGNITE_ATOMIC_CACHE_DELETE_HISTORY_SIZE; @@ -219,7 +218,7 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl implements * @return Entries map. */ private ConcurrentMap<KeyCacheObject, GridCacheMapEntry> createEntriesMap() { - return new ConcurrentHashMap8<>(Math.max(10, GridCacheAdapter.DFLT_START_CACHE_SIZE / grp.affinity().partitions()), + return new ConcurrentHashMap<>(Math.max(10, GridCacheAdapter.DFLT_START_CACHE_SIZE / grp.affinity().partitions()), 0.75f, Runtime.getRuntime().availableProcessors() * 2); } http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java index e0a0260..6de39f9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java @@ -27,6 +27,7 @@ import java.util.List; import java.util.ListIterator; import java.util.Map; import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicReference; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteLogger; @@ -70,7 +71,6 @@ import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.transactions.TransactionIsolation; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; import static org.apache.ignite.events.EventType.EVT_CACHE_REBALANCE_OBJECT_LOADED; import static org.apache.ignite.internal.processors.dr.GridDrType.DR_NONE; @@ -116,7 +116,7 @@ public final class GridDhtLockFuture extends GridCacheCompoundIdentityFuture<Boo /** DHT mappings. */ private Map<ClusterNode, List<GridDhtCacheEntry>> dhtMap = - new ConcurrentHashMap8<>(); + new ConcurrentHashMap<>(); /** Future ID. */ private IgniteUuid futId; http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java index c7282a8..bed9243 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java @@ -56,7 +56,7 @@ import org.apache.ignite.transactions.TransactionConcurrency; import org.apache.ignite.transactions.TransactionIsolation; import org.apache.ignite.transactions.TransactionState; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; +import java.util.concurrent.ConcurrentHashMap; import static org.apache.ignite.internal.processors.cache.GridCacheOperation.NOOP; import static org.apache.ignite.internal.processors.cache.GridCacheOperation.READ; @@ -76,10 +76,10 @@ public abstract class GridDhtTxLocalAdapter extends IgniteTxLocalAdapter { private static final long serialVersionUID = 0L; /** Near mappings. */ - protected Map<UUID, GridDistributedTxMapping> nearMap = new ConcurrentHashMap8<>(); + protected Map<UUID, GridDistributedTxMapping> nearMap = new ConcurrentHashMap<>(); /** DHT mappings. */ - protected Map<UUID, GridDistributedTxMapping> dhtMap = new ConcurrentHashMap8<>(); + protected Map<UUID, GridDistributedTxMapping> dhtMap = new ConcurrentHashMap<>(); /** Mapped flag. */ protected volatile boolean mapped; http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java index e4f4601..c10f2ca 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java @@ -26,6 +26,7 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; import java.util.concurrent.atomic.AtomicReference; import org.apache.ignite.IgniteCheckedException; @@ -79,7 +80,6 @@ import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.transactions.TransactionDeadlockException; import org.apache.ignite.transactions.TransactionIsolation; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_READ; @@ -236,7 +236,7 @@ public final class GridDhtColocatedLockFuture extends GridCacheCompoundIdentityF log = U.logger(cctx.kernalContext(), logRef, GridDhtColocatedLockFuture.class); } - valMap = new ConcurrentHashMap8<>(); + valMap = new ConcurrentHashMap<>(); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java index 695c840..73e6417 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java @@ -29,6 +29,7 @@ import java.util.Map; import java.util.Set; import java.util.UUID; import java.util.concurrent.Callable; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -101,7 +102,6 @@ import org.apache.ignite.lang.IgniteInClosure; import org.apache.ignite.lang.IgniteProductVersion; import org.apache.ignite.lang.IgniteRunnable; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; import static org.apache.ignite.IgniteSystemProperties.IGNITE_LONG_OPERATIONS_DUMP_TIMEOUT_LIMIT; import static org.apache.ignite.IgniteSystemProperties.IGNITE_PARTITION_RELEASE_FUTURE_DUMP_THRESHOLD; @@ -203,10 +203,10 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte * Messages received on non-coordinator are stored in case if this node * becomes coordinator. */ - private final Map<UUID, GridDhtPartitionsSingleMessage> pendingSingleMsgs = new ConcurrentHashMap8<>(); + private final Map<UUID, GridDhtPartitionsSingleMessage> pendingSingleMsgs = new ConcurrentHashMap<>(); /** Messages received from new coordinator. */ - private final Map<ClusterNode, GridDhtPartitionsFullMessage> fullMsgs = new ConcurrentHashMap8<>(); + private final Map<ClusterNode, GridDhtPartitionsFullMessage> fullMsgs = new ConcurrentHashMap<>(); /** */ @SuppressWarnings({"FieldCanBeLocal", "UnusedDeclaration"}) @@ -244,10 +244,10 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte private Exception changeGlobalStateE; /** Change global state exceptions. */ - private final Map<UUID, Exception> changeGlobalStateExceptions = new ConcurrentHashMap8<>(); + private final Map<UUID, Exception> changeGlobalStateExceptions = new ConcurrentHashMap<>(); /** */ - private ConcurrentMap<UUID, GridDhtPartitionsSingleMessage> msgs = new ConcurrentHashMap8<>(); + private ConcurrentMap<UUID, GridDhtPartitionsSingleMessage> msgs = new ConcurrentHashMap<>(); /** Single messages from merged 'node join' exchanges. */ @GridToStringExclude http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java index 70912de..6ff5e65 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java @@ -27,6 +27,7 @@ import java.util.Map; import java.util.Queue; import java.util.Set; import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; import java.util.concurrent.atomic.AtomicReference; import org.apache.ignite.IgniteCheckedException; @@ -75,7 +76,6 @@ import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.transactions.TransactionDeadlockException; import org.apache.ignite.transactions.TransactionIsolation; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_READ; @@ -238,7 +238,7 @@ public final class GridNearLockFuture extends GridCacheCompoundIdentityFuture<Bo if (log == null) log = U.logger(cctx.kernalContext(), logRef, GridNearLockFuture.class); - valMap = new ConcurrentHashMap8<>(); + valMap = new ConcurrentHashMap<>(); } /** {@inheritDoc} */
