Skip to content

Commit

Permalink
IGNITE-9517: Replace uses of ConcurrentHashSet with GridConcurrentHas…
Browse files Browse the repository at this point in the history 
…hSet in tests. - Fixes #5397.

Signed-off-by: Dmitriy Pavlov <dpavlov@apache.org>
  • Loading branch information
@shroman @dspavlov
shroman authored and dspavlov committed Nov 26, 2018
1 parent c870500 commit acc1024
Show file tree
Hide file tree
Showing 17 changed files with 40 additions and 40 deletions.
6 changes: 3 additions & 3 deletions ...s/core/src/test/java/org/apache/ignite/internal/GridMultithreadedJobStealingSelfTest.java
View file
Expand Up @@ -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;
Expand All @@ -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;

/**
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions .../src/test/java/org/apache/ignite/internal/binary/BinaryArrayIdentityResolverSelfTest.java
View file
Expand Up @@ -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;
Expand All @@ -42,7 +42,7 @@
*/
public class BinaryArrayIdentityResolverSelfTest extends GridCommonAbstractTest {
/** Pointers to release. */
private final Set<Long> ptrs = new ConcurrentHashSet<>();
private final Set<Long> ptrs = new GridConcurrentHashSet<>();

/** {@inheritDoc} */
@Override protected void beforeTestsStarted() throws Exception {
Expand Down
4 changes: 2 additions & 2 deletions ...les/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsOffheapSelfTest.java
View file
Expand Up @@ -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<Long> ptrs = new ConcurrentHashSet<>();
private final GridConcurrentHashSet<Long> ptrs = new GridConcurrentHashSet<>();

/** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
Expand Down
4 changes: 2 additions & 2 deletions ...e/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsOffheapSelfTest.java
View file
Expand Up @@ -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<Long> ptrs = new ConcurrentHashSet<>();
private final GridConcurrentHashSet<Long> ptrs = new GridConcurrentHashSet<>();

/** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
Expand Down
4 changes: 2 additions & 2 deletions ...c/test/java/org/apache/ignite/internal/binary/BinarySerialiedFieldComparatorSelfTest.java
View file
Expand Up @@ -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;
Expand All @@ -42,7 +42,7 @@ public class BinarySerialiedFieldComparatorSelfTest extends GridCommonAbstractTe
private static final String FIELD_SINGLE = "single";

/** Pointers to release. */
private final Set<Long> ptrs = new ConcurrentHashSet<>();
private final Set<Long> ptrs = new GridConcurrentHashSet<>();

/** {@inheritDoc} */
@Override protected void beforeTestsStarted() throws Exception {
Expand Down
4 changes: 2 additions & 2 deletions ...nternal/processors/cache/binary/GridCacheClientNodeBinaryObjectMetadataMultinodeTest.java
View file
Expand Up @@ -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;
Expand All @@ -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;

Expand Down Expand Up @@ -91,7 +91,7 @@ public void testClientMetadataInitialization() throws Exception {

final AtomicBoolean stop = new AtomicBoolean();

final ConcurrentHashSet<String> allTypes = new ConcurrentHashSet<>();
final GridConcurrentHashSet<String> allTypes = new GridConcurrentHashSet<>();

IgniteInternalFuture<?> fut;

Expand Down
4 changes: 2 additions & 2 deletions .../java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java
View file
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -354,7 +354,7 @@ public void testMergeStartStopRandomClientsServers() throws Exception {

final AtomicInteger idx = new AtomicInteger(initNodes);

final ConcurrentHashSet<Integer> stopNodes = new ConcurrentHashSet<>();
final GridConcurrentHashSet<Integer> stopNodes = new GridConcurrentHashSet<>();

IgniteInternalFuture fut = GridTestUtils.runMultiThreadedAsync(new Callable<Void>() {
@Override public Void call() throws Exception {
Expand Down
4 changes: 2 additions & 2 deletions ...gnite/internal/processors/cache/distributed/GridCachePartitionNotLoadedEventSelfTest.java
View file
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -277,7 +277,7 @@ public void testMapPartitioned() throws Exception {
*/
private static class PartitionNotFullyLoadedListener implements IgnitePredicate<Event> {
/** */
private Collection<Integer> lostParts = new ConcurrentHashSet<>();
private Collection<Integer> lostParts = new GridConcurrentHashSet<>();

/** {@inheritDoc} */
@Override public boolean apply(Event evt) {
Expand Down
6 changes: 3 additions & 3 deletions .../apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java
View file
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -96,7 +96,7 @@ public class GridCacheTransformEventSelfTest extends GridCommonAbstractTest {
private IgniteCache<Integer, Integer>[] caches;

/** Recorded events. */
private ConcurrentHashSet<CacheEvent> evts;
private GridConcurrentHashSet<CacheEvent> evts;

/** Cache mode. */
private CacheMode cacheMode;
Expand Down Expand Up @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions ...nite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
View file
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -1802,7 +1802,7 @@ private void multinode(CacheAtomicityMode atomicityMode, final TestType testType

final int THREADS = CLIENT_CNT * 3;

final ConcurrentHashSet<Integer> putKeys = new ConcurrentHashSet<>();
final GridConcurrentHashSet<Integer> putKeys = new GridConcurrentHashSet<>();

IgniteInternalFuture<?> fut;

Expand Down
4 changes: 2 additions & 2 deletions ...apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConcurrentConnectSelfTest.java
View file
Expand Up @@ -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;
Expand All @@ -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;

/**
*
Expand Down Expand Up @@ -125,7 +125,7 @@ private static class MessageListener implements CommunicationListener<Message> {
private final AtomicInteger cntr = new AtomicInteger();

/** */
private final ConcurrentHashSet<Long> msgIds = new ConcurrentHashSet<>();
private final GridConcurrentHashSet<Long> msgIds = new GridConcurrentHashSet<>();

/**
* @param latch Latch.
Expand Down
4 changes: 2 additions & 2 deletions ...a/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoveryAckSelfTest.java
View file
Expand Up @@ -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;
Expand All @@ -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;

/**
*
Expand Down Expand Up @@ -92,7 +92,7 @@ public GridTcpCommunicationSpiRecoveryAckSelfTest() {
/** */
private class TestListener implements CommunicationListener<Message> {
/** */
private ConcurrentHashSet<Long> msgIds = new ConcurrentHashSet<>();
private GridConcurrentHashSet<Long> msgIds = new GridConcurrentHashSet<>();

/** */
private AtomicInteger rcvCnt = new AtomicInteger();
Expand Down
4 changes: 2 additions & 2 deletions ...java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoverySelfTest.java
View file
Expand Up @@ -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;
Expand All @@ -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;

/**
*
Expand Down Expand Up @@ -114,7 +114,7 @@ private class TestListener implements CommunicationListener<Message> {
private CountDownLatch blockLatch;

/** */
private ConcurrentHashSet<Long> msgIds = new ConcurrentHashSet<>();
private GridConcurrentHashSet<Long> msgIds = new GridConcurrentHashSet<>();

/** */
private AtomicInteger rcvCnt = new AtomicInteger();
Expand Down
4 changes: 2 additions & 2 deletions ...apache/ignite/spi/communication/tcp/IgniteTcpCommunicationRecoveryAckClosureSelfTest.java
View file
Expand Up @@ -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;
Expand All @@ -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;

/**
*
Expand Down Expand Up @@ -96,7 +96,7 @@ public IgniteTcpCommunicationRecoveryAckClosureSelfTest() {
/** */
private class TestListener implements CommunicationListener<Message> {
/** */
private ConcurrentHashSet<Long> msgIds = new ConcurrentHashSet<>();
private GridConcurrentHashSet<Long> msgIds = new GridConcurrentHashSet<>();

/** */
private AtomicInteger rcvCnt = new AtomicInteger();
Expand Down
8 changes: 4 additions & 4 deletions ...test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryPendingMessageDeliveryTest.java
View file
Expand Up @@ -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;

/**
Expand All @@ -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} */
Expand Down Expand Up @@ -88,7 +88,7 @@ public void testPendingMessagesOverflow() throws Exception {
Ignite coord = startGrid("coordinator");
TcpDiscoverySpi coordDisco = (TcpDiscoverySpi)coord.configuration().getDiscoverySpi();

Set<TcpDiscoveryAbstractMessage> sentEnsuredMsgs = new ConcurrentHashSet<>();
Set<TcpDiscoveryAbstractMessage> sentEnsuredMsgs = new GridConcurrentHashSet<>();
coordDisco.addSendMessageListener(msg -> {
if (coordDisco.ensured(msg))
sentEnsuredMsgs.add(msg);
Expand Down Expand Up @@ -143,7 +143,7 @@ public void testCustomMessageInSingletonCluster() throws Exception {
Ignite coord = startGrid("coordinator");
TcpDiscoverySpi coordDisco = (TcpDiscoverySpi)coord.configuration().getDiscoverySpi();

Set<TcpDiscoveryAbstractMessage> sentEnsuredMsgs = new ConcurrentHashSet<>();
Set<TcpDiscoveryAbstractMessage> sentEnsuredMsgs = new GridConcurrentHashSet<>();
coordDisco.addSendMessageListener(msg -> {
if (coordDisco.ensured(msg))
sentEnsuredMsgs.add(msg);
Expand Down

0 comments on commit acc1024

Please sign in to comment.