From acc1024158ef600cdb078b0de8a9859beaa8b330 Mon Sep 17 00:00:00 2001 From: shroman Date: Mon, 26 Nov 2018 17:33:30 +0300 Subject: [PATCH] IGNITE-9517: Replace uses of ConcurrentHashSet with GridConcurrentHashSet in tests. - Fixes #5397. Signed-off-by: Dmitriy Pavlov --- .../internal/GridMultithreadedJobStealingSelfTest.java | 6 +++--- .../binary/BinaryArrayIdentityResolverSelfTest.java | 4 ++-- .../internal/binary/BinaryFieldsOffheapSelfTest.java | 4 ++-- .../binary/BinaryFooterOffsetsOffheapSelfTest.java | 4 ++-- .../binary/BinarySerialiedFieldComparatorSelfTest.java | 4 ++-- ...dCacheClientNodeBinaryObjectMetadataMultinodeTest.java | 4 ++-- .../cache/distributed/CacheExchangeMergeTest.java | 4 ++-- .../GridCachePartitionNotLoadedEventSelfTest.java | 4 ++-- .../distributed/GridCacheTransformEventSelfTest.java | 6 +++--- .../IgniteCacheClientNodeChangingTopologyTest.java | 4 ++-- .../GridTcpCommunicationSpiConcurrentConnectSelfTest.java | 4 ++-- .../tcp/GridTcpCommunicationSpiRecoveryAckSelfTest.java | 4 ++-- .../tcp/GridTcpCommunicationSpiRecoverySelfTest.java | 4 ++-- .../IgniteTcpCommunicationRecoveryAckClosureSelfTest.java | 4 ++-- .../tcp/TcpDiscoveryPendingMessageDeliveryTest.java | 8 ++++---- .../ignite/spi/discovery/tcp/TcpDiscoveryRestartTest.java | 8 ++++---- .../ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java | 4 ++-- 17 files changed, 40 insertions(+), 40 deletions(-) diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridMultithreadedJobStealingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridMultithreadedJobStealingSelfTest.java index 293c859033621..605cb3d8b999b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridMultithreadedJobStealingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridMultithreadedJobStealingSelfTest.java @@ -37,6 +37,7 @@ import org.apache.ignite.compute.ComputeJobResult; import org.apache.ignite.compute.ComputeTaskAdapter; import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.util.GridConcurrentHashSet; import org.apache.ignite.internal.util.typedef.G; import org.apache.ignite.resources.IgniteInstanceResource; import org.apache.ignite.resources.LoggerResource; @@ -45,7 +46,6 @@ import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.testframework.junits.common.GridCommonTest; -import org.eclipse.jetty.util.ConcurrentHashSet; import org.jetbrains.annotations.Nullable; /** @@ -86,7 +86,7 @@ public void testTwoJobsMultithreaded() throws Exception { final AtomicInteger stolen = new AtomicInteger(0); final AtomicInteger noneStolen = new AtomicInteger(0); - final ConcurrentHashSet nodes = new ConcurrentHashSet(); + final GridConcurrentHashSet nodes = new GridConcurrentHashSet(); int threadsNum = 10; @@ -141,7 +141,7 @@ public void testJoinedNodeCanStealJobs() throws Exception { final AtomicInteger stolen = new AtomicInteger(0); final AtomicInteger noneStolen = new AtomicInteger(0); - final ConcurrentHashSet nodes = new ConcurrentHashSet(); + final GridConcurrentHashSet nodes = new GridConcurrentHashSet(); int threadsNum = 10; diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryArrayIdentityResolverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryArrayIdentityResolverSelfTest.java index 27c39c3feaf52..7548cf0442e75 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryArrayIdentityResolverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryArrayIdentityResolverSelfTest.java @@ -26,10 +26,10 @@ import org.apache.ignite.binary.Binarylizable; import org.apache.ignite.configuration.BinaryConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.util.GridConcurrentHashSet; import org.apache.ignite.internal.util.GridUnsafe; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import org.eclipse.jetty.util.ConcurrentHashSet; import java.util.ArrayList; import java.util.List; @@ -42,7 +42,7 @@ */ public class BinaryArrayIdentityResolverSelfTest extends GridCommonAbstractTest { /** Pointers to release. */ - private final Set ptrs = new ConcurrentHashSet<>(); + private final Set ptrs = new GridConcurrentHashSet<>(); /** {@inheritDoc} */ @Override protected void beforeTestsStarted() throws Exception { diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsOffheapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsOffheapSelfTest.java index ca4bdd2f72792..e5b36487224a7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsOffheapSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsOffheapSelfTest.java @@ -17,15 +17,15 @@ package org.apache.ignite.internal.binary; +import org.apache.ignite.internal.util.GridConcurrentHashSet; import org.apache.ignite.internal.util.GridUnsafe; -import org.eclipse.jetty.util.ConcurrentHashSet; /** * Field tests for heap-based binaries. */ public class BinaryFieldsOffheapSelfTest extends BinaryFieldsAbstractSelfTest { /** Allocated unsafe pointer. */ - private final ConcurrentHashSet ptrs = new ConcurrentHashSet<>(); + private final GridConcurrentHashSet ptrs = new GridConcurrentHashSet<>(); /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsOffheapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsOffheapSelfTest.java index 052e652ed73bf..8e00457fc2d3c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsOffheapSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsOffheapSelfTest.java @@ -17,15 +17,15 @@ package org.apache.ignite.internal.binary; +import org.apache.ignite.internal.util.GridConcurrentHashSet; import org.apache.ignite.internal.util.GridUnsafe; -import org.eclipse.jetty.util.ConcurrentHashSet; /** * Compact offsets tests for offheap binary objects. */ public class BinaryFooterOffsetsOffheapSelfTest extends BinaryFooterOffsetsAbstractSelfTest { /** Allocated unsafe pointer. */ - private final ConcurrentHashSet ptrs = new ConcurrentHashSet<>(); + private final GridConcurrentHashSet ptrs = new GridConcurrentHashSet<>(); /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinarySerialiedFieldComparatorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinarySerialiedFieldComparatorSelfTest.java index 4278ef43ea82f..1e0c5c9932b5f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinarySerialiedFieldComparatorSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinarySerialiedFieldComparatorSelfTest.java @@ -19,10 +19,10 @@ import org.apache.ignite.binary.BinaryObjectBuilder; import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.util.GridConcurrentHashSet; import org.apache.ignite.internal.util.GridUnsafe; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import org.eclipse.jetty.util.ConcurrentHashSet; import java.math.BigDecimal; import java.sql.Timestamp; @@ -42,7 +42,7 @@ public class BinarySerialiedFieldComparatorSelfTest extends GridCommonAbstractTe private static final String FIELD_SINGLE = "single"; /** Pointers to release. */ - private final Set ptrs = new ConcurrentHashSet<>(); + private final Set ptrs = new GridConcurrentHashSet<>(); /** {@inheritDoc} */ @Override protected void beforeTestsStarted() throws Exception { diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheClientNodeBinaryObjectMetadataMultinodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheClientNodeBinaryObjectMetadataMultinodeTest.java index 81614cb9ff7a5..3da8605ef594b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheClientNodeBinaryObjectMetadataMultinodeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheClientNodeBinaryObjectMetadataMultinodeTest.java @@ -31,6 +31,7 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.IgniteInternalFuture; +import org.apache.ignite.internal.util.GridConcurrentHashSet; import org.apache.ignite.internal.util.lang.GridAbsPredicate; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.internal.binary.BinaryMarshaller; @@ -41,7 +42,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import org.eclipse.jetty.util.ConcurrentHashSet; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; @@ -91,7 +91,7 @@ public void testClientMetadataInitialization() throws Exception { final AtomicBoolean stop = new AtomicBoolean(); - final ConcurrentHashSet allTypes = new ConcurrentHashSet<>(); + final GridConcurrentHashSet allTypes = new GridConcurrentHashSet<>(); IgniteInternalFuture fut; diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java index 93c106670da20..03ea53976d8f0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java @@ -58,6 +58,7 @@ import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsExchangeFuture; import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsFullMessage; import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsSingleRequest; +import org.apache.ignite.internal.util.GridConcurrentHashSet; import org.apache.ignite.internal.util.future.GridCompoundFuture; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.G; @@ -74,7 +75,6 @@ import org.apache.ignite.transactions.Transaction; import org.apache.ignite.transactions.TransactionConcurrency; import org.apache.ignite.transactions.TransactionIsolation; -import org.eclipse.jetty.util.ConcurrentHashSet; import static org.apache.ignite.IgniteSystemProperties.IGNITE_EXCHANGE_HISTORY_SIZE; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; @@ -354,7 +354,7 @@ public void testMergeStartStopRandomClientsServers() throws Exception { final AtomicInteger idx = new AtomicInteger(initNodes); - final ConcurrentHashSet stopNodes = new ConcurrentHashSet<>(); + final GridConcurrentHashSet stopNodes = new GridConcurrentHashSet<>(); IgniteInternalFuture fut = GridTestUtils.runMultiThreadedAsync(new Callable() { @Override public Void call() throws Exception { diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionNotLoadedEventSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionNotLoadedEventSelfTest.java index 92783b002f3b8..334608d43ce1a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionNotLoadedEventSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionNotLoadedEventSelfTest.java @@ -32,6 +32,7 @@ import org.apache.ignite.internal.IgniteFutureTimeoutCheckedException; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsFullMessage; +import org.apache.ignite.internal.util.GridConcurrentHashSet; import org.apache.ignite.internal.util.lang.GridAbsPredicate; import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; @@ -41,7 +42,6 @@ import org.apache.ignite.testframework.GridTestUtils.SF; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.util.TestTcpCommunicationSpi; -import org.eclipse.jetty.util.ConcurrentHashSet; import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; @@ -277,7 +277,7 @@ public void testMapPartitioned() throws Exception { */ private static class PartitionNotFullyLoadedListener implements IgnitePredicate { /** */ - private Collection lostParts = new ConcurrentHashSet<>(); + private Collection lostParts = new GridConcurrentHashSet<>(); /** {@inheritDoc} */ @Override public boolean apply(Event evt) { diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java index b1701a4cc46c8..913321e7be121 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java @@ -36,6 +36,7 @@ import org.apache.ignite.configuration.TransactionConfiguration; import org.apache.ignite.events.CacheEvent; import org.apache.ignite.events.Event; +import org.apache.ignite.internal.util.GridConcurrentHashSet; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.resources.IgniteInstanceResource; @@ -45,7 +46,6 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.transactions.TransactionConcurrency; import org.apache.ignite.transactions.TransactionIsolation; -import org.eclipse.jetty.util.ConcurrentHashSet; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; @@ -96,7 +96,7 @@ public class GridCacheTransformEventSelfTest extends GridCommonAbstractTest { private IgniteCache[] caches; /** Recorded events. */ - private ConcurrentHashSet evts; + private GridConcurrentHashSet evts; /** Cache mode. */ private CacheMode cacheMode; @@ -174,7 +174,7 @@ private void initialize(CacheMode cacheMode, CacheAtomicityMode atomicityMode, this.txConcurrency = txConcurrency; this.txIsolation = txIsolation; - evts = new ConcurrentHashSet<>(); + evts = new GridConcurrentHashSet<>(); startGridsMultiThreaded(GRID_CNT, true); diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java index 300ecb938f42f..ce8749cc00e42 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java @@ -68,6 +68,7 @@ import org.apache.ignite.internal.processors.cache.distributed.near.GridNearLockRequest; import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxPrepareRequest; import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; +import org.apache.ignite.internal.util.GridConcurrentHashSet; import org.apache.ignite.internal.util.lang.GridAbsPredicate; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.G; @@ -89,7 +90,6 @@ import org.apache.ignite.transactions.Transaction; import org.apache.ignite.transactions.TransactionConcurrency; import org.apache.ignite.transactions.TransactionIsolation; -import org.eclipse.jetty.util.ConcurrentHashSet; import org.jetbrains.annotations.Nullable; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; @@ -1802,7 +1802,7 @@ private void multinode(CacheAtomicityMode atomicityMode, final TestType testType final int THREADS = CLIENT_CNT * 3; - final ConcurrentHashSet putKeys = new ConcurrentHashSet<>(); + final GridConcurrentHashSet putKeys = new GridConcurrentHashSet<>(); IgniteInternalFuture fut; diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConcurrentConnectSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConcurrentConnectSelfTest.java index ce96c5574e292..901301677975c 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConcurrentConnectSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConcurrentConnectSelfTest.java @@ -39,6 +39,7 @@ import org.apache.ignite.internal.IgniteNodeAttributes; import org.apache.ignite.internal.managers.communication.GridIoMessageFactory; import org.apache.ignite.internal.processors.timeout.GridTimeoutProcessor; +import org.apache.ignite.internal.util.GridConcurrentHashSet; import org.apache.ignite.internal.util.lang.GridAbsPredicate; import org.apache.ignite.internal.util.nio.GridCommunicationClient; import org.apache.ignite.internal.util.nio.GridNioServer; @@ -58,7 +59,6 @@ import org.apache.ignite.testframework.junits.IgniteTestResources; import org.apache.ignite.testframework.junits.spi.GridSpiAbstractTest; import org.apache.ignite.testframework.junits.spi.GridSpiTest; -import org.eclipse.jetty.util.ConcurrentHashSet; /** * @@ -125,7 +125,7 @@ private static class MessageListener implements CommunicationListener { private final AtomicInteger cntr = new AtomicInteger(); /** */ - private final ConcurrentHashSet msgIds = new ConcurrentHashSet<>(); + private final GridConcurrentHashSet msgIds = new GridConcurrentHashSet<>(); /** * @param latch Latch. diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoveryAckSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoveryAckSelfTest.java index e8a535b501193..16ad2c8673bc7 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoveryAckSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoveryAckSelfTest.java @@ -29,6 +29,7 @@ import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.internal.managers.communication.GridIoMessageFactory; import org.apache.ignite.internal.processors.timeout.GridTimeoutProcessor; +import org.apache.ignite.internal.util.GridConcurrentHashSet; import org.apache.ignite.internal.util.lang.GridAbsPredicate; import org.apache.ignite.internal.util.nio.GridNioRecoveryDescriptor; import org.apache.ignite.internal.util.nio.GridNioServer; @@ -49,7 +50,6 @@ import org.apache.ignite.testframework.junits.IgniteTestResources; import org.apache.ignite.testframework.junits.spi.GridSpiAbstractTest; import org.apache.ignite.testframework.junits.spi.GridSpiTest; -import org.eclipse.jetty.util.ConcurrentHashSet; /** * @@ -92,7 +92,7 @@ public GridTcpCommunicationSpiRecoveryAckSelfTest() { /** */ private class TestListener implements CommunicationListener { /** */ - private ConcurrentHashSet msgIds = new ConcurrentHashSet<>(); + private GridConcurrentHashSet msgIds = new GridConcurrentHashSet<>(); /** */ private AtomicInteger rcvCnt = new AtomicInteger(); diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoverySelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoverySelfTest.java index 5d09fbb2de39d..12cf4d915b2b7 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoverySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoverySelfTest.java @@ -34,6 +34,7 @@ import org.apache.ignite.internal.IgniteInterruptedCheckedException; import org.apache.ignite.internal.managers.communication.GridIoMessageFactory; import org.apache.ignite.internal.processors.timeout.GridTimeoutProcessor; +import org.apache.ignite.internal.util.GridConcurrentHashSet; import org.apache.ignite.internal.util.lang.GridAbsPredicate; import org.apache.ignite.internal.util.nio.GridNioServer; import org.apache.ignite.internal.util.nio.GridNioSession; @@ -54,7 +55,6 @@ import org.apache.ignite.testframework.junits.IgniteTestResources; import org.apache.ignite.testframework.junits.spi.GridSpiAbstractTest; import org.apache.ignite.testframework.junits.spi.GridSpiTest; -import org.eclipse.jetty.util.ConcurrentHashSet; /** * @@ -114,7 +114,7 @@ private class TestListener implements CommunicationListener { private CountDownLatch blockLatch; /** */ - private ConcurrentHashSet msgIds = new ConcurrentHashSet<>(); + private GridConcurrentHashSet msgIds = new GridConcurrentHashSet<>(); /** */ private AtomicInteger rcvCnt = new AtomicInteger(); diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationRecoveryAckClosureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationRecoveryAckClosureSelfTest.java index 8f8d10125fa24..5bee7563d9a58 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationRecoveryAckClosureSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationRecoveryAckClosureSelfTest.java @@ -30,6 +30,7 @@ import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.internal.managers.communication.GridIoMessageFactory; import org.apache.ignite.internal.processors.timeout.GridTimeoutProcessor; +import org.apache.ignite.internal.util.GridConcurrentHashSet; import org.apache.ignite.internal.util.lang.GridAbsPredicate; import org.apache.ignite.internal.util.nio.GridNioRecoveryDescriptor; import org.apache.ignite.internal.util.nio.GridNioServer; @@ -52,7 +53,6 @@ import org.apache.ignite.testframework.junits.IgniteTestResources; import org.apache.ignite.testframework.junits.spi.GridSpiAbstractTest; import org.apache.ignite.testframework.junits.spi.GridSpiTest; -import org.eclipse.jetty.util.ConcurrentHashSet; /** * @@ -96,7 +96,7 @@ public IgniteTcpCommunicationRecoveryAckClosureSelfTest() { /** */ private class TestListener implements CommunicationListener { /** */ - private ConcurrentHashSet msgIds = new ConcurrentHashSet<>(); + private GridConcurrentHashSet msgIds = new GridConcurrentHashSet<>(); /** */ private AtomicInteger rcvCnt = new AtomicInteger(); diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryPendingMessageDeliveryTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryPendingMessageDeliveryTest.java index 9b3dfeea2e93d..5c1b5fea70a63 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryPendingMessageDeliveryTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryPendingMessageDeliveryTest.java @@ -29,13 +29,13 @@ import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; +import org.apache.ignite.internal.util.GridConcurrentHashSet; import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryAbstractMessage; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import org.eclipse.jetty.util.ConcurrentHashSet; import org.jetbrains.annotations.Nullable; /** @@ -54,7 +54,7 @@ public class TcpDiscoveryPendingMessageDeliveryTest extends GridCommonAbstractTe /** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { blockMsgs = false; - receivedEnsuredMsgs = new ConcurrentHashSet<>(); + receivedEnsuredMsgs = new GridConcurrentHashSet<>(); } /** {@inheritDoc} */ @@ -88,7 +88,7 @@ public void testPendingMessagesOverflow() throws Exception { Ignite coord = startGrid("coordinator"); TcpDiscoverySpi coordDisco = (TcpDiscoverySpi)coord.configuration().getDiscoverySpi(); - Set sentEnsuredMsgs = new ConcurrentHashSet<>(); + Set sentEnsuredMsgs = new GridConcurrentHashSet<>(); coordDisco.addSendMessageListener(msg -> { if (coordDisco.ensured(msg)) sentEnsuredMsgs.add(msg); @@ -143,7 +143,7 @@ public void testCustomMessageInSingletonCluster() throws Exception { Ignite coord = startGrid("coordinator"); TcpDiscoverySpi coordDisco = (TcpDiscoverySpi)coord.configuration().getDiscoverySpi(); - Set sentEnsuredMsgs = new ConcurrentHashSet<>(); + Set sentEnsuredMsgs = new GridConcurrentHashSet<>(); coordDisco.addSendMessageListener(msg -> { if (coordDisco.ensured(msg)) sentEnsuredMsgs.add(msg); diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryRestartTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryRestartTest.java index cacefa58c14e0..96ac260d28049 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryRestartTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryRestartTest.java @@ -30,13 +30,13 @@ import org.apache.ignite.events.DiscoveryEvent; import org.apache.ignite.events.Event; import org.apache.ignite.internal.IgniteInternalFuture; +import org.apache.ignite.internal.util.GridConcurrentHashSet; import org.apache.ignite.internal.util.lang.GridAbsPredicate; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.lang.IgnitePredicate; 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.eclipse.jetty.util.ConcurrentHashSet; import static org.apache.ignite.events.EventType.EVT_NODE_FAILED; import static org.apache.ignite.events.EventType.EVT_NODE_JOINED; @@ -90,7 +90,7 @@ public void testRestart() throws Exception { startGrids(NODE_CNT); - final ConcurrentHashSet nodeIds = new ConcurrentHashSet<>(); + final GridConcurrentHashSet nodeIds = new GridConcurrentHashSet<>(); final AtomicInteger id = new AtomicInteger(NODE_CNT); @@ -172,10 +172,10 @@ private void failed(String msg) { */ private class TestEventListener implements IgnitePredicate { /** */ - private final ConcurrentHashSet joinIds = new ConcurrentHashSet<>(); + private final GridConcurrentHashSet joinIds = new GridConcurrentHashSet<>(); /** */ - private final ConcurrentHashSet leftIds = new ConcurrentHashSet<>(); + private final GridConcurrentHashSet leftIds = new GridConcurrentHashSet<>(); /** {@inheritDoc} */ @Override public boolean apply(Event evt) { diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java index 1aae8fbc3133a..32df795f41778 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java @@ -58,6 +58,7 @@ import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.processors.continuous.StartRoutineAckDiscoveryMessage; import org.apache.ignite.internal.processors.port.GridPortRecord; +import org.apache.ignite.internal.util.GridConcurrentHashSet; import org.apache.ignite.internal.util.lang.GridAbsPredicate; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.G; @@ -89,7 +90,6 @@ import org.apache.ignite.testframework.GridStringLogger; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import org.eclipse.jetty.util.ConcurrentHashSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -2372,7 +2372,7 @@ else if (msg instanceof TcpDiscoveryNodeAddFinishedMessage) */ private static class TestEventDiscardSpi extends TcpDiscoverySpi { /** */ - private ConcurrentHashSet msgIds = new ConcurrentHashSet<>(); + private GridConcurrentHashSet msgIds = new GridConcurrentHashSet<>(); /** */ private volatile boolean checkDuplicates;