Repository: ignite Updated Branches: refs/heads/master 2ab10caaa -> b4ece5fb3
http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobTracker.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobTracker.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobTracker.java index cf40497..3c2bbb1 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobTracker.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobTracker.java @@ -26,6 +26,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -80,7 +81,6 @@ import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteBiTuple; import org.apache.ignite.lang.IgniteInClosure; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.apache.ignite.internal.processors.hadoop.HadoopJobPhase.PHASE_CANCELLING; @@ -119,14 +119,14 @@ public class HadoopJobTracker extends HadoopComponent { private HadoopMapReducePlanner mrPlanner; /** All the known jobs. */ - private final ConcurrentMap<HadoopJobId, GridFutureAdapter<HadoopJobEx>> jobs = new ConcurrentHashMap8<>(); + private final ConcurrentMap<HadoopJobId, GridFutureAdapter<HadoopJobEx>> jobs = new ConcurrentHashMap<>(); /** Locally active jobs. */ - private final ConcurrentMap<HadoopJobId, JobLocalState> activeJobs = new ConcurrentHashMap8<>(); + private final ConcurrentMap<HadoopJobId, JobLocalState> activeJobs = new ConcurrentHashMap<>(); /** Locally requested finish futures. */ private final ConcurrentMap<HadoopJobId, GridFutureAdapter<HadoopJobId>> activeFinishFuts = - new ConcurrentHashMap8<>(); + new ConcurrentHashMap<>(); /** Event processing service. */ private ExecutorService evtProcSvc; http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/HadoopExecutorService.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/HadoopExecutorService.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/HadoopExecutorService.java index 9ad5bc1..2fbea68 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/HadoopExecutorService.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/HadoopExecutorService.java @@ -29,7 +29,7 @@ import org.apache.ignite.internal.util.worker.GridWorker; import org.apache.ignite.internal.util.worker.GridWorkerListener; import org.apache.ignite.internal.util.worker.GridWorkerListenerAdapter; import org.apache.ignite.thread.IgniteThread; -import org.jsr166.ConcurrentHashMap8; +import java.util.concurrent.ConcurrentHashMap; import static java.util.Collections.newSetFromMap; @@ -41,7 +41,7 @@ public class HadoopExecutorService { private final LinkedBlockingQueue<Callable<?>> queue; /** */ - private final Collection<GridWorker> workers = newSetFromMap(new ConcurrentHashMap8<GridWorker, Boolean>()); + private final Collection<GridWorker> workers = newSetFromMap(new ConcurrentHashMap<GridWorker, Boolean>()); /** */ private final AtomicInteger active = new AtomicInteger(); http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/HadoopExternalTaskExecutor.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/HadoopExternalTaskExecutor.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/HadoopExternalTaskExecutor.java index a0c4cf7..9dfea18 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/HadoopExternalTaskExecutor.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/HadoopExternalTaskExecutor.java @@ -27,6 +27,7 @@ import java.util.Collection; 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.locks.ReentrantLock; import org.apache.ignite.IgniteCheckedException; @@ -57,7 +58,6 @@ import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteBiTuple; import org.apache.ignite.spi.IgnitePortProtocol; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; import org.jsr166.ConcurrentLinkedDeque8; import static org.apache.ignite.internal.processors.hadoop.taskexecutor.HadoopTaskState.CRASHED; @@ -89,10 +89,10 @@ public class HadoopExternalTaskExecutor extends HadoopTaskExecutorAdapter { private HadoopExternalCommunication comm; /** Starting processes. */ - private final ConcurrentMap<UUID, HadoopProcess> runningProcsByProcId = new ConcurrentHashMap8<>(); + private final ConcurrentMap<UUID, HadoopProcess> runningProcsByProcId = new ConcurrentHashMap<>(); /** Starting processes. */ - private final ConcurrentMap<HadoopJobId, HadoopProcess> runningProcsByJobId = new ConcurrentHashMap8<>(); + private final ConcurrentMap<HadoopJobId, HadoopProcess> runningProcsByJobId = new ConcurrentHashMap<>(); /** Busy lock. */ private final GridSpinReadWriteLock busyLock = new GridSpinReadWriteLock(); http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopSharedMap.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopSharedMap.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopSharedMap.java index fd72821..16d7e83 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopSharedMap.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopSharedMap.java @@ -17,18 +17,18 @@ package org.apache.ignite.internal.processors.hadoop; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.jsr166.ConcurrentHashMap8; /** * For tests. */ public class HadoopSharedMap { /** */ - private static final ConcurrentMap<String, HadoopSharedMap> maps = new ConcurrentHashMap8<>(); + private static final ConcurrentMap<String, HadoopSharedMap> maps = new ConcurrentHashMap<>(); /** */ - private final ConcurrentMap<String, Object> map = new ConcurrentHashMap8<>(); + private final ConcurrentMap<String, Object> map = new ConcurrentHashMap<>(); /** * Private. http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractSelfTest.java index 44403c2..9e592de 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractSelfTest.java @@ -45,7 +45,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; */ public abstract class HadoopAbstractSelfTest extends GridCommonAbstractTest { /** */ - private static TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private TcpDiscoveryIpFinder singleTestIpFinder; /** REST port. */ protected static final int REST_PORT = ConnectorConfiguration.DFLT_TCP_PORT; @@ -112,6 +112,15 @@ public abstract class HadoopAbstractSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ + @Override protected void beforeTest() throws Exception { + super.beforeTest(); + + // IP finder should be re-created before each test, + // since predecessor grid shutdown does not guarantee finder's state cleanup. + singleTestIpFinder = new TcpDiscoveryVmIpFinder(true); + } + + /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName); @@ -125,7 +134,7 @@ public abstract class HadoopAbstractSelfTest extends GridCommonAbstractTest { TcpDiscoverySpi discoSpi = (TcpDiscoverySpi)cfg.getDiscoverySpi(); - discoSpi.setIpFinder(IP_FINDER); + discoSpi.setIpFinder(singleTestIpFinder); if (igfsEnabled()) cfg.setFileSystemConfiguration(igfsConfiguration()); @@ -238,4 +247,4 @@ public abstract class HadoopAbstractSelfTest extends GridCommonAbstractTest { protected String igfsScheme() { return "igfs://" + igfsName + "@/"; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopCommandLineTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopCommandLineTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopCommandLineTest.java index 666acdf..ce34cb2 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopCommandLineTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopCommandLineTest.java @@ -46,7 +46,6 @@ 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.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import org.jsr166.ConcurrentHashMap8; /** * Test of integration with Hadoop client via command line interface. @@ -246,8 +245,7 @@ public class HadoopCommandLineTest extends GridCommonAbstractTest { String sep = ":"; String ggClsPath = HadoopJobEx.class.getProtectionDomain().getCodeSource().getLocation().getPath() + sep + - HadoopJobTracker.class.getProtectionDomain().getCodeSource().getLocation().getPath() + sep + - ConcurrentHashMap8.class.getProtectionDomain().getCodeSource().getLocation().getPath(); + HadoopJobTracker.class.getProtectionDomain().getCodeSource().getLocation().getPath(); ProcessBuilder res = new ProcessBuilder(); http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java index 06c936b..361623c 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java @@ -161,7 +161,6 @@ import org.h2.tools.Server; import org.h2.util.JdbcUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; import static org.apache.ignite.IgniteSystemProperties.IGNITE_H2_DEBUG_CONSOLE; import static org.apache.ignite.IgniteSystemProperties.IGNITE_H2_DEBUG_CONSOLE_PORT; @@ -256,13 +255,13 @@ public class IgniteH2Indexing implements GridQueryIndexing { private Marshaller marshaller; /** Collection of schemaNames and registered tables. */ - private final ConcurrentMap<String, H2Schema> schemas = new ConcurrentHashMap8<>(); + private final ConcurrentMap<String, H2Schema> schemas = new ConcurrentHashMap<>(); /** */ private String dbUrl = "jdbc:h2:mem:"; /** */ - private final ConcurrentMap<Thread, Connection> conns = new ConcurrentHashMap8<>(); + private final ConcurrentMap<Thread, Connection> conns = new ConcurrentHashMap<>(); /** */ private GridMapQueryExecutor mapQryExec; @@ -271,7 +270,7 @@ public class IgniteH2Indexing implements GridQueryIndexing { private GridReduceQueryExecutor rdcQryExec; /** Cache name -> schema name */ - private final Map<String, String> cacheName2schema = new ConcurrentHashMap8<>(); + private final Map<String, String> cacheName2schema = new ConcurrentHashMap<>(); /** */ private AtomicLong qryIdGen; @@ -283,7 +282,7 @@ public class IgniteH2Indexing implements GridQueryIndexing { private final Object schemaMux = new Object(); /** */ - private final ConcurrentMap<Long, GridRunningQueryInfo> runs = new ConcurrentHashMap8<>(); + private final ConcurrentMap<Long, GridRunningQueryInfo> runs = new ConcurrentHashMap<>(); /** Row cache. */ private final H2RowCacheRegistry rowCache = new H2RowCacheRegistry(); @@ -343,7 +342,7 @@ public class IgniteH2Indexing implements GridQueryIndexing { private DdlStatementsProcessor ddlProc; /** */ - private final ConcurrentMap<QueryTable, GridH2Table> dataTables = new ConcurrentHashMap8<>(); + private final ConcurrentMap<QueryTable, GridH2Table> dataTables = new ConcurrentHashMap<>(); /** Statement cache. */ private final ConcurrentHashMap<Thread, H2StatementCache> stmtCache = new ConcurrentHashMap<>(); http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2MetaTable.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2MetaTable.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2MetaTable.java index 5e09a86..00312b8 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2MetaTable.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2MetaTable.java @@ -22,6 +22,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Objects; import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicLong; import org.h2.command.ddl.CreateTableData; @@ -43,7 +44,6 @@ import org.h2.table.TableFilter; import org.h2.table.TableType; import org.h2.value.Value; import org.h2.value.ValueInt; -import org.jsr166.ConcurrentHashMap8; /** * Meta table. @@ -60,7 +60,7 @@ public class GridH2MetaTable extends TableBase { /** */ private final Set<Session> fakeExclusiveSet = Collections.newSetFromMap( - new ConcurrentHashMap8<Session,Boolean>()); + new ConcurrentHashMap<Session,Boolean>()); /** * @param data Data. @@ -291,7 +291,7 @@ public class GridH2MetaTable extends TableBase { */ private static class MetaIndex extends BaseIndex { /** */ - private final ConcurrentMap<ValueInt, Row> rows = new ConcurrentHashMap8<>(); + private final ConcurrentMap<ValueInt, Row> rows = new ConcurrentHashMap<>(); /** {@inheritDoc} */ @Override public void checkRename() { http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2QueryContext.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2QueryContext.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2QueryContext.java index 91f0aef..0103676 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2QueryContext.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2QueryContext.java @@ -29,7 +29,7 @@ import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.spi.indexing.IndexingQueryFilter; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; +import java.util.concurrent.ConcurrentHashMap; import static org.apache.ignite.internal.processors.query.h2.opt.DistributedJoinMode.OFF; import static org.apache.ignite.internal.processors.query.h2.opt.GridH2QueryType.MAP; @@ -42,7 +42,7 @@ public class GridH2QueryContext { private static final ThreadLocal<GridH2QueryContext> qctx = new ThreadLocal<>(); /** */ - private static final ConcurrentMap<Key, GridH2QueryContext> qctxs = new ConcurrentHashMap8<>(); + private static final ConcurrentMap<Key, GridH2QueryContext> qctxs = new ConcurrentHashMap<>(); /** */ private final Key key; http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java index 6fa561f..7c99480 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java @@ -21,6 +21,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.LongAdder; import java.util.concurrent.locks.Lock; @@ -54,7 +55,6 @@ import org.h2.table.TableBase; import org.h2.table.TableType; import org.h2.value.DataType; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.internal.processors.query.h2.opt.GridH2KeyValueRowOnheap.DEFAULT_COLUMNS_COUNT; @@ -92,7 +92,7 @@ public class GridH2Table extends TableBase { private boolean destroyed; /** */ - private final ConcurrentMap<Session, Boolean> sessions = new ConcurrentHashMap8<>(); + private final ConcurrentMap<Session, Boolean> sessions = new ConcurrentHashMap<>(); /** */ private IndexColumn affKeyCol; http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java index 5fa90c1..7f49808 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java @@ -82,7 +82,6 @@ import org.apache.ignite.thread.IgniteThread; import org.h2.jdbc.JdbcResultSet; import org.h2.value.Value; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; import static org.apache.ignite.events.EventType.EVT_CACHE_QUERY_EXECUTED; import static org.apache.ignite.internal.managers.communication.GridIoPolicy.QUERY_POOL; @@ -109,13 +108,13 @@ public class GridMapQueryExecutor { private IgniteH2Indexing h2; /** */ - private ConcurrentMap<UUID, MapNodeResults> qryRess = new ConcurrentHashMap8<>(); + private ConcurrentMap<UUID, MapNodeResults> qryRess = new ConcurrentHashMap<>(); /** */ private final GridSpinBusyLock busyLock; /** */ - private final ConcurrentMap<MapReservationKey, GridReservable> reservations = new ConcurrentHashMap8<>(); + private final ConcurrentMap<MapReservationKey, GridReservable> reservations = new ConcurrentHashMap<>(); /** Lazy workers. */ private final ConcurrentHashMap<MapQueryLazyWorkerKey, MapQueryLazyWorker> lazyWorkers = new ConcurrentHashMap<>(); http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java index 3b72b8e..20bf32c 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java @@ -99,7 +99,6 @@ import org.h2.table.Column; import org.h2.util.IntArray; import org.h2.value.Value; import org.jetbrains.annotations.Nullable; -import org.jsr166.ConcurrentHashMap8; import static java.util.Collections.singletonList; import static org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion.NONE; @@ -134,7 +133,7 @@ public class GridReduceQueryExecutor { private final AtomicLong qryIdGen; /** */ - private final ConcurrentMap<Long, ReduceQueryRun> runs = new ConcurrentHashMap8<>(); + private final ConcurrentMap<Long, ReduceQueryRun> runs = new ConcurrentHashMap<>(); /** Contexts of running DML requests. */ private final ConcurrentMap<Long, DistributedUpdateRun> updRuns = new ConcurrentHashMap<>(); http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/MapNodeResults.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/MapNodeResults.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/MapNodeResults.java index c0637ea..48116d3 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/MapNodeResults.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/MapNodeResults.java @@ -19,7 +19,7 @@ package org.apache.ignite.internal.processors.query.h2.twostep; import org.apache.ignite.internal.processors.query.GridQueryCancel; import org.apache.ignite.internal.util.GridBoundedConcurrentLinkedHashMap; -import org.jsr166.ConcurrentHashMap8; +import java.util.concurrent.ConcurrentHashMap; import java.util.UUID; import java.util.concurrent.ConcurrentMap; @@ -31,10 +31,10 @@ import static org.jsr166.ConcurrentLinkedHashMap.QueuePolicy.PER_SEGMENT_Q; */ class MapNodeResults { /** */ - private final ConcurrentMap<MapRequestKey, MapQueryResults> res = new ConcurrentHashMap8<>(); + private final ConcurrentMap<MapRequestKey, MapQueryResults> res = new ConcurrentHashMap<>(); /** Cancel state for update requests. */ - private final ConcurrentMap<Long, GridQueryCancel> updCancels = new ConcurrentHashMap8<>(); + private final ConcurrentMap<Long, GridQueryCancel> updCancels = new ConcurrentHashMap<>(); /** */ private final GridBoundedConcurrentLinkedHashMap<Long, Boolean> qryHist = http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java index f2fef29..ee1a652 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java @@ -85,7 +85,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import org.jsr166.ConcurrentHashMap8; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; @@ -1521,7 +1520,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac * @throws Exception If failed. */ public void testScanQueryEvents() throws Exception { - final Map<Integer, Integer> map = new ConcurrentHashMap8<>(); + final Map<Integer, Integer> map = new ConcurrentHashMap<>(); final IgniteCache<Integer, Integer> cache = jcache(Integer.class, Integer.class); final boolean evtsDisabled = cache.getConfiguration(CacheConfiguration.class).isEventsDisabled(); final CountDownLatch latch = new CountDownLatch(evtsDisabled ? 0 : 10); @@ -1625,7 +1624,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac * @throws Exception If failed. */ public void testTextQueryEvents() throws Exception { - final Map<UUID, Person> map = new ConcurrentHashMap8<>(); + final Map<UUID, Person> map = new ConcurrentHashMap<>(); final IgniteCache<UUID, Person> cache = jcache(UUID.class, Person.class); final boolean evtsDisabled = cache.getConfiguration(CacheConfiguration.class).isEventsDisabled(); final CountDownLatch latch = new CountDownLatch(evtsDisabled ? 0 : 2); http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/osgi/src/main/java/org/apache/ignite/osgi/IgniteOsgiUtils.java ---------------------------------------------------------------------- diff --git a/modules/osgi/src/main/java/org/apache/ignite/osgi/IgniteOsgiUtils.java b/modules/osgi/src/main/java/org/apache/ignite/osgi/IgniteOsgiUtils.java index deda3e8..f8554ee 100644 --- a/modules/osgi/src/main/java/org/apache/ignite/osgi/IgniteOsgiUtils.java +++ b/modules/osgi/src/main/java/org/apache/ignite/osgi/IgniteOsgiUtils.java @@ -20,7 +20,7 @@ package org.apache.ignite.osgi; import java.util.Map; import java.util.concurrent.ConcurrentMap; import org.apache.ignite.Ignite; -import org.jsr166.ConcurrentHashMap8; +import java.util.concurrent.ConcurrentHashMap; import org.osgi.framework.Bundle; import org.osgi.framework.FrameworkUtil; @@ -32,7 +32,7 @@ public class IgniteOsgiUtils { private static boolean osgi = FrameworkUtil.getBundle(IgniteOsgiUtils.class) != null; /** Maps Ignite instances to the ClassLoaders of the bundles they were started from. */ - private static final ConcurrentMap<Ignite, ClassLoader> CLASSLOADERS = new ConcurrentHashMap8<>(); + private static final ConcurrentMap<Ignite, ClassLoader> CLASSLOADERS = new ConcurrentHashMap<>(); /** * Private constructor. http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/osgi/src/main/java/org/apache/ignite/osgi/classloaders/ContainerSweepClassLoader.java ---------------------------------------------------------------------- diff --git a/modules/osgi/src/main/java/org/apache/ignite/osgi/classloaders/ContainerSweepClassLoader.java b/modules/osgi/src/main/java/org/apache/ignite/osgi/classloaders/ContainerSweepClassLoader.java index 0a4cdc4..54e9699 100644 --- a/modules/osgi/src/main/java/org/apache/ignite/osgi/classloaders/ContainerSweepClassLoader.java +++ b/modules/osgi/src/main/java/org/apache/ignite/osgi/classloaders/ContainerSweepClassLoader.java @@ -18,9 +18,9 @@ package org.apache.ignite.osgi.classloaders; import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import org.apache.ignite.internal.util.GridConcurrentHashSet; -import org.jsr166.ConcurrentHashMap8; import org.osgi.framework.Bundle; import org.osgi.framework.Constants; @@ -32,7 +32,7 @@ import org.osgi.framework.Constants; */ public class ContainerSweepClassLoader extends BundleDelegatingClassLoader { /** Classes resolved previously. */ - private final ConcurrentMap<String, Bundle> resolved = new ConcurrentHashMap8<>(); + private final ConcurrentMap<String, Bundle> resolved = new ConcurrentHashMap<>(); /** Unresolvable classes. */ private final Set<String> nonResolvable = new GridConcurrentHashSet<>(); http://git-wip-us.apache.org/repos/asf/ignite/blob/b4ece5fb/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java b/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java index c04eb26..93c18d4 100644 --- a/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java +++ b/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java @@ -21,6 +21,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Objects; import java.util.concurrent.ConcurrentMap; +import java.util.function.Function; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteLock; import org.apache.ignite.IgniteSpring; @@ -28,7 +29,7 @@ import org.apache.ignite.Ignition; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.NearCacheConfiguration; -import org.jsr166.ConcurrentHashMap8; +import java.util.concurrent.ConcurrentHashMap; import org.springframework.beans.factory.InitializingBean; import org.springframework.cache.Cache; import org.springframework.cache.CacheManager; @@ -147,7 +148,7 @@ public class SpringCacheManager implements CacheManager, InitializingBean, Appli private static final String SPRING_LOCK_NAME_PREFIX = "springSync"; /** Caches map. */ - private final ConcurrentMap<String, SpringCache> caches = new ConcurrentHashMap8<>(); + private final ConcurrentMap<String, SpringCache> caches = new ConcurrentHashMap<>(); /** Grid configuration file path. */ private String cfgPath; @@ -174,7 +175,7 @@ public class SpringCacheManager implements CacheManager, InitializingBean, Appli private ApplicationContext springCtx; /** Locks for value loading to support sync option. */ - private ConcurrentHashMap8<Integer, IgniteLock> locks = new ConcurrentHashMap8<>(); + private ConcurrentHashMap<Integer, IgniteLock> locks = new ConcurrentHashMap<>(); /** {@inheritDoc} */ @Override public void setApplicationContext(ApplicationContext ctx) { @@ -374,10 +375,6 @@ public class SpringCacheManager implements CacheManager, InitializingBean, Appli final int idx = hash % getLocksCount(); - return locks.computeIfAbsent(idx, new ConcurrentHashMap8.Fun<Integer, IgniteLock>() { - @Override public IgniteLock apply(Integer integer) { - return ignite.reentrantLock(SPRING_LOCK_NAME_PREFIX + idx, true, false, true); - } - }); + return locks.computeIfAbsent(idx, i -> ignite.reentrantLock(SPRING_LOCK_NAME_PREFIX + idx, true, false, true)); } }
