merge from master
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/909a1b88 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/909a1b88 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/909a1b88 Branch: refs/heads/ignite-1.4-slow-server-debug Commit: 909a1b88f05c4e31cc9eabb27adbf62a4314234d Parents: d877d74 c28af3c Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Wed Oct 21 17:00:44 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Wed Oct 21 17:00:44 2015 +0300 ---------------------------------------------------------------------- DEVNOTES.txt | 3 +- assembly/dependencies-hadoop.xml | 1 + assembly/release-fabric-lgpl.xml | 63 + assembly/release-hadoop-lgpl.xml | 39 + examples-lgpl/README.txt | 27 + examples-lgpl/config/example-cache.xml | 73 + examples-lgpl/config/example-ignite.xml | 83 ++ examples-lgpl/config/hibernate/README.txt | 8 + .../hibernate/example-hibernate-L2-cache.xml | 64 + examples-lgpl/pom-standalone.xml | 186 +++ examples-lgpl/pom.xml | 128 ++ .../hibernate/HibernateL2CacheExample.java | 245 ++++ .../examples/datagrid/hibernate/Post.java | 130 ++ .../examples/datagrid/hibernate/User.java | 154 ++ .../datagrid/hibernate/package-info.java | 22 + .../hibernate/CacheHibernatePersonStore.java | 122 ++ .../hibernate/CacheHibernateStoreExample.java | 151 ++ .../datagrid/store/hibernate/Person.hbm.xml | 34 + .../datagrid/store/hibernate/hibernate.cfg.xml | 41 + .../datagrid/store/hibernate/package-info.java | 22 + .../misc/schedule/ComputeScheduleExample.java | 82 ++ .../examples/misc/schedule/package-info.java | 22 + .../misc/schedule/ComputeScheduleExample.java | 68 + .../java8/misc/schedule/package-info.java | 22 + .../ignite/examples/java8/package-info.java | 23 + .../scalar/examples/ScalarScheduleExample.scala | 66 + ...ibernateL2CacheExampleMultiNodeSelfTest.java | 31 + .../HibernateL2CacheExampleSelfTest.java | 33 + .../IgniteLgplExamplesSelfTestSuite.java | 48 + ...ibernateL2CacheExampleMultiNodeSelfTest.java | 29 + .../HibernateL2CacheExampleSelfTest.java | 37 + .../IgniteLgplExamplesJ8SelfTestSuite.java | 46 + .../ScalarLgplExamplesMultiNodeSelfTest.scala | 33 + .../examples/ScalarLgplExamplesSelfTest.scala | 36 + .../ScalarLgplExamplesSelfTestSuite.scala | 37 + examples/config/hibernate/README.txt | 8 - .../hibernate/example-hibernate-L2-cache.xml | 64 - examples/pom-standalone.xml | 12 - examples/pom.xml | 14 +- examples/schema-import/pom.xml | 5 +- .../computegrid/ComputeClosureExample.java | 2 +- .../hibernate/HibernateL2CacheExample.java | 245 ---- .../examples/datagrid/hibernate/Post.java | 130 -- .../examples/datagrid/hibernate/User.java | 154 -- .../datagrid/hibernate/package-info.java | 22 - .../hibernate/CacheHibernatePersonStore.java | 122 -- .../hibernate/CacheHibernateStoreExample.java | 151 -- .../datagrid/store/hibernate/Person.hbm.xml | 34 - .../datagrid/store/hibernate/hibernate.cfg.xml | 41 - .../datagrid/store/hibernate/package-info.java | 22 - .../misc/schedule/ComputeScheduleExample.java | 82 -- .../examples/misc/schedule/package-info.java | 22 - .../socket/WordsSocketStreamerServer.java | 5 +- .../misc/schedule/ComputeScheduleExample.java | 68 - .../java8/misc/schedule/package-info.java | 22 - .../scalar/examples/ScalarScheduleExample.scala | 66 - ...ibernateL2CacheExampleMultiNodeSelfTest.java | 31 - .../HibernateL2CacheExampleSelfTest.java | 33 - .../testsuites/IgniteExamplesSelfTestSuite.java | 4 - ...ibernateL2CacheExampleMultiNodeSelfTest.java | 29 - .../HibernateL2CacheExampleSelfTest.java | 37 - .../tests/examples/ScalarExamplesSelfTest.scala | 5 - modules/aop/pom.xml | 2 +- modules/apache-license-gen/README.txt | 33 + modules/apache-license-gen/pom.xml | 5 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- .../JettyRestProcessorAbstractSelfTest.java | 252 +++- modules/cloud/pom.xml | 2 +- .../TcpDiscoveryCloudIpFinderSelfTest.java | 2 + modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- .../org/apache/ignite/IgniteAtomicLong.java | 15 +- .../apache/ignite/IgniteAtomicReference.java | 9 +- .../org/apache/ignite/IgniteAtomicSequence.java | 9 +- .../org/apache/ignite/IgniteAtomicStamped.java | 13 +- .../org/apache/ignite/IgniteFileSystem.java | 4 +- .../apache/ignite/IgniteSystemProperties.java | 3 + .../org/apache/ignite/IgniteTransactions.java | 4 - .../configuration/CacheConfiguration.java | 2 +- .../ignite/configuration/TopologyValidator.java | 38 +- .../java/org/apache/ignite/igfs/IgfsPath.java | 2 +- .../apache/ignite/internal/IgniteKernal.java | 70 +- .../managers/discovery/CustomEventListener.java | 4 +- .../discovery/GridDiscoveryManager.java | 79 +- .../internal/portable/PortableContext.java | 7 + .../portable/api/PortableMarshaller.java | 14 +- .../cache/DynamicCacheChangeRequest.java | 19 + .../cache/DynamicCacheDescriptor.java | 36 + .../processors/cache/GridCacheAdapter.java | 357 +++-- .../cache/GridCacheClearAllRunnable.java | 18 +- .../cache/GridCacheConcurrentMap.java | 4 +- .../processors/cache/GridCacheContext.java | 2 +- .../processors/cache/GridCacheEventManager.java | 12 +- .../cache/GridCacheExplicitLockSpan.java | 13 +- .../processors/cache/GridCacheIoManager.java | 85 +- .../processors/cache/GridCacheMessage.java | 7 - .../cache/GridCacheMvccCandidate.java | 5 +- .../processors/cache/GridCacheMvccManager.java | 65 +- .../GridCachePartitionExchangeManager.java | 92 +- .../processors/cache/GridCacheProcessor.java | 140 +- .../processors/cache/GridCacheProxyImpl.java | 14 +- .../cache/GridCacheSharedContext.java | 32 - .../processors/cache/GridCacheSwapManager.java | 4 +- .../processors/cache/GridCacheUtils.java | 8 - .../processors/cache/IgniteCacheProxy.java | 2 +- .../processors/cache/IgniteInternalCache.java | 19 +- .../distributed/GridDistributedCacheEntry.java | 2 +- .../dht/GridDhtAffinityAssignmentRequest.java | 5 - .../dht/GridDhtAffinityAssignmentResponse.java | 5 - .../distributed/dht/GridDhtCacheAdapter.java | 6 +- .../cache/distributed/dht/GridDhtGetFuture.java | 4 +- .../distributed/dht/GridDhtLockRequest.java | 10 +- .../distributed/dht/GridDhtTxFinishRequest.java | 5 - .../distributed/dht/GridDhtTxPrepareFuture.java | 6 +- .../dht/GridDhtTxPrepareRequest.java | 7 +- .../dht/GridPartitionedGetFuture.java | 5 +- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 5 + .../dht/atomic/GridNearAtomicUpdateFuture.java | 17 +- .../dht/colocated/GridDhtColocatedCache.java | 12 +- .../colocated/GridDhtColocatedLockFuture.java | 27 +- .../dht/preloader/GridDhtForceKeysRequest.java | 5 - .../dht/preloader/GridDhtForceKeysResponse.java | 5 - .../GridDhtPartitionDemandMessage.java | 6 - .../GridDhtPartitionSupplyMessage.java | 5 - .../GridDhtPartitionsAbstractMessage.java | 5 - .../GridDhtPartitionsExchangeFuture.java | 16 +- .../dht/preloader/GridDhtPreloader.java | 8 +- .../distributed/near/GridNearCacheAdapter.java | 21 +- .../near/GridNearCacheClearAllRunnable.java | 9 +- .../distributed/near/GridNearGetFuture.java | 2 + .../distributed/near/GridNearLockFuture.java | 11 +- .../near/GridNearOptimisticTxPrepareFuture.java | 24 +- .../near/GridNearTxFinishFuture.java | 4 +- .../cache/distributed/near/GridNearTxLocal.java | 21 +- .../cache/local/GridLocalCacheEntry.java | 2 +- .../cache/query/GridCacheQueryManager.java | 33 +- .../cache/query/GridCacheSqlIndexMetadata.java | 7 +- .../cache/query/GridCacheSqlMetadata.java | 22 +- .../continuous/CacheContinuousQueryHandler.java | 10 +- .../transactions/IgniteTxLocalAdapter.java | 35 +- .../continuous/GridContinuousProcessor.java | 17 +- .../datastructures/DataStructuresProcessor.java | 54 +- .../processors/igfs/IgfsDataManager.java | 2 - .../processors/igfs/IgfsDeleteWorker.java | 102 +- .../internal/processors/igfs/IgfsFileInfo.java | 15 +- .../internal/processors/igfs/IgfsImpl.java | 372 +---- .../processors/igfs/IgfsMetaManager.java | 1255 ++++++++++++---- .../processors/igfs/IgfsOutputStreamImpl.java | 2 + .../internal/processors/igfs/IgfsUtils.java | 23 + .../processors/rest/GridRestCommand.java | 8 +- .../processors/rest/GridRestProcessor.java | 364 ++++- .../handlers/cache/GridCacheCommandHandler.java | 364 ++--- .../handlers/query/QueryCommandHandler.java | 195 ++- .../top/GridTopologyCommandHandler.java | 31 +- .../rest/request/RestQueryRequest.java | 175 +++ .../rest/request/RestSqlQueryRequest.java | 125 -- .../ignite/internal/util/GridArgumentCheck.java | 5 +- .../ignite/internal/util/GridJavaProcess.java | 12 +- .../ignite/internal/util/IgniteUtils.java | 2 +- .../ignite/internal/util/lang/GridFunc.java | 12 + .../util/nio/GridNioRecoveryDescriptor.java | 4 +- .../apache/ignite/marshaller/Marshaller.java | 2 +- .../optimized/OptimizedMarshallerUtils.java | 6 +- .../ignite/spi/deployment/DeploymentSpi.java | 8 +- .../org/apache/ignite/stream/StreamAdapter.java | 104 +- .../stream/StreamMultipleTupleExtractor.java | 38 + .../stream/StreamSingleTupleExtractor.java | 40 + .../ignite/stream/StreamTupleExtractor.java | 20 +- .../ignite/stream/socket/SocketStreamer.java | 3 +- .../core/src/main/resources/ignite.properties | 2 +- modules/core/src/test/config/tests.properties | 3 + .../ignite/igfs/IgfsEventsAbstractSelfTest.java | 6 +- .../ignite/igfs/IgfsFragmentizerSelfTest.java | 2 +- .../internal/GridUpdateNotifierSelfTest.java | 1 + .../IgniteClientReconnectAbstractTest.java | 35 +- .../IgniteClientReconnectCacheTest.java | 154 ++ .../GridDiscoveryManagerAliveCacheSelfTest.java | 2 + .../cache/CacheAffinityCallSelfTest.java | 4 +- .../processors/cache/CrossCacheLockTest.java | 142 ++ .../GridCacheAbstractFailoverSelfTest.java | 3 + .../cache/GridCacheAbstractFullApiSelfTest.java | 486 ++++--- .../GridCacheAbstractRemoveFailureTest.java | 3 + .../cache/GridCacheClearSelfTest.java | 308 ++++ .../GridCacheDeploymentOffHeapSelfTest.java | 15 + .../GridCacheFinishPartitionsSelfTest.java | 5 +- .../GridCacheVariableTopologySelfTest.java | 3 +- ...IgniteCacheAtomicPutAllFailoverSelfTest.java | 4 + .../IgniteCacheConfigurationTemplateTest.java | 31 + .../cache/IgniteCacheCreateRestartSelfTest.java | 3 + .../cache/IgniteCacheEntryListenerTxTest.java | 4 + .../IgniteCacheP2pUnmarshallingErrorTest.java | 7 + ...CacheP2pUnmarshallingRebalanceErrorTest.java | 12 +- .../cache/IgniteCachePutAllRestartTest.java | 4 +- .../cache/IgniteDynamicCacheFilterTest.java | 150 ++ .../IgniteTxExceptionAbstractSelfTest.java | 3 + ...omicOffheapQueueCreateMultiNodeSelfTest.java | 5 - ...ionedAtomicQueueCreateMultiNodeSelfTest.java | 9 +- ...artitionedOffHeapValuesQueueApiSelfTest.java | 4 + ...PartitionedQueueCreateMultiNodeSelfTest.java | 16 +- ...nedQueueFailoverDataConsistencySelfTest.java | 5 - ...GridCachePartitionedSetFailoverSelfTest.java | 4 + .../CacheAbstractRestartSelfTest.java | 247 ++++ ...acheAsyncOperationsFailoverAbstractTest.java | 11 + .../CacheGetFutureHangsSelfTest.java | 159 +-- ...NearDisabledAtomicInvokeRestartSelfTest.java | 179 +++ ...abledTransactionalInvokeRestartSelfTest.java | 173 +++ ...edTransactionalWriteReadRestartSelfTest.java | 124 ++ .../CacheNoValueClassOnServerNodeTest.java | 1 + .../CachePutAllFailoverAbstractTest.java | 11 + .../IgniteCacheAtomicNodeRestartTest.java | 8 + ...niteCacheClientNodeChangingTopologyTest.java | 10 +- .../IgniteCacheCreatePutMultiNodeSelfTest.java | 151 ++ .../distributed/IgniteCacheCreatePutTest.java | 125 ++ .../IgniteCachePutGetRestartAbstractTest.java | 3 + .../IgniteCacheSizeFailoverTest.java | 3 + .../IgniteTxPreloadAbstractTest.java | 43 +- .../GridCacheColocatedTxExceptionSelfTest.java | 5 - .../dht/GridCacheDhtEntrySelfTest.java | 2 +- .../dht/GridCacheTxNodeFailureSelfTest.java | 2 + .../dht/GridNearCacheTxNodeFailureSelfTest.java | 4 + ...gniteAtomicLongChangingTopologySelfTest.java | 190 ++- .../IgniteCacheCrossCacheTxFailoverTest.java | 3 + .../IgniteCrossCacheTxNearEnabledSelfTest.java | 28 + .../dht/IgniteCrossCacheTxSelfTest.java | 213 +++ ...tomicClientOnlyMultiNodeFullApiSelfTest.java | 71 +- ...ledFairAffinityMultiNodeFullApiSelfTest.java | 4 + ...icOffHeapTieredMultiNodeFullApiSelfTest.java | 7 +- .../near/GridCacheNearTxExceptionSelfTest.java | 9 +- ...achePartitionedMultiNodeFullApiSelfTest.java | 129 +- .../near/NearCacheMultithreadedUpdateTest.java | 217 +++ .../GridCacheReplicatedInvalidateSelfTest.java | 249 ---- .../GridCacheReplicatedTxExceptionSelfTest.java | 5 - .../replicated/GridReplicatedTxPreloadTest.java | 9 +- ...eCacheExpiryPolicyWithStoreAbstractTest.java | 5 +- .../GridCacheLocalTxExceptionSelfTest.java | 5 - ...bledFairAffinityMultiJvmFullApiSelfTest.java | 5 + ...tomicNearEnabledMultiJvmFullApiSelfTest.java | 5 + .../DataStreamerMultiThreadedSelfTest.java | 4 +- .../DataStreamerMultinodeCreateCacheTest.java | 2 + .../processors/igfs/IgfsAbstractSelfTest.java | 927 +++++++++--- .../igfs/IgfsClientCacheSelfTest.java | 15 +- .../igfs/IgfsDataManagerSelfTest.java | 13 +- .../igfs/IgfsMetaManagerSelfTest.java | 258 ++-- .../processors/igfs/IgfsMetricsSelfTest.java | 2 +- .../processors/igfs/IgfsProcessorSelfTest.java | 41 +- .../igfs/UniversalFileSystemAdapter.java | 1 - .../tcp/TcpClientDiscoverySpiSelfTest.java | 2 + .../stream/socket/SocketStreamerSelfTest.java | 112 +- .../testframework/junits/GridAbstractTest.java | 116 +- .../junits/IgniteTestResources.java | 8 +- .../junits/common/GridCommonAbstractTest.java | 15 +- .../junits/multijvm/AffinityProcessProxy.java | 440 ++++-- .../multijvm/IgniteCacheProcessProxy.java | 1347 ++++++++++++++---- .../multijvm/IgniteClusterProcessProxy.java | 115 +- .../multijvm/IgniteEventsProcessProxy.java | 50 +- .../junits/multijvm/IgniteNodeRunner.java | 39 +- .../junits/multijvm/IgniteProcessProxy.java | 107 +- .../IgniteCacheFailoverTestSuite.java | 4 - .../IgniteCacheFailoverTestSuite3.java | 28 +- .../IgniteCacheFullApiSelfTestSuite.java | 8 +- .../IgniteCacheLoadConsistencyTestSuite.java | 42 + .../testsuites/IgniteCacheTestSuite3.java | 2 - .../testsuites/IgniteCacheTestSuite4.java | 22 + .../ignite/testsuites/IgniteIgfsTestSuite.java | 6 + modules/extdata/p2p/pom.xml | 2 +- .../extdata/uri/modules/uri-dependency/pom.xml | 2 +- modules/extdata/uri/pom.xml | 13 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- .../processors/hadoop/igfs/HadoopIgfsUtils.java | 36 + .../hadoop/igfs/HadoopIgfsWrapper.java | 54 +- ...oopFileSystemUniversalFileSystemAdapter.java | 4 +- .../HadoopIgfs20FileSystemAbstractSelfTest.java | 34 +- .../IgniteHadoopFileSystemAbstractSelfTest.java | 7 +- .../testsuites/IgniteHadoopTestSuite.java | 19 +- modules/hibernate/pom.xml | 2 +- .../CacheHibernateBlobStoreSelfTest.java | 6 +- modules/indexing/pom.xml | 2 +- .../processors/query/h2/sql/GridSqlArray.java | 52 + .../processors/query/h2/sql/GridSqlElement.java | 2 +- .../query/h2/sql/GridSqlFunction.java | 60 +- .../query/h2/sql/GridSqlFunctionType.java | 3 + .../query/h2/sql/GridSqlPlaceholder.java | 7 +- .../query/h2/sql/GridSqlQueryParser.java | 84 +- .../processors/query/h2/sql/GridSqlType.java | 29 +- .../cache/CacheConfigurationP2PTest.java | 3 + .../cache/SqlFieldsQuerySelfTest.java | 172 +++ .../query/h2/sql/GridQueryParsingTest.java | 27 + .../IgniteCacheQuerySelfTestSuite.java | 2 + modules/jcl/pom.xml | 2 +- modules/jms11/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/kafka/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/log4j2/pom.xml | 2 +- modules/mesos/pom.xml | 2 +- modules/mqtt/pom.xml | 114 ++ .../apache/ignite/stream/mqtt/MqttStreamer.java | 611 ++++++++ .../stream/mqtt/IgniteMqttStreamerTest.java | 553 +++++++ .../mqtt/IgniteMqttStreamerTestSuite.java | 34 + modules/platform/pom.xml | 2 +- .../platform/src/main/cpp/common/configure.ac | 2 +- .../main/cpp/common/project/vs/common.vcxproj | 4 +- .../src/main/cpp/core-test/configure.ac | 2 +- modules/platform/src/main/cpp/core/configure.ac | 2 +- .../Properties/AssemblyInfo.cs | 4 +- .../Apache.Ignite/Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- modules/rest-http/pom.xml | 2 +- .../http/jetty/GridJettyJsonConfig.java | 158 +- .../http/jetty/GridJettyRestHandler.java | 186 +-- modules/scalar-2.10/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- .../spi/deployment/uri/UriDeploymentSpi.java | 93 +- .../scanners/http/UriDeploymentHttpScanner.java | 10 +- .../http/GridHttpDeploymentSelfTest.java | 132 +- modules/visor-console-2.10/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- .../visor/commands/kill/VisorKillCommand.scala | 2 +- .../scala/org/apache/ignite/visor/visor.scala | 1 - modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- .../config/benchmark-put-indexed-val.properties | 2 +- modules/yardstick/pom.xml | 12 +- modules/yarn/pom.xml | 2 +- modules/zookeeper/pom.xml | 2 +- pom.xml | 82 +- 339 files changed, 13919 insertions(+), 5230 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/909a1b88/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/909a1b88/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/909a1b88/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/909a1b88/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/909a1b88/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/909a1b88/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/909a1b88/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/909a1b88/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/909a1b88/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/909a1b88/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/909a1b88/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java index b6ffbcc,a2440e2..ad51600 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java @@@ -476,4 -443,74 +443,74 @@@ public class GridCachePartitionedMultiN assertFalse(affinity(cache).isPrimaryOrBackup(other, key)); } } + + /** + * + */ + private static class SwapUnswapLocalListener implements IgnitePredicate<Event> { + /** Logger. */ + @LoggerResource + private IgniteLogger log; + + /** Ignite. */ + @IgniteInstanceResource + private Ignite ignite; + + /** {@inheritDoc} */ + @Override public boolean apply(Event evt) { + log.info("Received event: " + evt); + + switch (evt.type()) { + case EVT_CACHE_OBJECT_SWAPPED: + ignite.atomicLong("swapEvts", 0, false).incrementAndGet(); + + break; + case EVT_CACHE_OBJECT_UNSWAPPED: + ignite.atomicLong("unswapEvts", 0, false).incrementAndGet(); + + break; + } + + return true; + } + } + + /** + * + */ + private static class CheckAffinityTask extends TestIgniteIdxRunnable { + /** Size. */ + private final int size; + + /** + * @param size Size. + */ + public CheckAffinityTask(int size) { + this.size = size; + } + + /** {@inheritDoc} */ + @Override public void run(int idx) throws Exception { + assertEquals(0, ((IgniteKernal)ignite).<String, Integer>internalCache().context().tm().idMapSize()); + + IgniteCache<Object, Object> cache = ignite.cache(null); + ClusterNode node = ((IgniteKernal)ignite).localNode(); + + for (int k = 0; k < size; k++) { + if (affinity(cache).isPrimaryOrBackup(node, k)) + assertEquals("Check failed for node: " + node.id(), k, + cache.localPeek(k, CachePeekMode.ONHEAP, CachePeekMode.OFFHEAP)); + } + } + } + + /** + * + */ + private static class IsNearTask extends TestIgniteIdxRunnable { + /** {@inheritDoc} */ + @Override public void run(int idx) throws Exception { + assertTrue(((IgniteKernal)ignite).internalCache().context().isNear()); + } + } -} +} http://git-wip-us.apache.org/repos/asf/ignite/blob/909a1b88/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java ----------------------------------------------------------------------