Fixing tests.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/802d48b5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/802d48b5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/802d48b5 Branch: refs/heads/ignite-sql-opt Commit: 802d48b5e8d3664db6be36f32c5e4c39d8eee966 Parents: 3d8c4c0 Author: Alexey Goncharuk <alexey.goncha...@gmail.com> Authored: Sat Nov 21 15:01:20 2015 +0300 Committer: Alexey Goncharuk <alexey.goncha...@gmail.com> Committed: Sat Nov 21 15:01:20 2015 +0300 ---------------------------------------------------------------------- .../resources/META-INF/classnames.properties | 62 +++++++---- .../CacheVersionedEntryAbstractTest.java | 2 +- .../continuous/GridEventConsumeSelfTest.java | 111 ++++++++++--------- 3 files changed, 101 insertions(+), 74 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/802d48b5/modules/core/src/main/resources/META-INF/classnames.properties ---------------------------------------------------------------------- diff --git a/modules/core/src/main/resources/META-INF/classnames.properties b/modules/core/src/main/resources/META-INF/classnames.properties index 96be534..8ac3278 100644 --- a/modules/core/src/main/resources/META-INF/classnames.properties +++ b/modules/core/src/main/resources/META-INF/classnames.properties @@ -259,6 +259,8 @@ org.apache.ignite.internal.cluster.IgniteKillTask org.apache.ignite.internal.cluster.IgniteKillTask$IgniteKillJob org.apache.ignite.internal.compute.ComputeTaskCancelledCheckedException org.apache.ignite.internal.compute.ComputeTaskTimeoutCheckedException +org.apache.ignite.internal.direct.DirectMessageReader$1 +org.apache.ignite.internal.direct.DirectMessageWriter$1 org.apache.ignite.internal.events.DiscoveryCustomEvent org.apache.ignite.internal.executor.GridExecutorService org.apache.ignite.internal.executor.GridExecutorService$1 @@ -297,9 +299,10 @@ org.apache.ignite.internal.portable.BinaryObjectEx org.apache.ignite.internal.portable.BinaryObjectImpl org.apache.ignite.internal.portable.BinaryObjectOffheapImpl org.apache.ignite.internal.portable.BinaryReaderExImpl$Flag -org.apache.ignite.internal.portable.PortableClassDescriptor$Mode +org.apache.ignite.internal.portable.BinaryWriteMode org.apache.ignite.internal.portable.PortableContext org.apache.ignite.internal.portable.PortableSchema +org.apache.ignite.internal.portable.PortableSchema$Confirmation org.apache.ignite.internal.portable.builder.PortableLazyMap$1$1$1 org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion org.apache.ignite.internal.processors.affinity.GridAffinityAssignment @@ -355,8 +358,7 @@ org.apache.ignite.internal.processors.cache.GridCacheAdapter$67 org.apache.ignite.internal.processors.cache.GridCacheAdapter$67$1 org.apache.ignite.internal.processors.cache.GridCacheAdapter$68 org.apache.ignite.internal.processors.cache.GridCacheAdapter$69 -org.apache.ignite.internal.processors.cache.GridCacheAdapter$7 -org.apache.ignite.internal.processors.cache.GridCacheAdapter$70 +org.apache.ignite.internal.processors.cache.GridCacheAdapter$8 org.apache.ignite.internal.processors.cache.GridCacheAdapter$9 org.apache.ignite.internal.processors.cache.GridCacheAdapter$AsyncOpRetryFuture$1 org.apache.ignite.internal.processors.cache.GridCacheAdapter$AsyncOpRetryFuture$1$1 @@ -526,6 +528,8 @@ org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxFinishR org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxFinishResponse org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxMapping org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxPrepareRequest +org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxPrepareRequest$1 +org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxPrepareRequest$2 org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxPrepareResponse org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxRemoteAdapter org.apache.ignite.internal.processors.cache.distributed.GridDistributedUnlockRequest @@ -537,6 +541,7 @@ org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheAdapter org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheAdapter$2 org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheAdapter$3 org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheAdapter$5 +org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheAdapter$6 org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheAdapter$PartitionEntryIterator org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheEntry$1 org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheEntry$2 @@ -547,7 +552,6 @@ org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtInvalidPartit org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition$3 org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLockFuture$1 org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLockFuture$2 -org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLockFuture$3 org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLockRequest org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLockResponse org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState @@ -555,6 +559,8 @@ org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionsRes org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTransactionalCacheAdapter org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTransactionalCacheAdapter$1 org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTransactionalCacheAdapter$10 +org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTransactionalCacheAdapter$10$1 +org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTransactionalCacheAdapter$11 org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTransactionalCacheAdapter$2 org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTransactionalCacheAdapter$3 org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTransactionalCacheAdapter$4 @@ -563,9 +569,7 @@ org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTransactional org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTransactionalCacheAdapter$7 org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTransactionalCacheAdapter$8 org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTransactionalCacheAdapter$9 -org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTransactionalCacheAdapter$9$1 org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxFinishFuture$1 -org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxFinishFuture$2 org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxFinishRequest org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxFinishResponse org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxLocal @@ -578,7 +582,6 @@ org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxPrepareFutu org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxPrepareFuture$2 org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxPrepareFuture$3 org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxPrepareFuture$4 -org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxPrepareFuture$5 org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxPrepareRequest org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxPrepareResponse org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxRemote @@ -586,11 +589,13 @@ org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtUnlockRequest org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtUnreservedPartitionException org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture$1 org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture$2 -org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture$3 org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture$MiniFuture$1 org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture$MiniFuture$2 org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture$MiniFuture$3 org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedGetFuture$MiniFuture$3$1 +org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedSingleGetFuture$1 +org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedSingleGetFuture$2 +org.apache.ignite.internal.processors.cache.distributed.dht.GridPartitionedSingleGetFuture$3 org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$10 org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$11 @@ -604,6 +609,9 @@ org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomic org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$19 org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$2 org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$20 +org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$21 +org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$22 +org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$23 org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$3 org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$4 org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$5 @@ -624,14 +632,15 @@ org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNearAtomi org.apache.ignite.internal.processors.cache.distributed.dht.colocated.GridDhtColocatedCache org.apache.ignite.internal.processors.cache.distributed.dht.colocated.GridDhtColocatedCache$2 org.apache.ignite.internal.processors.cache.distributed.dht.colocated.GridDhtColocatedCache$3 -org.apache.ignite.internal.processors.cache.distributed.dht.colocated.GridDhtColocatedCache$5 -org.apache.ignite.internal.processors.cache.distributed.dht.colocated.GridDhtColocatedCache$6 +org.apache.ignite.internal.processors.cache.distributed.dht.colocated.GridDhtColocatedCache$4 +org.apache.ignite.internal.processors.cache.distributed.dht.colocated.GridDhtColocatedCache$5$1 org.apache.ignite.internal.processors.cache.distributed.dht.colocated.GridDhtColocatedCache$7 +org.apache.ignite.internal.processors.cache.distributed.dht.colocated.GridDhtColocatedCache$8 +org.apache.ignite.internal.processors.cache.distributed.dht.colocated.GridDhtColocatedCache$9 org.apache.ignite.internal.processors.cache.distributed.dht.colocated.GridDhtColocatedLockFuture$1 org.apache.ignite.internal.processors.cache.distributed.dht.colocated.GridDhtColocatedLockFuture$2 org.apache.ignite.internal.processors.cache.distributed.dht.colocated.GridDhtColocatedLockFuture$3 org.apache.ignite.internal.processors.cache.distributed.dht.colocated.GridDhtColocatedLockFuture$4 -org.apache.ignite.internal.processors.cache.distributed.dht.colocated.GridDhtColocatedLockFuture$5 org.apache.ignite.internal.processors.cache.distributed.dht.colocated.GridDhtColocatedLockFuture$MiniFuture$1 org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtForceKeysFuture$1 org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtForceKeysRequest @@ -645,9 +654,9 @@ org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPar org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionExchangeId org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionFullMap org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionMap +org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionMap2 org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionSupplier$1 org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionSupplier$SupplyContextPhase -org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionMap2 org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionSupplyMessage org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionSupplyMessageV2 org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsAbstractMessage @@ -681,7 +690,6 @@ org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheAdapte org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheAdapter$EntrySet$1 org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetFuture$1 org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetFuture$2 -org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetFuture$3 org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetFuture$MiniFuture$1 org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetFuture$MiniFuture$2 org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetFuture$MiniFuture$3 @@ -691,30 +699,27 @@ org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetResponse org.apache.ignite.internal.processors.cache.distributed.near.GridNearLockFuture$1 org.apache.ignite.internal.processors.cache.distributed.near.GridNearLockFuture$2 org.apache.ignite.internal.processors.cache.distributed.near.GridNearLockFuture$3 -org.apache.ignite.internal.processors.cache.distributed.near.GridNearLockFuture$4 org.apache.ignite.internal.processors.cache.distributed.near.GridNearLockFuture$MiniFuture$1 org.apache.ignite.internal.processors.cache.distributed.near.GridNearLockRequest org.apache.ignite.internal.processors.cache.distributed.near.GridNearLockResponse org.apache.ignite.internal.processors.cache.distributed.near.GridNearOptimisticSerializableTxPrepareFuture$1 org.apache.ignite.internal.processors.cache.distributed.near.GridNearOptimisticSerializableTxPrepareFuture$2 org.apache.ignite.internal.processors.cache.distributed.near.GridNearOptimisticSerializableTxPrepareFuture$3 -org.apache.ignite.internal.processors.cache.distributed.near.GridNearOptimisticSerializableTxPrepareFuture$4 org.apache.ignite.internal.processors.cache.distributed.near.GridNearOptimisticSerializableTxPrepareFuture$ClientRemapFuture$1 org.apache.ignite.internal.processors.cache.distributed.near.GridNearOptimisticSerializableTxPrepareFuture$MiniFuture$1 org.apache.ignite.internal.processors.cache.distributed.near.GridNearOptimisticSerializableTxPrepareFuture$MiniFuture$1$1 org.apache.ignite.internal.processors.cache.distributed.near.GridNearOptimisticTxPrepareFuture$1 org.apache.ignite.internal.processors.cache.distributed.near.GridNearOptimisticTxPrepareFuture$2 -org.apache.ignite.internal.processors.cache.distributed.near.GridNearOptimisticTxPrepareFuture$3 org.apache.ignite.internal.processors.cache.distributed.near.GridNearOptimisticTxPrepareFuture$MiniFuture$1 org.apache.ignite.internal.processors.cache.distributed.near.GridNearOptimisticTxPrepareFutureAdapter$1 org.apache.ignite.internal.processors.cache.distributed.near.GridNearPessimisticTxPrepareFuture$1 org.apache.ignite.internal.processors.cache.distributed.near.GridNearPessimisticTxPrepareFuture$2 -org.apache.ignite.internal.processors.cache.distributed.near.GridNearPessimisticTxPrepareFuture$3 +org.apache.ignite.internal.processors.cache.distributed.near.GridNearSingleGetRequest +org.apache.ignite.internal.processors.cache.distributed.near.GridNearSingleGetResponse org.apache.ignite.internal.processors.cache.distributed.near.GridNearTransactionalCache org.apache.ignite.internal.processors.cache.distributed.near.GridNearTransactionalCache$1 org.apache.ignite.internal.processors.cache.distributed.near.GridNearTransactionalCache$2 org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxFinishFuture$1 -org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxFinishFuture$2 org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxFinishRequest org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxFinishResponse org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxLocal @@ -725,6 +730,7 @@ org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxLocal$4 org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxLocal$5 org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxLocal$6 org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxLocal$7 +org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxLocal$8 org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxPrepareFutureAdapter$1 org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxPrepareRequest org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxPrepareResponse @@ -788,11 +794,16 @@ org.apache.ignite.internal.processors.cache.query.GridCacheQueryType org.apache.ignite.internal.processors.cache.query.GridCacheSqlIndexMetadata org.apache.ignite.internal.processors.cache.query.GridCacheSqlMetadata org.apache.ignite.internal.processors.cache.query.GridCacheSqlQuery +org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryBatchAck org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryEntry org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryEvent org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryHandler +org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryHandler$1$1 +org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryHandler$1$2 org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryHandler$2 +org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryHandler$3 org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryHandler$DeployableObject +org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryManager$1 org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryManager$JCacheQueryRemoteFilter org.apache.ignite.internal.processors.cache.query.jdbc.GridCacheQueryJdbcMetadataTask org.apache.ignite.internal.processors.cache.query.jdbc.GridCacheQueryJdbcMetadataTask$JdbcDriverMetadataJob @@ -836,7 +847,7 @@ org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalAdapter$15 org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalAdapter$2 org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalAdapter$4 org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalAdapter$5 -org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalAdapter$7 +org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalAdapter$8 org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalAdapter$9 org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalAdapter$FinishClosure org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalAdapter$PLC1 @@ -897,6 +908,8 @@ org.apache.ignite.internal.processors.continuous.GridContinuousHandler org.apache.ignite.internal.processors.continuous.GridContinuousHandler$RegisterStatus org.apache.ignite.internal.processors.continuous.GridContinuousMessage org.apache.ignite.internal.processors.continuous.GridContinuousMessageType +org.apache.ignite.internal.processors.continuous.GridContinuousProcessor$10$1 +org.apache.ignite.internal.processors.continuous.GridContinuousProcessor$9 org.apache.ignite.internal.processors.continuous.GridContinuousProcessor$DiscoveryData org.apache.ignite.internal.processors.continuous.GridContinuousProcessor$DiscoveryDataItem org.apache.ignite.internal.processors.continuous.GridContinuousProcessor$LocalRoutineInfo @@ -924,15 +937,17 @@ org.apache.ignite.internal.processors.datastreamer.DataStreamerResponse org.apache.ignite.internal.processors.datastreamer.DataStreamerUpdateJob$1 org.apache.ignite.internal.processors.datastructures.CacheDataStructuresCacheKey org.apache.ignite.internal.processors.datastructures.CacheDataStructuresConfigurationKey -org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$1 org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$10 org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$11 org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$12 org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$13 +org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$14 org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$15 org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$16 -org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$17 +org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$18 +org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$19 org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$2 +org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$20 org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$3 org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$4 org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$5 @@ -974,6 +989,8 @@ org.apache.ignite.internal.processors.datastructures.GridCacheQueueHeader org.apache.ignite.internal.processors.datastructures.GridCacheQueueHeaderKey org.apache.ignite.internal.processors.datastructures.GridCacheQueueItemKey org.apache.ignite.internal.processors.datastructures.GridCacheQueueProxy +org.apache.ignite.internal.processors.datastructures.GridCacheSemaphoreImpl +org.apache.ignite.internal.processors.datastructures.GridCacheSemaphoreState org.apache.ignite.internal.processors.datastructures.GridCacheSetHeader org.apache.ignite.internal.processors.datastructures.GridCacheSetHeaderKey org.apache.ignite.internal.processors.datastructures.GridCacheSetImpl$CollocatedItemKey @@ -1294,6 +1311,7 @@ org.apache.ignite.internal.util.IgniteUtils$6 org.apache.ignite.internal.util.IgniteUtils$7 org.apache.ignite.internal.util.IgniteUtils$8 org.apache.ignite.internal.util.IgniteUtils$9 +org.apache.ignite.internal.util.UUIDCollectionMessage org.apache.ignite.internal.util.future.GridCompoundFuture$1 org.apache.ignite.internal.util.future.GridCompoundFuture$Listener org.apache.ignite.internal.util.future.GridEmbeddedFuture$1 @@ -1673,8 +1691,8 @@ org.apache.ignite.spi.collision.priorityqueue.PriorityQueueCollisionSpi$Priority org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi$1 org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi$2$ConnectClosure org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi$2$ConnectClosure$1 -org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi$7 org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi$8 +org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi$9 org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi$HandshakeClosure org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi$HandshakeMessage org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi$HandshakeTimeoutException http://git-wip-us.apache.org/repos/asf/ignite/blob/802d48b5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryAbstractTest.java index 7e23863..37cf26d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryAbstractTest.java @@ -155,7 +155,7 @@ public abstract class CacheVersionedEntryAbstractTest extends GridCacheAbstractS }); assert ver1.version().compareTo(ver2.version()) < 0; - assert ver1.updateTime() < ver2.updateTime(); + assert ver1.updateTime() <= ver2.updateTime(); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/802d48b5/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java index 8f5e07b..8f28aef 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java @@ -116,7 +116,7 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { include = true; - startGridsMultiThreaded(GRID_CNT - 1); + startGrids(GRID_CNT - 1); include = false; @@ -878,33 +878,37 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testMasterNodeLeave() throws Exception { - Ignite g = startGrid("anotherGrid"); - - final UUID nodeId = g.cluster().localNode().id(); final CountDownLatch latch = new CountDownLatch(GRID_CNT); - for (int i = 0; i < GRID_CNT; i++) { - grid(i).events().localListen(new IgnitePredicate<Event>() { - @Override public boolean apply(Event evt) { - if (nodeId.equals(((DiscoveryEvent) evt).eventNode().id())) - latch.countDown(); + Ignite g = startGrid("anotherGrid"); - return true; - } - }, EVT_NODE_LEFT, EVT_NODE_FAILED); - } + try { + final UUID nodeId = g.cluster().localNode().id(); + for (int i = 0; i < GRID_CNT; i++) { + grid(i).events().localListen(new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { + if (nodeId.equals(((DiscoveryEvent)evt).eventNode().id())) + latch.countDown(); - g.events().remoteListen( - null, - new P1<Event>() { - @Override public boolean apply(Event evt) { - return true; - } - }, - EVTS_ALL - ); + return true; + } + }, EVT_NODE_LEFT, EVT_NODE_FAILED); + } - stopGrid("anotherGrid"); + g.events().remoteListen( + null, + new P1<Event>() { + @Override public boolean apply(Event evt) { + return true; + } + }, + EVTS_ALL + ); + + } + finally { + stopGrid("anotherGrid"); + } assert latch.await(3000, MILLISECONDS); } @@ -915,42 +919,47 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { public void testMasterNodeLeaveNoAutoUnsubscribe() throws Exception { Ignite g = startGrid("anotherGrid"); - final UUID nodeId = g.cluster().localNode().id(); - final CountDownLatch discoLatch = new CountDownLatch(GRID_CNT); + final CountDownLatch discoLatch; - for (int i = 0; i < GRID_CNT; i++) { - grid(0).events().localListen(new IgnitePredicate<Event>() { - @Override public boolean apply(Event evt) { - if (nodeId.equals(((DiscoveryEvent) evt).eventNode().id())) - discoLatch.countDown(); + try { + final UUID nodeId = g.cluster().localNode().id(); + discoLatch = new CountDownLatch(GRID_CNT); - return true; - } - }, EVT_NODE_LEFT); - } + for (int i = 0; i < GRID_CNT; i++) { + grid(0).events().localListen(new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { + if (nodeId.equals(((DiscoveryEvent) evt).eventNode().id())) + discoLatch.countDown(); - consumeLatch = new CountDownLatch(GRID_CNT * 2 + 1); - consumeCnt = new AtomicInteger(); + return true; + } + }, EVT_NODE_LEFT); + } - noAutoUnsubscribe = true; + consumeLatch = new CountDownLatch(GRID_CNT * 2 + 1); + consumeCnt = new AtomicInteger(); - g.events().remoteListen( - 1, 0, false, - null, - new P1<Event>() { - @Override public boolean apply(Event evt) { - consumeLatch.countDown(); - consumeCnt.incrementAndGet(); + noAutoUnsubscribe = true; - return true; - } - }, - EVT_JOB_STARTED - ); + g.events().remoteListen( + 1, 0, false, + null, + new P1<Event>() { + @Override public boolean apply(Event evt) { + consumeLatch.countDown(); + consumeCnt.incrementAndGet(); - grid(0).compute().broadcast(F.noop()); + return true; + } + }, + EVT_JOB_STARTED + ); - stopGrid("anotherGrid"); + grid(0).compute().broadcast(F.noop()); + } + finally { + stopGrid("anotherGrid"); + } discoLatch.await(3000, MILLISECONDS);