http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteTxMappingsImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteTxMappingsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteTxMappingsImpl.java index 9373bc4..b12858e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteTxMappingsImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteTxMappingsImpl.java @@ -24,14 +24,14 @@ import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTx import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.S; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; +import java.util.concurrent.ConcurrentHashMap; /** * */ public class IgniteTxMappingsImpl implements IgniteTxMappings { /** */ - private final Map<UUID, GridDistributedTxMapping> mappings = new ConcurrentHashMap8<>(); + private final Map<UUID, GridDistributedTxMapping> mappings = new ConcurrentHashMap<>(); /** {@inheritDoc} */ @Override public void clear() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileWriteAheadLogManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileWriteAheadLogManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileWriteAheadLogManager.java index 6b8be7e..9b75463 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileWriteAheadLogManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileWriteAheadLogManager.java @@ -42,6 +42,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.TreeSet; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.PriorityBlockingQueue; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; @@ -108,7 +109,6 @@ 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 static java.nio.file.StandardOpenOption.CREATE; import static java.nio.file.StandardOpenOption.READ; @@ -3091,7 +3091,7 @@ public class FileWriteAheadLogManager extends GridCacheSharedManagerAdapter impl //TODO: replace with GC free data structure. /** Parked threads. */ - final Map<Thread, Long> waiters = new ConcurrentHashMap8<>(); + final Map<Thread, Long> waiters = new ConcurrentHashMap<>(); /** * Default constructor. http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java index b860f02..b9c24a3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java @@ -50,7 +50,7 @@ import org.apache.ignite.lang.IgniteClosure; import org.apache.ignite.lang.IgniteFuture; import org.apache.ignite.lang.IgniteReducer; 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; @@ -74,11 +74,11 @@ public class GridCacheDistributedQueryManager<K, V> extends GridCacheQueryManage private static final String TOPIC_PREFIX = "QUERY"; /** {request ID -> thread} */ - private ConcurrentMap<Long, Thread> threads = new ConcurrentHashMap8<>(); + private ConcurrentMap<Long, Thread> threads = new ConcurrentHashMap<>(); /** {request ID -> future} */ private ConcurrentMap<Long, GridCacheDistributedQueryFuture<?, ?, ?>> futs = - new ConcurrentHashMap8<>(); + new ConcurrentHashMap<>(); /** Received requests to cancel. */ private Collection<CancelMessageId> cancelIds = http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java index ea19c2f..6f21bd6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java @@ -38,7 +38,9 @@ import java.util.Queue; 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.function.BiFunction; import javax.cache.Cache; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCheckedException; @@ -120,7 +122,6 @@ import org.apache.ignite.spi.indexing.IndexingQueryFilter; import org.apache.ignite.spi.indexing.IndexingQueryFilterImpl; import org.apache.ignite.spi.indexing.IndexingSpi; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; import static org.apache.ignite.IgniteSystemProperties.IGNITE_QUIET; import static org.apache.ignite.cache.CacheMode.LOCAL; @@ -164,14 +165,11 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte }; /** Function to merge query detail metrics. */ - private static final ConcurrentHashMap8.BiFun QRY_DETAIL_METRICS_MERGE_FX = - new ConcurrentHashMap8.BiFun<GridCacheQueryDetailMetricsAdapter, - GridCacheQueryDetailMetricsAdapter, GridCacheQueryDetailMetricsAdapter>() { - @Override public GridCacheQueryDetailMetricsAdapter apply(GridCacheQueryDetailMetricsAdapter oldVal, - GridCacheQueryDetailMetricsAdapter newVal) { - return oldVal.aggregate(newVal); - } - }; + private static final BiFunction< + GridCacheQueryDetailMetricsAdapter, + GridCacheQueryDetailMetricsAdapter, + GridCacheQueryDetailMetricsAdapter> + QRY_DETAIL_METRICS_MERGE_FX = GridCacheQueryDetailMetricsAdapter::aggregate; /** Default is @{code true} */ private final boolean isIndexingSpiAllowsBinary = !IgniteSystemProperties.getBoolean(IgniteSystemProperties.IGNITE_UNWRAP_BINARY_FOR_INDEXING_SPI); @@ -192,17 +190,17 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte private int detailMetricsSz; /** */ - private ConcurrentHashMap8<GridCacheQueryDetailMetricsKey, GridCacheQueryDetailMetricsAdapter> detailMetrics; + private ConcurrentHashMap<GridCacheQueryDetailMetricsKey, GridCacheQueryDetailMetricsAdapter> detailMetrics; /** */ - private final ConcurrentMap<UUID, RequestFutureMap> qryIters = new ConcurrentHashMap8<>(); + private final ConcurrentMap<UUID, RequestFutureMap> qryIters = new ConcurrentHashMap<>(); /** */ private final ConcurrentMap<UUID, Map<Long, GridFutureAdapter<FieldsResult>>> fieldsQryRes = - new ConcurrentHashMap8<>(); + new ConcurrentHashMap<>(); /** */ - private volatile ConcurrentMap<Object, CachedResult<?>> qryResCache = new ConcurrentHashMap8<>(); + private volatile ConcurrentMap<Object, CachedResult<?>> qryResCache = new ConcurrentHashMap<>(); /** */ private final GridSpinBusyLock busyLock = new GridSpinBusyLock(); @@ -236,7 +234,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte detailMetricsSz = ccfg.getQueryDetailMetricsSize(); if (detailMetricsSz > 0) - detailMetrics = new ConcurrentHashMap8<>(detailMetricsSz); + detailMetrics = new ConcurrentHashMap<>(detailMetricsSz); lsnr = new GridLocalEventListener() { @Override public void onEvent(Event evt) { @@ -373,7 +371,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte */ private void invalidateResultCache() { if (!qryResCache.isEmpty()) - qryResCache = new ConcurrentHashMap8<>(); + qryResCache = new ConcurrentHashMap<>(); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java index f40c077..f070686 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java @@ -73,7 +73,7 @@ import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.plugin.security.SecurityPermission; import org.apache.ignite.resources.LoggerResource; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; +import java.util.concurrent.ConcurrentHashMap; import static javax.cache.event.EventType.CREATED; import static javax.cache.event.EventType.EXPIRED; @@ -102,13 +102,13 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter { private static final long BACKUP_ACK_FREQ = 5000; /** Listeners. */ - private final ConcurrentMap<UUID, CacheContinuousQueryListener> lsnrs = new ConcurrentHashMap8<>(); + private final ConcurrentMap<UUID, CacheContinuousQueryListener> lsnrs = new ConcurrentHashMap<>(); /** Listeners count. */ private final AtomicInteger lsnrCnt = new AtomicInteger(); /** Internal entries listeners. */ - private final ConcurrentMap<UUID, CacheContinuousQueryListener> intLsnrs = new ConcurrentHashMap8<>(); + private final ConcurrentMap<UUID, CacheContinuousQueryListener> intLsnrs = new ConcurrentHashMap<>(); /** Internal listeners count. */ private final AtomicInteger intLsnrCnt = new AtomicInteger(); @@ -118,7 +118,7 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter { /** JCache listeners. */ private final ConcurrentMap<CacheEntryListenerConfiguration, JCacheQuery> jCacheLsnrs = - new ConcurrentHashMap8<>(); + new ConcurrentHashMap<>(); /** Ordered topic prefix. */ private String topicPrefix; http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java index 932acf6..e735342 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java @@ -28,6 +28,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 org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteClientDisconnectedException; @@ -89,7 +90,6 @@ 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 org.jsr166.ConcurrentLinkedDeque8; import org.jsr166.ConcurrentLinkedHashMap; @@ -163,7 +163,7 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter { private final ConcurrentMap<GridCacheVersion, IgniteInternalTx> nearIdMap = newMap(); /** Deadlock detection futures. */ - private final ConcurrentMap<Long, TxDeadlockFuture> deadlockDetectFuts = new ConcurrentHashMap8<>(); + private final ConcurrentMap<Long, TxDeadlockFuture> deadlockDetectFuts = new ConcurrentHashMap<>(); /** TX handler. */ private IgniteTxHandler txHnd; @@ -199,7 +199,7 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter { * to avoid future map resizings. */ private final ConcurrentMap<GridCacheVersion, GridCacheVersion> mappedVers = - new ConcurrentHashMap8<>(5120); + new ConcurrentHashMap<>(5120); /** TxDeadlock detection. */ private TxDeadlockDetection txDeadlockDetection; http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java index 571d654..026894d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java @@ -29,6 +29,7 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Map; import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.locks.Lock; @@ -84,7 +85,6 @@ import org.apache.ignite.spi.discovery.DiscoveryDataBag.GridDiscoveryData; import org.apache.ignite.spi.discovery.DiscoveryDataBag.JoiningNodeDiscoveryData; import org.apache.ignite.thread.IgniteThread; 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; @@ -102,25 +102,25 @@ import static org.apache.ignite.internal.processors.continuous.GridContinuousMes */ public class GridContinuousProcessor extends GridProcessorAdapter { /** Local infos. */ - private final ConcurrentMap<UUID, LocalRoutineInfo> locInfos = new ConcurrentHashMap8<>(); + private final ConcurrentMap<UUID, LocalRoutineInfo> locInfos = new ConcurrentHashMap<>(); /** Local infos. */ - private final ConcurrentMap<UUID, Map<UUID, LocalRoutineInfo>> clientInfos = new ConcurrentHashMap8<>(); + private final ConcurrentMap<UUID, Map<UUID, LocalRoutineInfo>> clientInfos = new ConcurrentHashMap<>(); /** Remote infos. */ - private final ConcurrentMap<UUID, RemoteRoutineInfo> rmtInfos = new ConcurrentHashMap8<>(); + private final ConcurrentMap<UUID, RemoteRoutineInfo> rmtInfos = new ConcurrentHashMap<>(); /** Start futures. */ - private final ConcurrentMap<UUID, StartFuture> startFuts = new ConcurrentHashMap8<>(); + private final ConcurrentMap<UUID, StartFuture> startFuts = new ConcurrentHashMap<>(); /** Stop futures. */ - private final ConcurrentMap<UUID, StopFuture> stopFuts = new ConcurrentHashMap8<>(); + private final ConcurrentMap<UUID, StopFuture> stopFuts = new ConcurrentHashMap<>(); /** Threads started by this processor. */ - private final Map<UUID, IgniteThread> bufCheckThreads = new ConcurrentHashMap8<>(); + private final Map<UUID, IgniteThread> bufCheckThreads = new ConcurrentHashMap<>(); /** */ - private final ConcurrentMap<IgniteUuid, SyncMessageAckFuture> syncMsgFuts = new ConcurrentHashMap8<>(); + private final ConcurrentMap<IgniteUuid, SyncMessageAckFuture> syncMsgFuts = new ConcurrentHashMap<>(); /** Stopped IDs. */ private final Collection<UUID> stopped = new HashSet<>(); http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java index 2b8a6c5..e1ab237 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java @@ -31,6 +31,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Queue; import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedDeque; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.DelayQueue; @@ -112,7 +113,6 @@ import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.plugin.security.SecurityPermission; import org.apache.ignite.stream.StreamReceiver; 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; @@ -165,7 +165,7 @@ public class DataStreamerImpl<K, V> implements IgniteDataStreamer<K, V>, Delayed /** Mapping. */ @GridToStringInclude - private ConcurrentMap<UUID, Buffer> bufMappings = new ConcurrentHashMap8<>(); + private ConcurrentMap<UUID, Buffer> bufMappings = new ConcurrentHashMap<>(); /** Discovery listener. */ private final GridLocalEventListener discoLsnr; @@ -1397,7 +1397,7 @@ public class DataStreamerImpl<K, V> implements IgniteDataStreamer<K, V>, Delayed this.node = node; locFuts = new GridConcurrentHashSet<>(); - reqs = new ConcurrentHashMap8<>(); + reqs = new ConcurrentHashMap<>(); // Cache local node flag. isLocNode = node.equals(ctx.discovery().localNode()); http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java index 99b2fa8..9b1cd68 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java @@ -22,6 +22,7 @@ import java.util.Iterator; import java.util.Map; 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 javax.cache.event.CacheEntryEvent; @@ -78,7 +79,6 @@ import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgnitePredicate; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -130,7 +130,7 @@ public final class DataStructuresProcessor extends GridProcessorAdapter implemen private final AtomicConfiguration dfltAtomicCfg; /** Map of continuous query IDs. */ - private final ConcurrentHashMap8<Integer, UUID> qryIdMap = new ConcurrentHashMap8<>(); + private final ConcurrentHashMap<Integer, UUID> qryIdMap = new ConcurrentHashMap<>(); /** Listener. */ private final GridLocalEventListener lsnr = new GridLocalEventListener() { @@ -164,7 +164,7 @@ public final class DataStructuresProcessor extends GridProcessorAdapter implemen public DataStructuresProcessor(GridKernalContext ctx) { super(ctx); - dsMap = new ConcurrentHashMap8<>(INITIAL_CAPACITY); + dsMap = new ConcurrentHashMap<>(INITIAL_CAPACITY); dfltAtomicCfg = ctx.config().getAtomicConfiguration(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClassLoader.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClassLoader.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClassLoader.java index 24367f5..e2995bc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClassLoader.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClassLoader.java @@ -25,7 +25,7 @@ import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.S; 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.File; import java.io.IOException; @@ -38,7 +38,6 @@ import java.util.HashSet; import java.util.LinkedList; import java.util.Map; import java.util.Vector; -import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; /** @@ -79,7 +78,7 @@ public class HadoopClassLoader extends URLClassLoader implements ClassCache { private static volatile Collection<URL> hadoopJars; /** */ - private static final Map<String, byte[]> bytesCache = new ConcurrentHashMap8<>(); + private static final Map<String, byte[]> bytesCache = new ConcurrentHashMap<>(); /** Class cache. */ private final ConcurrentMap<String, Class> cacheMap = new ConcurrentHashMap<>(); http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsClientSession.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsClientSession.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsClientSession.java index 943165e..0a0b17e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsClientSession.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsClientSession.java @@ -21,7 +21,7 @@ import java.io.Closeable; import java.util.Iterator; import java.util.concurrent.ConcurrentMap; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; +import java.util.concurrent.ConcurrentHashMap; /** * IGFS client session. Effectively used to manage lifecycle of opened resources and close them on @@ -29,7 +29,7 @@ import org.jsr166.ConcurrentHashMap8; */ public class IgfsClientSession { /** Session resources. */ - private ConcurrentMap<Long, Closeable> rsrcMap = new ConcurrentHashMap8<>(); + private ConcurrentMap<Long, Closeable> rsrcMap = new ConcurrentHashMap<>(); /** * Registers resource within this session. http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java index 90b5e9b..5f5b69d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java @@ -81,7 +81,7 @@ import org.apache.ignite.internal.util.worker.GridWorker; 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; import static org.apache.ignite.events.EventType.EVT_NODE_FAILED; import static org.apache.ignite.events.EventType.EVT_NODE_LEFT; @@ -116,7 +116,7 @@ public class IgfsDataManager extends IgfsManager { private DataInputBlocksWriter dataInputWriter = new DataInputBlocksWriter(); /** Pending writes future. */ - private ConcurrentMap<IgniteUuid, WriteCompletionFuture> pendingWrites = new ConcurrentHashMap8<>(); + private ConcurrentMap<IgniteUuid, WriteCompletionFuture> pendingWrites = new ConcurrentHashMap<>(); /** Affinity key generator. */ private AtomicLong affKeyGen = new AtomicLong(); @@ -134,8 +134,8 @@ public class IgfsDataManager extends IgfsManager { private String dataCacheName; /** On-going remote reads futures. */ - private final ConcurrentHashMap8<IgfsBlockKey, IgniteInternalFuture<byte[]>> rmtReadFuts = - new ConcurrentHashMap8<>(); + private final ConcurrentHashMap<IgfsBlockKey, IgniteInternalFuture<byte[]>> rmtReadFuts = + new ConcurrentHashMap<>(); /** * @@ -1599,7 +1599,7 @@ public class IgfsDataManager extends IgfsManager { private final IgniteUuid fileId; /** Pending acks. */ - private final ConcurrentMap<Long, UUID> ackMap = new ConcurrentHashMap8<>(); + private final ConcurrentMap<Long, UUID> ackMap = new ConcurrentHashMap<>(); /** Lock for map-related conditions. */ private final Lock lock = new ReentrantLock(); http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java index 5a9e10a..ff53e00 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java @@ -28,6 +28,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.concurrent.Callable; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.SynchronousQueue; import java.util.concurrent.ThreadFactory; import java.util.concurrent.atomic.AtomicInteger; @@ -95,7 +96,6 @@ import org.apache.ignite.lifecycle.LifecycleAware; import org.apache.ignite.resources.IgniteInstanceResource; import org.apache.ignite.thread.IgniteThreadPoolExecutor; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; import static org.apache.ignite.events.EventType.EVT_IGFS_DIR_DELETED; import static org.apache.ignite.events.EventType.EVT_IGFS_FILE_DELETED; @@ -145,7 +145,7 @@ public final class IgfsImpl implements IgfsEx { private final GridSpinBusyLock busyLock = new GridSpinBusyLock(); /** Writers map. */ - private final ConcurrentHashMap8<IgfsPath, IgfsFileWorkerBatch> workerMap = new ConcurrentHashMap8<>(); + private final ConcurrentHashMap<IgfsPath, IgfsFileWorkerBatch> workerMap = new ConcurrentHashMap<>(); /** Client log directory. */ private volatile String logDir; http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java index f18c438..3ed9b57 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java @@ -46,7 +46,7 @@ import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.X; import org.apache.ignite.lang.IgniteClosure; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; +import java.util.concurrent.ConcurrentHashMap; import static org.apache.ignite.IgniteSystemProperties.IGNITE_SKIP_CONFIGURATION_CONSISTENCY_CHECK; import static org.apache.ignite.IgniteSystemProperties.getBoolean; @@ -65,7 +65,7 @@ public class IgfsProcessor extends IgfsProcessorAdapter { /** */ private final ConcurrentMap<String, IgfsContext> igfsCache = - new ConcurrentHashMap8<>(); + new ConcurrentHashMap<>(); /** * @param ctx Kernal context. http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java index 7370a6a..ae9cb7e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.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 java.util.concurrent.Executor; import java.util.concurrent.RejectedExecutionException; @@ -85,7 +86,6 @@ import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.marshaller.Marshaller; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; import org.jsr166.ConcurrentLinkedHashMap; import static java.util.concurrent.TimeUnit.MILLISECONDS; @@ -126,7 +126,7 @@ public class GridJobProcessor extends GridProcessorAdapter { /** */ private final ConcurrentMap<IgniteUuid, GridJobWorker> cancelledJobs = - new ConcurrentHashMap8<>(); + new ConcurrentHashMap<>(); /** */ private final Collection<IgniteUuid> heldJobs = new GridConcurrentHashSet<>(); @@ -224,7 +224,7 @@ public class GridJobProcessor extends GridProcessorAdapter { metricsUpdateFreq = ctx.config().getMetricsUpdateFrequency(); - activeJobs = jobAlwaysActivate ? new ConcurrentHashMap8<IgniteUuid, GridJobWorker>() : + activeJobs = jobAlwaysActivate ? new ConcurrentHashMap<IgniteUuid, GridJobWorker>() : new JobsMap(1024, 0.75f, 256); passiveJobs = jobAlwaysActivate ? null : new JobsMap(1024, 0.75f, 256); http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/GridMarshallerMappingProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/GridMarshallerMappingProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/GridMarshallerMappingProcessor.java index df0c720..85b9eb5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/GridMarshallerMappingProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/GridMarshallerMappingProcessor.java @@ -21,6 +21,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.CopyOnWriteArrayList; import org.apache.ignite.IgniteCheckedException; @@ -46,7 +47,6 @@ import org.apache.ignite.lang.IgniteFuture; import org.apache.ignite.spi.discovery.DiscoveryDataBag; import org.apache.ignite.spi.discovery.DiscoveryDataBag.GridDiscoveryData; 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; @@ -84,10 +84,10 @@ public class GridMarshallerMappingProcessor extends GridProcessorAdapter { /** */ private final ConcurrentMap<MarshallerMappingItem, GridFutureAdapter<MappingExchangeResult>> mappingExchangeSyncMap - = new ConcurrentHashMap8<>(); + = new ConcurrentHashMap<>(); /** */ - private final ConcurrentMap<MarshallerMappingItem, ClientRequestFuture> clientReqSyncMap = new ConcurrentHashMap8<>(); + private final ConcurrentMap<MarshallerMappingItem, ClientRequestFuture> clientReqSyncMap = new ConcurrentHashMap<>(); /** * @param ctx Kernal context. http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/processors/offheap/GridOffHeapProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/offheap/GridOffHeapProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/offheap/GridOffHeapProcessor.java index 47407f9..94c4573 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/offheap/GridOffHeapProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/offheap/GridOffHeapProcessor.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal.processors.offheap; import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.internal.GridKernalContext; import org.apache.ignite.internal.processors.GridProcessorAdapter; @@ -34,15 +35,14 @@ import org.apache.ignite.lang.IgniteBiPredicate; import org.apache.ignite.lang.IgniteBiTuple; import org.apache.ignite.marshaller.Marshaller; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; /** * Manages offheap memory caches. */ public class GridOffHeapProcessor extends GridProcessorAdapter { /** */ - private final ConcurrentHashMap8<String, GridOffHeapPartitionedMap> offheap = - new ConcurrentHashMap8<>(); + private final ConcurrentHashMap<String, GridOffHeapPartitionedMap> offheap = + new ConcurrentHashMap<>(); /** */ private final Marshaller marsh; http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceIoc.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceIoc.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceIoc.java index 07a4fff..e7ca213 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceIoc.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceIoc.java @@ -48,7 +48,7 @@ import org.apache.ignite.resources.SpringResource; import org.apache.ignite.resources.TaskContinuousMapperResource; import org.apache.ignite.resources.TaskSessionResource; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; +import java.util.concurrent.ConcurrentHashMap; /** * Resource container contains caches for classes used for injection. @@ -56,7 +56,7 @@ import org.jsr166.ConcurrentHashMap8; */ public class GridResourceIoc { /** Task class resource mapping. Used to efficiently cleanup resources related to class loader. */ - private final ConcurrentMap<ClassLoader, Set<Class<?>>> taskMap = new ConcurrentHashMap8<>(); + private final ConcurrentMap<ClassLoader, Set<Class<?>>> taskMap = new ConcurrentHashMap<>(); /** Class descriptors cache. */ private AtomicReference<Map<Class<?>, ClassDescriptor>> clsDescs = new AtomicReference<>(); http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java index f2b2781..ff68e72 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java @@ -105,7 +105,7 @@ import org.apache.ignite.services.ServiceDescriptor; import org.apache.ignite.thread.IgniteThreadFactory; import org.apache.ignite.transactions.Transaction; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; +import java.util.concurrent.ConcurrentHashMap; import static org.apache.ignite.IgniteSystemProperties.IGNITE_SERVICES_COMPATIBILITY_MODE; import static org.apache.ignite.IgniteSystemProperties.getString; @@ -140,10 +140,10 @@ public class GridServiceProcessor extends GridProcessorAdapter implements Ignite private final Map<String, Collection<ServiceContextImpl>> locSvcs = new HashMap<>(); /** Deployment futures. */ - private final ConcurrentMap<String, GridServiceDeploymentFuture> depFuts = new ConcurrentHashMap8<>(); + private final ConcurrentMap<String, GridServiceDeploymentFuture> depFuts = new ConcurrentHashMap<>(); /** Deployment futures. */ - private final ConcurrentMap<String, GridFutureAdapter<?>> undepFuts = new ConcurrentHashMap8<>(); + private final ConcurrentMap<String, GridFutureAdapter<?>> undepFuts = new ConcurrentHashMap<>(); /** Pending compute job contexts that waiting for utility cache initialization. */ private final List<ComputeJobContext> pendingJobCtxs = new ArrayList<>(0); http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/processors/session/GridTaskSessionProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/session/GridTaskSessionProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/session/GridTaskSessionProcessor.java index 765743c..02b36eb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/session/GridTaskSessionProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/session/GridTaskSessionProcessor.java @@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.session; import java.util.Collection; 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.cluster.ClusterNode; @@ -32,14 +33,13 @@ import org.apache.ignite.internal.util.typedef.X; import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.lang.IgniteUuid; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; /** */ public class GridTaskSessionProcessor extends GridProcessorAdapter { /** Sessions (initialized to 2K number of concurrent sessions). */ private final ConcurrentMap<IgniteUuid, GridTaskSessionImpl> sesMap = - new ConcurrentHashMap8<>(2048); + new ConcurrentHashMap<>(2048); /** * @param ctx Grid kernal context. http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/util/GridAnnotationsCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridAnnotationsCache.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridAnnotationsCache.java index 3cab510..d89ee97 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridAnnotationsCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridAnnotationsCache.java @@ -18,12 +18,12 @@ package org.apache.ignite.internal.util; import java.lang.annotation.Annotation; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import org.apache.ignite.internal.util.lang.GridTuple; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.U; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; /** * Caches class loaders for classes. @@ -32,7 +32,7 @@ public final class GridAnnotationsCache { /** Annotation cache. */ private static final ConcurrentMap<Class<?>, ConcurrentMap<Class<? extends Annotation>, GridTuple<Annotation>>> anns = - new ConcurrentHashMap8<>(); + new ConcurrentHashMap<>(); /** * @param cls Class. @@ -44,7 +44,7 @@ public final class GridAnnotationsCache { 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/util/GridClassLoaderCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridClassLoaderCache.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridClassLoaderCache.java index 34bf69b..d067775 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridClassLoaderCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridClassLoaderCache.java @@ -18,10 +18,10 @@ package org.apache.ignite.internal.util; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import org.apache.ignite.internal.util.typedef.X; import org.apache.ignite.internal.util.typedef.internal.U; -import org.jsr166.ConcurrentHashMap8; /** * Caches class loaders for classes. @@ -29,7 +29,7 @@ import org.jsr166.ConcurrentHashMap8; public final class GridClassLoaderCache { /** Fields cache. */ private static final ConcurrentMap<Class<?>, ClassLoader> cache = - new ConcurrentHashMap8<>(); + new ConcurrentHashMap<>(); /** * Gets cached ClassLoader for efficiency since class loader detection has proven to be slow. http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentFactory.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentFactory.java index d1a7bb5..6a001f7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentFactory.java @@ -18,7 +18,7 @@ package org.apache.ignite.internal.util; import java.util.concurrent.ConcurrentMap; -import org.jsr166.ConcurrentHashMap8; +import java.util.concurrent.ConcurrentHashMap; /** * Concurrent map factory. @@ -37,6 +37,6 @@ public class GridConcurrentFactory { * @return New concurrent map. */ public static <K, V> ConcurrentMap<K, V> newMap() { - return new ConcurrentHashMap8<>(); + return new ConcurrentHashMap<>(); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentHashSet.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentHashSet.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentHashSet.java index 955b7b8..3291fcc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentHashSet.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridConcurrentHashSet.java @@ -18,10 +18,10 @@ package org.apache.ignite.internal.util; import java.util.Collection; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import org.apache.ignite.internal.util.typedef.internal.S; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; /** * Concurrent set implementation. @@ -35,7 +35,7 @@ public class GridConcurrentHashSet<E> extends GridSetWrapper<E> { * load factor, and concurrencyLevel. */ public GridConcurrentHashSet() { - super(new ConcurrentHashMap8<E, E>()); + super(new ConcurrentHashMap<E, E>()); } /** @@ -48,7 +48,7 @@ public class GridConcurrentHashSet<E> extends GridSetWrapper<E> { * elements is negative. */ public GridConcurrentHashSet(int initCap) { - super(new ConcurrentHashMap8<E, E>(initCap)); + super(new ConcurrentHashMap<E, E>(initCap)); } /** @@ -68,7 +68,7 @@ public class GridConcurrentHashSet<E> extends GridSetWrapper<E> { * non-positive. */ public GridConcurrentHashSet(int initCap, float loadFactor, int conLevel) { - super(new ConcurrentHashMap8<E, E>(initCap, loadFactor, conLevel)); + super(new ConcurrentHashMap<E, E>(initCap, loadFactor, conLevel)); } /** @@ -80,7 +80,7 @@ public class GridConcurrentHashSet<E> extends GridSetWrapper<E> { * @param c Collection to add. */ public GridConcurrentHashSet(Collection<E> c) { - super(new ConcurrentHashMap8<E, E>(c.size())); + super(new ConcurrentHashMap<E, E>(c.size())); addAll(c); } http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/util/GridKeyLock.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridKeyLock.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridKeyLock.java index 09a7db4..39070c3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridKeyLock.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridKeyLock.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.util; import java.util.concurrent.ConcurrentMap; import org.apache.ignite.internal.util.typedef.internal.S; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; +import java.util.concurrent.ConcurrentHashMap; /** * This is an utility class for 'splitting' locking of some resources. @@ -30,7 +30,7 @@ import org.jsr166.ConcurrentHashMap8; */ public class GridKeyLock { /** Underlying locks. */ - private final ConcurrentMap<Object, Sync> locks = new ConcurrentHashMap8<>(); + private final ConcurrentMap<Object, Sync> locks = new ConcurrentHashMap<>(); /** * @param key Key to lock. http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/util/GridLogThrottle.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLogThrottle.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLogThrottle.java index 7f30dd7..59ddd1c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLogThrottle.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLogThrottle.java @@ -17,13 +17,13 @@ package org.apache.ignite.internal.util; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import org.apache.ignite.IgniteLogger; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteBiTuple; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; /** * Grid log throttle. @@ -42,7 +42,7 @@ public class GridLogThrottle { /** Errors. */ private static final ConcurrentMap<IgniteBiTuple<Class<? extends Throwable>, String>, Long> errors = - new ConcurrentHashMap8<>(); + new ConcurrentHashMap<>(); /** * Sets system-wide log throttle timeout. http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/util/GridSynchronizedMap.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridSynchronizedMap.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridSynchronizedMap.java index e83aafd..984def5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridSynchronizedMap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridSynchronizedMap.java @@ -22,13 +22,13 @@ import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; import java.util.Map; -import org.jsr166.ConcurrentHashMap8; +import java.util.concurrent.ConcurrentHashMap; /** * Synchronized map for cache values that is safe to update in-place. Main reason for this map * is to provide snapshot-guarantee for serialization and keep concurrent iterators. */ -public class GridSynchronizedMap<K, V> extends ConcurrentHashMap8<K, V> implements Externalizable { +public class GridSynchronizedMap<K, V> extends ConcurrentHashMap<K, V> implements 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/util/IgniteUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java index 1d80a9e..cbe64cd 100755 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java @@ -241,7 +241,6 @@ import org.apache.ignite.transactions.TransactionRollbackException; import org.apache.ignite.transactions.TransactionTimeoutException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; import sun.misc.Unsafe; import static org.apache.ignite.IgniteSystemProperties.IGNITE_DISABLE_HOSTNAME_VERIFIER; @@ -307,7 +306,7 @@ public abstract class IgniteUtils { /** Cache for {@link GridPeerDeployAware} fields to speed up reflection. */ private static final ConcurrentMap<String, IgniteBiTuple<Class<?>, Collection<Field>>> p2pFields = - new ConcurrentHashMap8<>(); + new ConcurrentHashMap<>(); /** Secure socket protocol to use. */ private static final String HTTPS_PROTOCOL = "TLS"; @@ -498,7 +497,7 @@ public abstract class IgniteUtils { /** */ private static final ConcurrentMap<ClassLoader, ConcurrentMap<String, Class>> classCache = - new ConcurrentHashMap8<>(); + new ConcurrentHashMap<>(); /** */ private static volatile Boolean hasShmem; @@ -8563,7 +8562,7 @@ public abstract class IgniteUtils { ConcurrentMap<String, Class> ldrMap = classCache.get(ldr); if (ldrMap == null) { - ConcurrentMap<String, Class> old = classCache.putIfAbsent(ldr, ldrMap = new ConcurrentHashMap8<>()); + ConcurrentMap<String, Class> old = classCache.putIfAbsent(ldr, ldrMap = new ConcurrentHashMap<>()); if (old != null) ldrMap = old; @@ -10438,7 +10437,7 @@ public abstract class IgniteUtils { private final AtomicLong cnt = new AtomicLong(); /** Count. */ - private final ConcurrentMap<String, AtomicLong> cntMap = new ConcurrentHashMap8<>(); + private final ConcurrentMap<String, AtomicLong> cntMap = new ConcurrentHashMap<>(); /** * @param delegate Delegate. http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/internal/util/lang/gridfunc/ConcurrentMapFactoryCallable.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/gridfunc/ConcurrentMapFactoryCallable.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/gridfunc/ConcurrentMapFactoryCallable.java index 696944c..9b96743 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/gridfunc/ConcurrentMapFactoryCallable.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/gridfunc/ConcurrentMapFactoryCallable.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.util.lang.gridfunc; import java.util.concurrent.ConcurrentMap; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.lang.IgniteCallable; -import org.jsr166.ConcurrentHashMap8; +import java.util.concurrent.ConcurrentHashMap; /** * Concurrent hash map factory. @@ -31,7 +31,7 @@ public class ConcurrentMapFactoryCallable implements IgniteCallable<ConcurrentMa /** {@inheritDoc} */ @Override public ConcurrentMap call() { - return new ConcurrentHashMap8(); + return new ConcurrentHashMap(); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java index 39a8e8c..4ab361e 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java @@ -29,6 +29,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Queue; import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicInteger; import org.apache.ignite.IgniteLogger; @@ -55,7 +56,6 @@ import org.apache.ignite.spi.collision.CollisionContext; import org.apache.ignite.spi.collision.CollisionExternalListener; import org.apache.ignite.spi.collision.CollisionJobContext; import org.apache.ignite.spi.collision.CollisionSpi; -import org.jsr166.ConcurrentHashMap8; import org.jsr166.ConcurrentLinkedDeque8; import static org.apache.ignite.events.EventType.EVT_NODE_FAILED; @@ -282,10 +282,10 @@ public class JobStealingCollisionSpi extends IgniteSpiAdapter implements Collisi private final AtomicInteger totalStolenJobsNum = new AtomicInteger(); /** Map of sent messages. */ - private final ConcurrentMap<UUID, MessageInfo> sndMsgMap = new ConcurrentHashMap8<>(); + private final ConcurrentMap<UUID, MessageInfo> sndMsgMap = new ConcurrentHashMap<>(); /** Map of received messages. */ - private final ConcurrentMap<UUID, MessageInfo> rcvMsgMap = new ConcurrentHashMap8<>(); + private final ConcurrentMap<UUID, MessageInfo> rcvMsgMap = new ConcurrentHashMap<>(); /** */ private final Queue<ClusterNode> nodeQueue = new ConcurrentLinkedDeque8<>(); http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/LocalDeploymentSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/LocalDeploymentSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/LocalDeploymentSpi.java index c817bbe..2b18422 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/LocalDeploymentSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/LocalDeploymentSpi.java @@ -43,7 +43,7 @@ import org.apache.ignite.spi.deployment.DeploymentResourceAdapter; import org.apache.ignite.spi.deployment.DeploymentSpi; import org.apache.ignite.spi.deployment.IgnoreIfPeerClassLoadingDisabled; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; +import java.util.concurrent.ConcurrentHashMap; import org.jsr166.ConcurrentLinkedHashMap; /** @@ -178,7 +178,7 @@ public class LocalDeploymentSpi extends IgniteSpiAdapter implements DeploymentSp if (clsLdrRsrcs == null) { ConcurrentMap<String, String> old = ldrRsrcs.putIfAbsent(ldr, - clsLdrRsrcs = new ConcurrentHashMap8<>()); + clsLdrRsrcs = new ConcurrentHashMap<>()); if (old != null) clsLdrRsrcs = old; http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java index a8f13fa..f52cae4 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java @@ -101,7 +101,7 @@ import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryPingResponse; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryRingLatencyCheckMessage; 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.IgniteSystemProperties.IGNITE_DISCO_FAILED_CLIENT_RECONNECT_DELAY; @@ -136,7 +136,7 @@ class ClientImpl extends TcpDiscoveryImpl { private static final Object SPI_RECONNECT = "SPI_RECONNECT"; /** Remote nodes. */ - private final ConcurrentMap<UUID, TcpDiscoveryNode> rmtNodes = new ConcurrentHashMap8<>(); + private final ConcurrentMap<UUID, TcpDiscoveryNode> rmtNodes = new ConcurrentHashMap<>(); /** */ private final List<DiscoveryDataPacket> delayDiscoData = new ArrayList<>(); @@ -145,7 +145,7 @@ class ClientImpl extends TcpDiscoveryImpl { private final NavigableMap<Long, Collection<ClusterNode>> topHist = new TreeMap<>(); /** Remote nodes. */ - private final ConcurrentMap<UUID, GridFutureAdapter<Boolean>> pingFuts = new ConcurrentHashMap8<>(); + private final ConcurrentMap<UUID, GridFutureAdapter<Boolean>> pingFuts = new ConcurrentHashMap<>(); /** Socket writer. */ private SocketWriter sockWriter; http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java index 743964a..bdf9440 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java @@ -134,7 +134,7 @@ import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryRingLatencyCheck import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryStatusCheckMessage; 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.IgniteSystemProperties.IGNITE_BINARY_MARSHALLER_USE_STRING_SERIALIZATION_VER_2; import static org.apache.ignite.IgniteSystemProperties.IGNITE_DISCOVERY_CLIENT_RECONNECT_HISTORY_SIZE; @@ -194,7 +194,7 @@ class ServerImpl extends TcpDiscoveryImpl { private RingMessageWorker msgWorker; /** Client message workers. */ - protected ConcurrentMap<UUID, ClientMessageWorker> clientMsgWorkers = new ConcurrentHashMap8<>(); + protected ConcurrentMap<UUID, ClientMessageWorker> clientMsgWorkers = new ConcurrentHashMap<>(); /** IP finder cleaner. */ @SuppressWarnings("FieldAccessedSynchronizedAndUnsynchronized") @@ -242,7 +242,7 @@ class ServerImpl extends TcpDiscoveryImpl { /** Map with proceeding ping requests. */ private final ConcurrentMap<InetSocketAddress, GridPingFutureAdapter<IgniteBiTuple<UUID, Boolean>>> pingMap = - new ConcurrentHashMap8<>(); + new ConcurrentHashMap<>(); /** * @param adapter Adapter. http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java index 1a3a7fe..fc30405 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java @@ -54,7 +54,7 @@ import org.apache.ignite.spi.IgniteSpiMBeanAdapter; import org.apache.ignite.spi.IgniteSpiMultipleInstancesSupport; import org.apache.ignite.spi.loadbalancing.LoadBalancingSpi; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; +import java.util.concurrent.ConcurrentHashMap; import static org.apache.ignite.events.EventType.EVT_JOB_MAPPED; import static org.apache.ignite.events.EventType.EVT_NODE_FAILED; @@ -271,7 +271,7 @@ public class AdaptiveLoadBalancingSpi extends IgniteSpiAdapter implements LoadBa /** Task topologies. First pair value indicates whether or not jobs have been mapped. */ private ConcurrentMap<IgniteUuid, IgniteBiTuple<Boolean, WeightedTopology>> taskTops = - new ConcurrentHashMap8<>(); + new ConcurrentHashMap<>(); /** */ private final Map<UUID, AtomicInteger> nodeJobs = new HashMap<>(); http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java index 5472811..1876120 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java @@ -22,6 +22,7 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; import org.apache.ignite.IgniteLogger; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.compute.ComputeJob; @@ -43,7 +44,6 @@ import org.apache.ignite.spi.IgniteSpiMBeanAdapter; import org.apache.ignite.spi.IgniteSpiMultipleInstancesSupport; import org.apache.ignite.spi.loadbalancing.LoadBalancingSpi; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; import static org.apache.ignite.events.EventType.EVT_JOB_MAPPED; import static org.apache.ignite.events.EventType.EVT_TASK_FAILED; @@ -186,7 +186,7 @@ public class RoundRobinLoadBalancingSpi extends IgniteSpiAdapter implements Load /** */ private final Map<IgniteUuid, RoundRobinPerTaskLoadBalancer> perTaskBalancers = - new ConcurrentHashMap8<>(); + new ConcurrentHashMap<>(); /** Event 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/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpi.java index 2af6d44..bdd3f26 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpi.java @@ -24,6 +24,7 @@ import java.util.Map; import java.util.Random; import java.util.SortedMap; import java.util.TreeMap; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import org.apache.ignite.IgniteLogger; import org.apache.ignite.cluster.ClusterNode; @@ -48,7 +49,6 @@ import org.apache.ignite.spi.IgniteSpiMBeanAdapter; import org.apache.ignite.spi.IgniteSpiMultipleInstancesSupport; import org.apache.ignite.spi.loadbalancing.LoadBalancingSpi; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; import static org.apache.ignite.events.EventType.EVT_JOB_MAPPED; import static org.apache.ignite.events.EventType.EVT_TASK_FAILED; @@ -207,7 +207,7 @@ public class WeightedRandomLoadBalancingSpi extends IgniteSpiAdapter implements /** Task topologies. First pair value indicates whether or not jobs have been mapped. */ private ConcurrentMap<IgniteUuid, IgniteBiTuple<Boolean, WeightedTopology>> taskTops = - new ConcurrentHashMap8<>(); + new ConcurrentHashMap<>(); /** * Sets a flag to indicate whether node weights should be checked when
