ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [56/56] [abbrv] incubator-ignite git commit: Merge branch 'sprint-1' into ignite-49
Date Thu, 22 Jan 2015 15:16:20 GMT
Merge branch 'sprint-1' into ignite-49


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/50b36c41
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/50b36c41
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/50b36c41

Branch: refs/heads/ignite-49
Commit: 50b36c41948347d69a5a26cb4f967e30b6012d68
Parents: 9c6601f b9288ff
Author: nikolay_tikhonov <ntikhonov@gridgain.com>
Authored: Thu Jan 22 18:15:05 2015 +0300
Committer: nikolay_tikhonov <ntikhonov@gridgain.com>
Committed: Thu Jan 22 18:15:15 2015 +0300

----------------------------------------------------------------------
 config/fabric/default-config.xml                |    6 +-
 config/hadoop/default-config.xml                |    8 +-
 examples/config/example-cache.xml               |    2 +-
 examples/config/filesystem/example-ggfs.xml     |    4 +-
 .../HibernateL2CacheExampleNodeStartup.java     |    6 +-
 .../store/CacheNodeWithStoreStartup.java        |   19 +-
 .../store/dummy/CacheDummyPersonStore.java      |   33 +-
 .../hibernate/CacheHibernatePersonStore.java    |   68 +-
 .../store/jdbc/CacheJdbcPersonStore.java        |   66 +-
 .../MemcacheRestExampleNodeStartup.java         |    5 +-
 ...GridClientAbstractMultiThreadedSelfTest.java |    7 +-
 .../client/GridClientTopologyCacheSelfTest.java |    4 +-
 .../org/gridgain/client/GridHashMapStore.java   |   22 +-
 .../GridClientAbstractMultiNodeSelfTest.java    |    5 +-
 .../integration/GridClientAbstractSelfTest.java |   32 +-
 .../rest/GridAbstractRestProcessorSelfTest.java |    3 +-
 .../rest/GridRestBinaryProtocolSelfTest.java    |    6 +-
 .../rest/GridRestMemcacheProtocolSelfTest.java  |    7 +-
 .../rest/GridTaskCommandHandlerSelfTest.java    |    7 +-
 .../jdbc/GridJdbcComplexQuerySelfTest.java      |    3 +-
 .../jdbc/GridJdbcConnectionSelfTest.java        |    6 +-
 .../jdbc/GridJdbcEmptyCacheSelfTest.java        |    4 +-
 .../jdbc/GridJdbcLocalCachesSelfTest.java       |    3 +-
 .../gridgain/jdbc/GridJdbcMetadataSelfTest.java |    3 +-
 .../jdbc/GridJdbcPreparedStatementSelfTest.java |    3 +-
 .../jdbc/GridJdbcResultSetSelfTest.java         |    3 +-
 .../jdbc/GridJdbcStatementSelfTest.java         |    3 +-
 .../clients/src/test/resources/spring-cache.xml |    8 +-
 .../src/test/resources/spring-server-node.xml   |   12 +-
 .../test/resources/spring-server-ssl-node.xml   |   10 +-
 .../java/org/apache/ignite/IgniteCache.java     |   25 +-
 .../org/apache/ignite/IgniteCacheManager.java   |   14 +-
 .../java/org/apache/ignite/IgnitePortables.java |    3 +-
 .../org/apache/ignite/IgniteTransactions.java   |    3 +-
 .../apache/ignite/cache/CacheConfiguration.java | 1784 +++++++++++++++++-
 .../cache/store/CacheLoadOnlyStoreAdapter.java  |  324 ++++
 .../ignite/cache/store/CacheLocalStore.java     |   31 +
 .../apache/ignite/cache/store/CacheStore.java   |  180 ++
 .../ignite/cache/store/CacheStoreAdapter.java   |   95 +
 .../cache/store/CacheStoreBalancingWrapper.java |  297 +++
 .../ignite/cache/store/CacheStoreSession.java   |   43 +
 .../cache/store/jdbc/CacheJdbcBlobStore.java    |  586 ++++++
 .../apache/ignite/cache/store/jdbc/package.html |   24 +
 .../org/apache/ignite/cache/store/package.html  |   23 +
 .../configuration/IgniteConfiguration.java      |   10 +-
 .../processors/cache/IgniteCacheProxy.java      |   38 +-
 .../resources/IgniteCacheNameResource.java      |    9 +-
 .../apache/ignite/transactions/IgniteTx.java    |    6 +-
 .../gridgain/grid/GridBasicWarmupClosure.java   |   19 +-
 .../java/org/gridgain/grid/cache/GridCache.java |   23 +-
 .../grid/cache/GridCacheAtomicityMode.java      |    3 +-
 .../grid/cache/GridCacheConfiguration.java      | 1750 -----------------
 .../grid/cache/GridCacheDistributionMode.java   |    7 +-
 .../org/gridgain/grid/cache/GridCacheFlag.java  |    5 +-
 .../grid/cache/GridCacheInterceptor.java        |    3 +-
 .../org/gridgain/grid/cache/GridCacheMBean.java |    3 +-
 .../org/gridgain/grid/cache/GridCacheMode.java  |    5 +-
 .../grid/cache/GridCachePreloadMode.java        |    5 +-
 .../grid/cache/GridCacheProjection.java         |  159 +-
 .../GridCacheWriteSynchronizationMode.java      |    2 +-
 .../grid/cache/affinity/GridCacheAffinity.java  |   38 +-
 .../affinity/GridCacheAffinityFunction.java     |    3 +-
 .../affinity/GridCacheAffinityKeyMapper.java    |    4 +-
 ...GridCacheConsistentHashAffinityFunction.java |    4 +-
 .../fair/GridCachePartitionFairAffinity.java    |    4 +-
 .../GridCacheRendezvousAffinityFunction.java    |    5 +-
 .../grid/cache/cloner/GridCacheCloner.java      |    7 +-
 .../cache/eviction/GridCacheEvictionFilter.java |    3 +-
 .../fifo/GridCacheFifoEvictionPolicy.java       |    4 +-
 .../lru/GridCacheLruEvictionPolicy.java         |    3 +-
 .../random/GridCacheRandomEvictionPolicy.java   |    4 +-
 .../store/GridCacheLoadOnlyStoreAdapter.java    |  328 ----
 .../grid/cache/store/GridCacheLocalStore.java   |   31 -
 .../grid/cache/store/GridCacheStore.java        |  220 ---
 .../grid/cache/store/GridCacheStoreAdapter.java |  100 -
 .../store/GridCacheStoreBalancingWrapper.java   |  278 ---
 .../store/jdbc/GridCacheJdbcBlobStore.java      |  552 ------
 .../gridgain/grid/cache/store/jdbc/package.html |   24 -
 .../org/gridgain/grid/cache/store/package.html  |   23 -
 .../org/gridgain/grid/kernal/GridGainEx.java    |   29 +-
 .../org/gridgain/grid/kernal/GridKernal.java    |    5 +-
 .../kernal/processors/cache/CacheEntryImpl.java |   60 +
 .../processors/cache/CacheInvokeEntry.java      |    5 +-
 .../cache/CacheStorePartialUpdateException.java |   48 +
 .../processors/cache/GridCacheAdapter.java      |  395 +++-
 .../processors/cache/GridCacheAttributes.java   |   53 +-
 .../processors/cache/GridCacheContext.java      |   41 +-
 .../GridCacheDefaultAffinityKeyMapper.java      |    5 +-
 .../cache/GridCacheEvictionManager.java         |    3 +-
 .../cache/GridCacheLoaderWriterStore.java       |  140 ++
 .../processors/cache/GridCacheMapEntry.java     |    8 +-
 .../processors/cache/GridCacheProcessor.java    |  175 +-
 .../processors/cache/GridCacheProjectionEx.java |   18 +-
 .../processors/cache/GridCacheProxyImpl.java    |    3 +-
 .../processors/cache/GridCacheStoreManager.java |  776 +++++++-
 .../processors/cache/GridCacheTtlManager.java   |    4 +-
 .../kernal/processors/cache/GridCacheUtils.java |   19 +-
 .../cache/GridCacheWriteBehindStore.java        |  200 +-
 .../distributed/dht/GridDhtCacheAdapter.java    |  119 +-
 .../cache/distributed/dht/GridDhtGetFuture.java |   12 +-
 .../dht/GridDhtTransactionalCacheAdapter.java   |    2 +-
 .../dht/GridPartitionedGetFuture.java           |    8 +
 .../dht/atomic/GridDhtAtomicCache.java          |   52 +-
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |    6 +-
 .../dht/colocated/GridDhtColocatedCache.java    |    4 +
 .../colocated/GridDhtColocatedLockFuture.java   |    4 +-
 .../distributed/near/GridNearCacheAdapter.java  |    6 +
 .../distributed/near/GridNearGetFuture.java     |    8 +
 .../distributed/near/GridNearGetRequest.java    |   89 +-
 .../near/GridNearTransactionalCache.java        |    3 +
 .../cache/distributed/near/GridNearTxLocal.java |    9 +-
 .../cache/jta/GridCacheJtaManagerAdapter.java   |    4 +-
 .../cache/jta/GridCacheNoopJtaManager.java      |    4 +-
 .../local/atomic/GridLocalAtomicCache.java      |  102 +-
 .../cache/transactions/IgniteTxAdapter.java     |    3 +-
 .../cache/transactions/IgniteTxEx.java          |    8 +-
 .../transactions/IgniteTxLocalAdapter.java      |   26 +-
 .../cache/transactions/IgniteTxLocalEx.java     |    2 +
 .../cache/transactions/IgniteTxProxyImpl.java   |   72 -
 .../dataload/GridDataLoadCacheUpdaters.java     |    3 +-
 .../dr/GridDrDataLoadCacheUpdater.java          |    5 +-
 .../kernal/processors/ggfs/GridGgfsHelper.java  |    6 +-
 .../processors/ggfs/GridGgfsHelperImpl.java     |    6 +-
 .../kernal/processors/ggfs/GridGgfsImpl.java    |    5 +-
 .../processors/ggfs/GridGgfsProcessor.java      |   10 +-
 .../processors/ggfs/GridNoopGgfsHelper.java     |    7 +-
 .../processors/query/GridQueryProcessor.java    |    8 +-
 .../grid/kernal/visor/cache/VisorCache.java     |    4 +-
 .../cache/VisorCacheAffinityConfiguration.java  |    4 +-
 .../visor/cache/VisorCacheConfiguration.java    |    7 +-
 .../cache/VisorCacheDefaultConfiguration.java   |   10 +-
 .../visor/cache/VisorCacheDgcConfiguration.java |    4 +-
 .../cache/VisorCacheEvictionConfiguration.java  |   10 +-
 .../cache/VisorCacheNearConfiguration.java      |    4 +-
 .../cache/VisorCachePreloadConfiguration.java   |    3 +-
 .../cache/VisorCacheStoreConfiguration.java     |   12 +-
 .../VisorCacheWriteBehindConfiguration.java     |    4 +-
 .../spring-cache-client-benchmark-1.xml         |    4 +-
 .../spring-cache-client-benchmark-2.xml         |    4 +-
 .../spring-cache-client-benchmark-3.xml         |    4 +-
 .../core/src/test/config/discovery-stress.xml   |    2 +-
 modules/core/src/test/config/example-cache.xml  |    2 +-
 modules/core/src/test/config/ggfs-loopback.xml  |    4 +-
 .../core/src/test/config/ggfs-no-endpoint.xml   |    4 +-
 modules/core/src/test/config/ggfs-shmem.xml     |    4 +-
 .../src/test/config/load/cache-benchmark.xml    |    4 +-
 .../test/config/load/cache-client-benchmark.xml |    4 +-
 .../config/load/dsi-49-server-production.xml    |    4 +-
 .../src/test/config/load/dsi-load-client.xml    |    4 +-
 .../src/test/config/load/dsi-load-server.xml    |    4 +-
 .../test/config/load/mongo-multinode-foster.xml |    4 +-
 .../core/src/test/config/spring-cache-load.xml  |    2 +-
 .../config/spring-cache-put-remove-load.xml     |    2 +-
 .../core/src/test/config/spring-cache-swap.xml  |    2 +-
 .../src/test/config/spring-cache-teststore.xml  |    2 +-
 .../core/src/test/config/spring-multicache.xml  |   18 +-
 .../test/config/websession/spring-cache-1.xml   |    6 +-
 .../test/config/websession/spring-cache-2.xml   |    6 +-
 .../test/config/websession/spring-cache-3.xml   |    6 +-
 ...CacheJdbcBlobStoreMultithreadedSelfTest.java |  250 +++
 .../jdbc/GridCacheJdbcBlobStoreSelfTest.java    |   51 +
 .../apache/ignite/cache/store/jdbc/package.html |   23 +
 .../cache/IgniteCacheAbstractTest.java          |   58 +-
 ...niteCacheAtomicLocalWithStoreInvokeTest.java |    4 +-
 ...micPrimaryWriteOrderWithStoreInvokeTest.java |    4 +-
 .../IgniteCacheEntryListenerAbstractTest.java   |    8 +-
 .../cache/IgniteCacheInvokeReadThroughTest.java |    4 +-
 .../cache/IgniteCachingProviderSelfTest.java    |    9 +-
 ...maryWriteOrderWithStoreExpiryPolicyTest.java |    4 +-
 ...iteCacheAtomicWithStoreExpiryPolicyTest.java |    4 +-
 .../IgniteCacheExpiryPolicyAbstractTest.java    |    5 +-
 .../IgniteCacheTxWithStoreExpiryPolicyTest.java |    4 +-
 .../IgniteCacheAtomicLoadAllTest.java           |   55 +
 .../IgniteCacheAtomicLoaderWriterTest.java      |   55 +
 .../IgniteCacheAtomicLocalLoadAllTest.java      |   49 +
 ...CacheAtomicLocalNoLoadPreviousValueTest.java |   49 +
 ...IgniteCacheAtomicLocalNoReadThroughTest.java |   49 +
 ...gniteCacheAtomicLocalNoWriteThroughTest.java |   49 +
 ...tomicNearEnabledNoLoadPreviousValueTest.java |   32 +
 ...CacheAtomicNearEnabledNoReadThroughTest.java |   32 +
 ...acheAtomicNearEnabledNoWriteThroughTest.java |   32 +
 ...gniteCacheAtomicNoLoadPreviousValueTest.java |   55 +
 .../IgniteCacheAtomicNoReadThroughTest.java     |   55 +
 .../IgniteCacheAtomicNoWriteThroughTest.java    |   55 +
 .../IgniteCacheAtomicStoreSessionTest.java      |   55 +
 .../IgniteCacheLoadAllAbstractTest.java         |  236 +++
 .../IgniteCacheLoaderWriterAbstractTest.java    |  377 ++++
 ...iteCacheNoLoadPreviousValueAbstractTest.java |  213 +++
 .../IgniteCacheNoReadThroughAbstractTest.java   |  322 ++++
 .../IgniteCacheNoWriteThroughAbstractTest.java  |  345 ++++
 .../IgniteCacheStoreSessionAbstractTest.java    |  303 +++
 .../integration/IgniteCacheTxLoadAllTest.java   |   50 +
 .../IgniteCacheTxLoaderWriterTest.java          |   49 +
 .../IgniteCacheTxLocalLoadAllTest.java          |   49 +
 ...niteCacheTxLocalNoLoadPreviousValueTest.java |   49 +
 .../IgniteCacheTxLocalNoReadThroughTest.java    |   49 +
 .../IgniteCacheTxLocalNoWriteThroughTest.java   |   49 +
 ...cheTxNearEnabledNoLoadPreviousValueTest.java |   32 +
 ...niteCacheTxNearEnabledNoReadThroughTest.java |   32 +
 ...iteCacheTxNearEnabledNoWriteThroughTest.java |   32 +
 .../IgniteCacheTxNoLoadPreviousValueTest.java   |   49 +
 .../IgniteCacheTxNoReadThroughTest.java         |   49 +
 .../IgniteCacheTxNoWriteThroughTest.java        |   49 +
 .../IgniteCacheTxStoreSessionTest.java          |  286 +++
 ...idCacheCheckpointSpiSecondCacheSelfTest.java |    5 +-
 .../tcp/GridCacheDhtLockBackupSelfTest.java     |    5 +-
 .../GridCacheStoreValueBytesNode.java           |    4 +-
 .../grid/GridCacheAffinityBackupsSelfTest.java  |    4 +-
 ...CachePartitionFairAffinityNodesSelfTest.java |    7 +-
 .../store/GridCacheBalancingStoreSelfTest.java  |   42 +-
 .../GridCacheLoadOnlyStoreAdapterSelfTest.java  |   20 +-
 .../cache/store/GridGeneratingTestStore.java    |   38 +-
 ...CacheJdbcBlobStoreMultithreadedSelfTest.java |  243 ---
 .../jdbc/GridCacheJdbcBlobStoreSelfTest.java    |   51 -
 .../gridgain/grid/cache/store/jdbc/package.html |   23 -
 .../ggfs/GridGgfsEventsAbstractSelfTest.java    |   11 +-
 .../GridGgfsFragmentizerAbstractSelfTest.java   |    9 +-
 .../grid/kernal/GridAffinityMappedTest.java     |    5 +-
 .../grid/kernal/GridAffinityP2PSelfTest.java    |    4 +-
 .../grid/kernal/GridAffinitySelfTest.java       |   11 +-
 .../grid/kernal/GridDiscoverySelfTest.java      |    3 +-
 .../kernal/GridJobMasterLeaveAwareSelfTest.java |    4 +-
 .../grid/kernal/GridMultipleJobsSelfTest.java   |    5 +-
 .../kernal/GridProjectionForCachesSelfTest.java |    6 +-
 ...ectionLocalJobMultipleArgumentsSelfTest.java |    4 +-
 .../grid/kernal/GridStartStopSelfTest.java      |    6 +-
 .../GridCheckpointManagerAbstractSelfTest.java  |    4 +-
 .../checkpoint/GridCheckpointTaskSelfTest.java  |    7 +-
 .../GridDeploymentMessageCountSelfTest.java     |    3 +-
 .../GridDiscoveryManagerAliveCacheSelfTest.java |    4 +-
 .../discovery/GridDiscoveryManagerSelfTest.java |    5 +-
 .../GridAffinityProcessorAbstractSelfTest.java  |    3 +-
 .../GridCacheAbstractFailoverSelfTest.java      |    6 +-
 .../cache/GridCacheAbstractFlagsTest.java       |    9 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java |    4 +-
 .../GridCacheAbstractProjectionSelfTest.java    |    5 +-
 .../cache/GridCacheAbstractSelfTest.java        |   34 +-
 .../cache/GridCacheAbstractTxReadTest.java      |    7 +-
 .../cache/GridCacheAffinityApiSelfTest.java     |    5 +-
 .../cache/GridCacheAffinityRoutingSelfTest.java |    6 +-
 .../GridCacheAsyncOperationsLimitSelfTest.java  |    6 +-
 .../GridCacheAtomicMessageCountSelfTest.java    |    3 +-
 .../cache/GridCacheBasicStoreAbstractTest.java  |   15 +-
 ...acheBasicStoreMultithreadedAbstractTest.java |   25 +-
 .../cache/GridCacheClearAllSelfTest.java        |    9 +-
 .../cache/GridCacheConcurrentMapSelfTest.java   |    3 +-
 .../cache/GridCacheConcurrentMapTest.java       |    3 +-
 .../GridCacheConcurrentTxMultiNodeTest.java     |    3 +-
 ...idCacheConfigurationConsistencySelfTest.java |  264 +--
 ...ridCacheConfigurationValidationSelfTest.java |    6 +-
 .../GridCacheDaemonNodeAbstractSelfTest.java    |    3 +-
 .../GridCacheDeploymentOffHeapSelfTest.java     |    6 +-
 .../cache/GridCacheDeploymentSelfTest.java      |    5 +-
 .../cache/GridCacheEntryMemorySizeSelfTest.java |    3 +-
 .../cache/GridCacheEntryVersionSelfTest.java    |    3 +-
 .../GridCacheEvictionEventAbstractTest.java     |    3 +-
 .../GridCacheFieldsQueryNoDataSelfTest.java     |    4 +-
 .../GridCacheFinishPartitionsSelfTest.java      |    4 +-
 ...CacheFullTextQueryMultithreadedSelfTest.java |    5 +-
 .../cache/GridCacheGenericTestStore.java        |   78 +-
 ...idCacheGetAndTransformStoreAbstractTest.java |   10 +-
 .../cache/GridCacheGlobalClearAllSelfTest.java  |    3 +-
 .../GridCacheGroupLockAbstractSelfTest.java     |   65 +-
 .../GridCacheGroupLockFailoverSelfTest.java     |    3 +-
 .../cache/GridCacheIncrementTransformTest.java  |    3 +-
 .../GridCacheInterceptorAbstractSelfTest.java   |   12 +-
 ...cheInterceptorAtomicNearEnabledSelfTest.java |    1 +
 .../cache/GridCacheIteratorPerformanceTest.java |    5 +-
 .../cache/GridCacheKeyCheckSelfTest.java        |    5 +-
 .../processors/cache/GridCacheLeakTest.java     |    5 +-
 .../cache/GridCacheLifecycleAwareSelfTest.java  |   60 +-
 .../cache/GridCacheLuceneQueryIndexTest.java    |    5 +-
 .../cache/GridCacheMemoryModeSelfTest.java      |    6 +-
 .../GridCacheMissingCommitVersionSelfTest.java  |    3 +-
 ...GridCacheMixedPartitionExchangeSelfTest.java |    5 +-
 .../cache/GridCacheMultiUpdateLockSelfTest.java |    5 +-
 ...ridCacheMultinodeUpdateAbstractSelfTest.java |    4 +-
 ...inodeUpdateNearEnabledNoBackupsSelfTest.java |    6 +-
 .../cache/GridCacheMvccFlagsTest.java           |    4 +-
 .../cache/GridCacheMvccManagerSelfTest.java     |    5 +-
 .../cache/GridCacheMvccPartitionedSelfTest.java |    4 +-
 .../processors/cache/GridCacheMvccSelfTest.java |    4 +-
 .../cache/GridCacheObjectToStringSelfTest.java  |    3 +-
 ...HeapMultiThreadedUpdateAbstractSelfTest.java |    5 +-
 .../cache/GridCacheOffHeapSelfTest.java         |    3 +-
 .../processors/cache/GridCacheOffHeapTest.java  |    3 +-
 .../GridCacheOffHeapTieredAbstractSelfTest.java |    6 +-
 ...heOffHeapTieredEvictionAbstractSelfTest.java |    5 +-
 .../cache/GridCacheOffheapUpdateSelfTest.java   |    3 +-
 .../GridCacheOrderedPreloadingSelfTest.java     |    5 +-
 .../cache/GridCacheP2PUndeploySelfTest.java     |    6 +-
 .../cache/GridCachePartitionedGetSelfTest.java  |    5 +-
 ...hePartitionedProjectionAffinitySelfTest.java |    3 +-
 .../cache/GridCachePartitionedWritesTest.java   |   26 +-
 .../GridCachePreloadingEvictionsSelfTest.java   |    3 +-
 .../cache/GridCachePutAllFailoverSelfTest.java  |    3 +-
 .../GridCacheQueryIndexingDisabledSelfTest.java |    6 +-
 .../GridCacheQueryInternalKeysSelfTest.java     |    5 +-
 .../GridCacheReferenceCleanupSelfTest.java      |    3 +-
 .../cache/GridCacheReloadSelfTest.java          |   28 +-
 ...ridCacheReplicatedSynchronousCommitTest.java |    3 +-
 .../GridCacheReturnValueTransferSelfTest.java   |    3 +-
 .../cache/GridCacheSlowTxWarnTest.java          |    7 +-
 .../processors/cache/GridCacheStopSelfTest.java |    3 +-
 .../cache/GridCacheStorePutxSelfTest.java       |   48 +-
 .../cache/GridCacheStoreValueBytesSelfTest.java |    5 +-
 .../cache/GridCacheSwapPreloadSelfTest.java     |    3 +-
 .../cache/GridCacheSwapReloadSelfTest.java      |   29 +-
 .../processors/cache/GridCacheTestStore.java    |   97 +-
 .../cache/GridCacheTtlManagerSelfTest.java      |    4 +-
 .../GridCacheValueBytesPreloadingSelfTest.java  |    5 +-
 ...idCacheValueConsistencyAbstractSelfTest.java |    5 +-
 .../GridCacheVariableTopologySelfTest.java      |    3 +-
 ...idCacheWriteBehindStoreAbstractSelfTest.java |   13 +-
 .../GridCacheWriteBehindStoreAbstractTest.java  |   10 +-
 ...BehindStorePartitionedMultiNodeSelfTest.java |   14 +-
 .../GridCacheWriteBehindStoreSelfTest.java      |   50 +-
 .../IgniteTxExceptionAbstractSelfTest.java      |   11 +-
 .../cache/IgniteTxReentryAbstractSelfTest.java  |    3 +-
 .../IgniteTxStoreExceptionAbstractSelfTest.java |   48 +-
 ...eAbstractDataStructuresFailoverSelfTest.java |    6 +-
 ...actQueueFailoverDataConsistencySelfTest.java |   13 +-
 .../GridCacheAtomicLongApiSelfTest.java         |    7 +-
 ...CacheAtomicReferenceApiSelfAbstractTest.java |   37 +-
 .../GridCacheCountDownLatchSelfTest.java        |    8 +-
 .../GridCacheQueueCleanupSelfTest.java          |    5 +-
 ...dCacheQueueMultiNodeConsistencySelfTest.java |    3 +-
 .../GridCacheSetAbstractSelfTest.java           |    9 +-
 .../GridCacheSetFailoverAbstractSelfTest.java   |   14 +-
 .../GridCacheLocalAtomicQueueApiSelfTest.java   |    4 +-
 .../local/GridCacheLocalQueueApiSelfTest.java   |    4 +-
 .../GridCacheLocalSequenceApiSelfTest.java      |    4 +-
 ...dCachePartitionedAtomicQueueApiSelfTest.java |    4 +-
 ...ionedAtomicQueueCreateMultiNodeSelfTest.java |    6 +-
 ...PartitionedAtomicQueueMultiNodeSelfTest.java |    4 +-
 ...itionedAtomicQueueRotativeMultiNodeTest.java |    4 +-
 ...hePartitionedAtomicReferenceApiSelfTest.java |    4 +-
 ...PartitionedAtomicReferenceMultiNodeTest.java |    5 +-
 ...titionedAtomicSequenceMultiThreadedTest.java |    3 +-
 .../GridCachePartitionedAtomicSetSelfTest.java  |    5 +-
 ...achePartitionedAtomicStampedApiSelfTest.java |    4 +-
 ...GridCachePartitionedNodeRestartSelfTest.java |    4 +-
 ...idCachePartitionedNodeRestartTxSelfTest.java |    4 +-
 .../GridCachePartitionedQueueApiSelfTest.java   |    4 +-
 ...PartitionedQueueCreateMultiNodeSelfTest.java |    5 +-
 ...dCachePartitionedQueueEntryMoveSelfTest.java |    5 +-
 ...CachePartitionedQueueJoinedNodeSelfTest.java |    4 +-
 ...dCachePartitionedQueueMultiNodeSelfTest.java |    4 +-
 ...hePartitionedQueueRotativeMultiNodeTest.java |    4 +-
 ...GridCachePartitionedSequenceApiSelfTest.java |    4 +-
 ...chePartitionedSequenceMultiNodeSelfTest.java |    4 +-
 ...cheReplicatedAtomicReferenceApiSelfTest.java |    4 +-
 ...eReplicatedAtomicReferenceMultiNodeTest.java |    4 +-
 ...CacheReplicatedAtomicStampedApiSelfTest.java |    4 +-
 .../GridCacheReplicatedQueueApiSelfTest.java    |    4 +-
 ...idCacheReplicatedQueueMultiNodeSelfTest.java |    4 +-
 ...cheReplicatedQueueRotativeMultiNodeTest.java |    4 +-
 .../GridCacheReplicatedSequenceApiSelfTest.java |    4 +-
 ...acheReplicatedSequenceMultiNodeSelfTest.java |    4 +-
 ...tractDistributedByteArrayValuesSelfTest.java |   19 +-
 .../GridCacheAbstractNodeRestartSelfTest.java   |    2 +-
 ...tractPartitionedByteArrayValuesSelfTest.java |   13 +-
 .../GridCacheAbstractPrimarySyncSelfTest.java   |    3 +-
 .../GridCacheAtomicTimeoutSelfTest.java         |    4 +-
 .../GridCacheClientModesAbstractSelfTest.java   |   15 +-
 ...acheEntrySetIterationPreloadingSelfTest.java |    5 +-
 ...heExpiredEntriesPreloadAbstractSelfTest.java |    9 +-
 .../distributed/GridCacheLockAbstractTest.java  |    5 +-
 .../distributed/GridCacheMixedModeSelfTest.java |    5 +-
 ...dCacheMultithreadedFailoverAbstractTest.java |    3 +-
 ...dCachePartitionedAffinityFilterSelfTest.java |    3 +-
 ...chePartitionedReloadAllAbstractSelfTest.java |   31 +-
 .../GridCachePreloadEventsAbstractSelfTest.java |    5 +-
 ...GridCachePreloadRestartAbstractSelfTest.java |    5 +-
 .../GridCacheTransformEventSelfTest.java        |    3 +-
 ...iteTxConsistencyRestartAbstractSelfTest.java |    5 +-
 ...xOriginatingNodeFailureAbstractSelfTest.java |    9 +-
 ...cOriginatingNodeFailureAbstractSelfTest.java |    9 +-
 .../IgniteTxPreloadAbstractTest.java            |   13 +-
 ...tPartitionedOnlyByteArrayValuesSelfTest.java |    7 +-
 ...heAbstractTransformWriteThroughSelfTest.java |   11 +-
 .../dht/GridCacheAtomicFullApiSelfTest.java     |    5 +-
 .../dht/GridCacheAtomicNearCacheSelfTest.java   |    3 +-
 .../dht/GridCacheColocatedDebugTest.java        |   30 +-
 ...eColocatedOptimisticTransactionSelfTest.java |    3 +-
 ...dCacheColocatedTxSingleThreadedSelfTest.java |    3 +-
 .../GridCacheDhtAtomicRemoveFailureTest.java    |    6 +-
 .../dht/GridCacheDhtEntrySelfTest.java          |    3 +-
 .../dht/GridCacheDhtEntrySetSelfTest.java       |    6 +-
 ...GridCacheDhtEvictionNearReadersSelfTest.java |    4 +-
 .../dht/GridCacheDhtEvictionSelfTest.java       |    4 +-
 .../GridCacheDhtEvictionsDisabledSelfTest.java  |    3 +-
 .../dht/GridCacheDhtInternalEntrySelfTest.java  |    4 +-
 .../dht/GridCacheDhtMappingSelfTest.java        |    3 +-
 .../dht/GridCacheDhtPreloadBigDataSelfTest.java |    6 +-
 .../dht/GridCacheDhtPreloadDelayedSelfTest.java |    3 +-
 .../GridCacheDhtPreloadDisabledSelfTest.java    |    4 +-
 .../GridCacheDhtPreloadMessageCountTest.java    |    3 +-
 ...ridCacheDhtPreloadMultiThreadedSelfTest.java |    3 +-
 .../dht/GridCacheDhtPreloadOffHeapSelfTest.java |    6 +-
 .../dht/GridCacheDhtPreloadPutGetSelfTest.java  |    3 +-
 .../dht/GridCacheDhtPreloadSelfTest.java        |    8 +-
 .../GridCacheDhtPreloadStartStopSelfTest.java   |    8 +-
 .../dht/GridCacheDhtPreloadUnloadSelfTest.java  |    6 +-
 .../dht/GridCacheDhtRemoveFailureTest.java      |    5 +-
 .../dht/GridCacheDhtTxPreloadSelfTest.java      |    5 +-
 .../dht/GridCacheGlobalLoadTest.java            |   16 +-
 ...ePartitionedNearDisabledMetricsSelfTest.java |    5 +-
 ...isabledTxOriginatingNodeFailureSelfTest.java |    1 -
 ...idCachePartitionedPreloadEventsSelfTest.java |    5 +-
 ...dCachePartitionedTopologyChangeSelfTest.java |    3 +-
 ...itionedTxOriginatingNodeFailureSelfTest.java |    5 +-
 ...ridCachePartitionedUnloadEventsSelfTest.java |    5 +-
 ...eAtomicInvalidPartitionHandlingSelfTest.java |    5 +-
 .../atomic/GridCacheAtomicPreloadSelfTest.java  |    3 +-
 ...unctionExcludeNeighborsAbstractSelfTest.java |    4 +-
 ...tomicClientOnlyMultiNodeFullApiSelfTest.java |    5 +-
 ...GridCacheAtomicMultiNodeFullApiSelfTest.java |    5 +-
 ...omicMultiNodeP2PDisabledFullApiSelfTest.java |    5 +-
 ...eAtomicNearOnlyMultiNodeFullApiSelfTest.java |    5 +-
 .../GridCacheAtomicNearRemoveFailureTest.java   |    5 +-
 .../GridCacheAtomicOffHeapFullApiSelfTest.java  |    5 +-
 ...heAtomicOffHeapMultiNodeFullApiSelfTest.java |    5 +-
 ...idCacheAtomicPartitionedMetricsSelfTest.java |    6 +-
 ...cPrimaryWriteOrderNearRemoveFailureTest.java |    5 +-
 .../near/GridCacheGetStoreErrorSelfTest.java    |   29 +-
 .../near/GridCacheNearEvictionSelfTest.java     |    3 +-
 .../near/GridCacheNearJobExecutionSelfTest.java |    3 +-
 .../near/GridCacheNearMetricsSelfTest.java      |    5 +-
 .../near/GridCacheNearMultiGetSelfTest.java     |    3 +-
 .../near/GridCacheNearMultiNodeSelfTest.java    |   24 +-
 .../near/GridCacheNearOneNodeSelfTest.java      |   26 +-
 ...idCacheNearOnlyMultiNodeFullApiSelfTest.java |    5 +-
 .../near/GridCacheNearOnlyTopologySelfTest.java |    3 +-
 .../GridCacheNearPartitionedClearSelfTest.java  |   14 +-
 .../GridCacheNearReaderPreloadSelfTest.java     |    4 +-
 .../near/GridCacheNearReadersSelfTest.java      |    3 +-
 .../near/GridCacheNearRemoveFailureTest.java    |    6 +-
 .../near/GridCacheNearTxMultiNodeSelfTest.java  |    3 +-
 .../near/GridCacheNearTxPreloadSelfTest.java    |    5 +-
 ...AffinityExcludeNeighborsPerformanceTest.java |    4 +-
 ...rtitionedAffinityHashIdResolverSelfTest.java |    4 +-
 .../GridCachePartitionedAffinitySelfTest.java   |    4 +-
 .../near/GridCachePartitionedBasicApiTest.java  |    4 +-
 .../GridCachePartitionedBasicOpSelfTest.java    |    3 +-
 ...ePartitionedBasicStoreMultiNodeSelfTest.java |  108 +-
 .../near/GridCachePartitionedEventSelfTest.java |    6 +-
 .../GridCachePartitionedEvictionSelfTest.java   |    4 +-
 ...titionedExplicitLockNodeFailureSelfTest.java |    3 +-
 ...GridCachePartitionedFilteredPutSelfTest.java |    5 +-
 .../GridCachePartitionedFullApiSelfTest.java    |    5 +-
 .../GridCachePartitionedLoadCacheSelfTest.java  |   34 +-
 .../near/GridCachePartitionedLockSelfTest.java  |    3 +-
 .../GridCachePartitionedMetricsSelfTest.java    |    6 +-
 ...achePartitionedMultiNodeCounterSelfTest.java |    3 +-
 ...achePartitionedMultiNodeFullApiSelfTest.java |    5 +-
 ...idCachePartitionedMultiNodeLockSelfTest.java |    4 +-
 .../GridCachePartitionedMultiNodeSelfTest.java  |    3 +-
 ...ePartitionedMultiThreadedPutGetSelfTest.java |    3 +-
 .../near/GridCachePartitionedNestedTxTest.java  |    4 +-
 ...GridCachePartitionedNodeFailureSelfTest.java |    3 +-
 .../GridCachePartitionedNodeRestartTest.java    |    4 +-
 ...ePartitionedOptimisticTxNodeRestartTest.java |    4 +-
 ...achePartitionedPreloadLifecycleSelfTest.java |    7 +-
 .../GridCachePartitionedProjectionSelfTest.java |    5 +-
 ...hePartitionedQueryMultiThreadedSelfTest.java |    3 +-
 .../GridCachePartitionedStorePutSelfTest.java   |   28 +-
 ...GridCachePartitionedTxConcurrentGetTest.java |    4 +-
 ...GridCachePartitionedTxMultiNodeSelfTest.java |    4 +-
 ...CachePartitionedTxMultiThreadedSelfTest.java |    4 +-
 .../GridCachePartitionedTxSalvageSelfTest.java  |    3 +-
 ...achePartitionedTxSingleThreadedSelfTest.java |    3 +-
 .../GridCachePartitionedTxTimeoutSelfTest.java  |    4 +-
 .../near/GridCachePutArrayValueSelfTest.java    |    5 +-
 ...idCacheRendezvousAffinityClientSelfTest.java |    3 +-
 .../near/GridPartitionedBackupLoadSelfTest.java |   30 +-
 ...stractReplicatedByteArrayValuesSelfTest.java |   14 +-
 ...ridCacheAtomicReplicatedMetricsSelfTest.java |    6 +-
 ...eplicatedAtomicMultiNodeFullApiSelfTest.java |    5 +-
 .../GridCacheReplicatedBasicApiTest.java        |    4 +-
 .../GridCacheReplicatedBasicOpSelfTest.java     |    4 +-
 .../GridCacheReplicatedClientOnlySelfTest.java  |    5 +-
 .../GridCacheReplicatedEvictionSelfTest.java    |    5 +-
 .../GridCacheReplicatedFullApiSelfTest.java     |    5 +-
 .../GridCacheReplicatedInvalidateSelfTest.java  |    3 +-
 .../GridCacheReplicatedJobExecutionTest.java    |    3 +-
 .../GridCacheReplicatedMarshallerTxTest.java    |    4 +-
 .../GridCacheReplicatedMetricsSelfTest.java     |    6 +-
 ...ridCacheReplicatedMultiNodeLockSelfTest.java |    4 +-
 .../GridCacheReplicatedMultiNodeSelfTest.java   |    4 +-
 .../GridCacheReplicatedNearOnlySelfTest.java    |    5 +-
 .../GridCacheReplicatedNodeFailureSelfTest.java |    4 +-
 .../GridCacheReplicatedNodeRestartSelfTest.java |    4 +-
 ...dezvousAffinityMultiNodeFullApiSelfTest.java |    6 +-
 .../GridCacheReplicatedTxConcurrentGetTest.java |    4 +-
 ...GridCacheReplicatedTxMultiNodeBasicTest.java |    4 +-
 ...dCacheReplicatedTxMultiThreadedSelfTest.java |    4 +-
 ...CacheReplicatedTxSingleThreadedSelfTest.java |    4 +-
 .../GridCacheReplicatedTxTimeoutSelfTest.java   |    4 +-
 ...idCacheReplicatedUnswapAdvancedSelfTest.java |    3 +-
 .../GridCacheSyncReplicatedPreloadSelfTest.java |    4 +-
 ...CacheReplicatedPreloadLifecycleSelfTest.java |    7 +-
 ...idCacheReplicatedPreloadOffHeapSelfTest.java |    7 +-
 .../GridCacheReplicatedPreloadSelfTest.java     |    5 +-
 ...eplicatedPreloadStartStopEventsSelfTest.java |    4 +-
 .../GridCacheBatchEvictUnswapSelfTest.java      |   30 +-
 ...heConcurrentEvictionConsistencySelfTest.java |    3 +-
 .../GridCacheConcurrentEvictionsSelfTest.java   |    3 +-
 .../GridCacheDistributedEvictionsSelfTest.java  |    3 +-
 .../GridCacheEmptyEntriesAbstractSelfTest.java  |   32 +-
 .../eviction/GridCacheEvictionAbstractTest.java |    3 +-
 .../GridCacheEvictionFilterSelfTest.java        |    3 +-
 .../GridCacheEvictionLockUnlockSelfTest.java    |    3 +-
 .../GridCacheEvictionTouchSelfTest.java         |   27 +-
 ...cheSynchronousEvictionsFailoverSelfTest.java |    5 +-
 .../GridCacheLruNearEvictionPolicySelfTest.java |    3 +-
 ...heNearOnlyLruNearEvictionPolicySelfTest.java |    3 +-
 ...dCacheAtomicLocalMetricsNoStoreSelfTest.java |    4 +-
 .../GridCacheAtomicLocalMetricsSelfTest.java    |    6 +-
 .../local/GridCacheLocalBasicApiSelfTest.java   |    4 +-
 .../GridCacheLocalByteArrayValuesSelfTest.java  |    5 +-
 .../local/GridCacheLocalFullApiSelfTest.java    |    5 +-
 .../local/GridCacheLocalLoadAllSelfTest.java    |   39 +-
 .../cache/local/GridCacheLocalLockSelfTest.java |    5 +-
 .../local/GridCacheLocalMetricsSelfTest.java    |    6 +-
 .../GridCacheLocalMultithreadedSelfTest.java    |    2 +-
 .../GridCacheLocalTxMultiThreadedSelfTest.java  |    4 +-
 .../GridCacheLocalTxSingleThreadedSelfTest.java |    4 +-
 .../local/GridCacheLocalTxTimeoutSelfTest.java  |    3 +-
 .../GridCacheSwapScanQueryAbstractSelfTest.java |    5 +-
 ...ridCacheContinuousQueryAbstractSelfTest.java |   28 +-
 ...dCacheAbstractReduceFieldsQuerySelfTest.java |    5 +-
 .../dataload/GridDataLoaderImplSelfTest.java    |    5 +-
 .../dataload/GridDataLoaderPerformanceTest.java |    4 +-
 .../GridDataLoaderProcessorSelfTest.java        |   28 +-
 ...heGgfsPerBlockLruEvictionPolicySelfTest.java |    9 +-
 .../ggfs/GridGgfsAbstractSelfTest.java          |    5 +-
 .../processors/ggfs/GridGgfsCacheSelfTest.java  |    5 +-
 .../ggfs/GridGgfsDataManagerSelfTest.java       |    5 +-
 .../ggfs/GridGgfsMetaManagerSelfTest.java       |    6 +-
 .../ggfs/GridGgfsMetricsSelfTest.java           |    9 +-
 .../processors/ggfs/GridGgfsModesSelfTest.java  |    9 +-
 .../ggfs/GridGgfsProcessorSelfTest.java         |    6 +-
 .../GridGgfsProcessorValidationSelfTest.java    |   78 +-
 ...IpcEndpointRegistrationAbstractSelfTest.java |    5 +-
 .../processors/ggfs/GridGgfsSizeSelfTest.java   |    5 +-
 .../ggfs/GridGgfsStreamsSelfTest.java           |    6 +-
 .../processors/ggfs/GridGgfsTaskSelfTest.java   |    6 +-
 .../GridGgfsAbstractRecordResolverSelfTest.java |    6 +-
 .../cache/GridCacheCommandHandlerSelfTest.java  |    3 +-
 .../GridServiceProcessorAbstractSelfTest.java   |    4 +-
 .../gridgain/grid/lang/GridFuncSelfTest.java    |    4 +-
 .../marshaller/GridMarshallerAbstractTest.java  |    6 +-
 .../GridP2PContinuousDeploymentSelfTest.java    |    6 +-
 .../session/GridSessionCheckpointSelfTest.java  |    4 +-
 .../util/future/GridEmbeddedFutureSelfTest.java |    2 +-
 .../shmem/GridIpcSharedMemoryNodeStartup.java   |    4 +-
 .../loadtests/GridCacheMultiNodeLoadTest.java   |    4 +-
 ...ridCacheAffinityTransactionsOffHeapTest.java |    3 +-
 .../cache/GridCachePutRemoveLoadTest.java       |    3 +-
 .../cache/GridCacheSingleNodeLoadTest.java      |    3 +-
 .../GridCacheWriteBehindStoreLoadTest.java      |   23 +-
 .../capacity/spring-capacity-cache.xml          |    4 +-
 .../colocation/GridTestCacheStore.java          |   23 +-
 .../loadtests/colocation/spring-colocation.xml  |    4 +-
 .../GridCachePartitionedAtomicLongLoadTest.java |    3 +-
 .../loadtests/hashmap/GridCacheTestContext.java |   13 +-
 .../loadtests/hashmap/GridHashMapLoadTest.java  |   14 +-
 .../swap/GridSwapEvictAllBenchmark.java         |   28 +-
 .../gridgain/testframework/GridTestUtils.java   |   39 +
 .../testframework/junits/GridAbstractTest.java  |    7 +-
 .../testframework/junits/GridTestResources.java |    7 +
 .../cache/GridAbstractCacheStoreSelfTest.java   |  252 ++-
 .../junits/cache/TestCacheSession.java          |   65 +
 .../cache/TestThreadLocalCacheSession.java      |   65 +
 .../GridAbstractLifecycleAwareSelfTest.java     |    7 +
 .../junits/common/GridCommonAbstractTest.java   |    9 +-
 .../GridCacheGroupLockSelfTestSuite.java        |    2 +-
 .../bamboo/GridDataGridTestSuite.java           |   34 +-
 .../core/src/test/webapp/META-INF/gg-config.xml |   10 +-
 ...dGgfsHadoop20FileSystemAbstractSelfTest.java |   13 +-
 .../GridGgfsHadoopDualAbstractSelfTest.java     |    5 +-
 ...ridGgfsHadoopFileSystemAbstractSelfTest.java |   13 +-
 .../GridGgfsHadoopFileSystemClientSelfTest.java |   10 +-
 ...idGgfsHadoopFileSystemHandshakeSelfTest.java |    6 +-
 ...ridGgfsHadoopFileSystemIpcCacheSelfTest.java |    9 +-
 ...GgfsHadoopFileSystemLoggerStateSelfTest.java |    5 +-
 ...fsHadoopFileSystemSecondaryModeSelfTest.java |    9 +-
 .../ggfs/GridGgfsNearOnlyMultiNodeSelfTest.java |    5 +-
 .../hadoop/GridHadoopAbstractSelfTest.java      |   10 +-
 .../hibernate/GridCacheHibernateBlobStore.java  |   85 +-
 ...idHibernateL2CacheConfigurationSelfTest.java |    5 +-
 .../hibernate/GridHibernateL2CacheSelfTest.java |    9 +-
 ...idHibernateL2CacheTransactionalSelfTest.java |    5 +-
 .../GridCacheHibernateBlobStoreSelfTest.java    |    6 +-
 .../processors/query/h2/GridH2Indexing.java     |    6 +-
 .../tcp/GridOrderedMessageCancelSelfTest.java   |    4 +-
 .../GridCacheAbstractFieldsQuerySelfTest.java   |    5 +-
 .../cache/GridCacheAbstractQuerySelfTest.java   |   30 +-
 .../cache/GridCacheCrossCacheQuerySelfTest.java |    5 +-
 .../cache/GridCacheOffHeapAndSwapSelfTest.java  |    3 +-
 .../cache/GridCacheQueryLoadSelfTest.java       |   41 +-
 .../cache/GridCacheQueryMetricsSelfTest.java    |    3 +-
 .../GridCacheQueryMultiThreadedSelfTest.java    |    3 +-
 .../GridCacheQueryUserResourceSelfTest.java     |    6 +-
 ...idCacheReduceQueryMultithreadedSelfTest.java |    5 +-
 .../GridCacheSqlQueryMultiThreadedSelfTest.java |    3 +-
 .../processors/cache/GridCacheSwapSelfTest.java |    3 +-
 .../cache/GridIndexingWithNoopSwapSelfTest.java |    3 +-
 ...GridCachePartitionedFieldsQuerySelfTest.java |    5 +-
 ...idCachePartitionedHitsAndMissesSelfTest.java |    5 +-
 .../near/GridCacheQueryNodeRestartSelfTest.java |    3 +-
 .../grid/cache/jta/GridCacheTmLookup.java       |    5 +-
 .../cache/jta/GridCacheJtaManager.java          |    4 +-
 ...CacheJtaConfigurationValidationSelfTest.java |    4 +-
 .../processors/cache/GridCacheJtaSelfTest.java  |    9 +-
 .../GridTmLookupLifecycleAwareSelfTest.java     |    4 +-
 .../scalar/src/test/resources/spring-cache.xml  |    2 +-
 .../spring/GridSpringCacheManagerSelfTest.java  |    3 +-
 .../GridSpringDynamicCacheManagerSelfTest.java  |    3 +-
 .../p2p/GridP2PUserVersionChangeSelfTest.java   |    4 +-
 .../cache/VisorCacheClearCommandSpec.scala      |    5 +-
 .../cache/VisorCacheCompactCommandSpec.scala    |    5 +-
 .../cswap/VisorCacheSwapCommandSpec.scala       |    7 +-
 .../cache/websession/GridWebSessionFilter.java  |    3 +-
 625 files changed, 12032 insertions(+), 6362 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/50b36c41/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/50b36c41/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridAbstractRestProcessorSelfTest.java
----------------------------------------------------------------------
diff --cc modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridAbstractRestProcessorSelfTest.java
index 3159ce5,872e5cb..563bedd
--- a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridAbstractRestProcessorSelfTest.java
+++ b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridAbstractRestProcessorSelfTest.java
@@@ -79,10 -80,8 +80,10 @@@ abstract class GridAbstractRestProcesso
  
          cfg.setDiscoverySpi(disco);
  
-         GridCacheConfiguration ccfg = defaultCacheConfiguration();
+         CacheConfiguration ccfg = defaultCacheConfiguration();
  
 +        ccfg.setStatisticsEnabled(true);
 +
          cfg.setCacheConfiguration(ccfg);
  
          return cfg;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/50b36c41/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestBinaryProtocolSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/50b36c41/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestMemcacheProtocolSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/50b36c41/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/50b36c41/modules/core/src/main/java/org/apache/ignite/IgniteCacheManager.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/IgniteCacheManager.java
index f9f80a8,a18e87e..7a52af8
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCacheManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCacheManager.java
@@@ -318,78 -323,7 +318,78 @@@ public class IgniteCacheManager impleme
          if (cacheName == null)
              throw new NullPointerException();
  
 -        throw new UnsupportedOperationException();
 +        IgniteBiTuple<Ignite, CacheMXBeanImpl> tuple;
 +
 +        synchronized (igniteMap) {
 +            tuple = igniteMap.get(cacheName);
 +        }
 +
 +        Ignite ignite = tuple.get1();
 +
 +        IgniteCache<Object, Object> cache = ignite.jcache(cacheName);
 +
-         GridCacheConfiguration cfg = cache.getConfiguration(GridCacheConfiguration.class);
++        CacheConfiguration cfg = cache.getConfiguration(CacheConfiguration.class);
 +
 +        MBeanServer mBeanSrv = ignite.configuration().getMBeanServer();
 +
 +        if (enabled) {
 +            registerCacheObject(mBeanSrv, cache.metrics(), cacheName, CACHE_STATISTICS);
 +
 +            cfg.setStatisticsEnabled(true);
 +        }
 +        else {
 +            unregisterCacheObject(mBeanSrv, cacheName, CACHE_STATISTICS);
 +
 +            cfg.setStatisticsEnabled(false);
 +        }
 +    }
 +
 +    /**
 +     * @param mxbean MXBean.
 +     * @param name cache name.
 +     */
 +    public void registerCacheObject(MBeanServer mBeanServer, Object mxbean, String name, String objectName) {
 +        ObjectName registeredObjectName = getObjectName(name, objectName);
 +
 +        try {
 +            if (!isRegistered(mBeanServer, registeredObjectName))
 +                mBeanServer.registerMBean(mxbean, registeredObjectName);
 +        }
 +        catch (Exception e) {
 +            throw new CacheException("Failed to register MBean: " + registeredObjectName, e);
 +        }
 +    }
 +
 +    /**
 +     * @return {@code True} if MBean registered.
 +     */
 +    private static boolean isRegistered(MBeanServer mBeanServer, ObjectName objectName) {
 +        return !mBeanServer.queryNames(objectName, null).isEmpty();
 +    }
 +
 +    /**
 +     * UnRegisters the mxbean if registered already.
 +     *
 +     * @param mBeanSrv MBean server
 +     * @param name Cache name.
 +     * @param objectName Mxbean name.
 +     */
 +    public void unregisterCacheObject(MBeanServer mBeanSrv, String name, String objectName) {
 +        Set<ObjectName> registeredObjectNames;
 +
 +        ObjectName objName = getObjectName(name, objectName);
 +
 +        registeredObjectNames = mBeanSrv.queryNames(objName, null);
 +
 +        //should just be one
 +        for (ObjectName registeredObjectName : registeredObjectNames) {
 +            try {
 +                mBeanSrv.unregisterMBean(registeredObjectName);
 +            } catch (Exception e) {
 +                throw new CacheException("Error unregistering object instance " + registeredObjectName
 +                    + " . Error was " + e.getMessage(), e);
 +            }
 +        }
      }
  
      /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/50b36c41/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index 86a0cab,44486d6..494d990
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@@ -90,20 -90,8 +90,20 @@@ public class IgniteCacheProxy<K, V> ext
      }
  
      /** {@inheritDoc} */
 +    @Override public CacheMetricsMxBean metrics() {
 +        GridCacheProjectionImpl<K, V> prev = gate.enter(prj);
 +
 +        try {
 +            return ctx.cache().metrics();
 +        }
 +        finally {
 +            gate.leave(prev);
 +        }
 +    }
 +
 +    /** {@inheritDoc} */
      @Override public <C extends Configuration<K, V>> C getConfiguration(Class<C> clazz) {
-         GridCacheConfiguration cfg = ctx.config();
+         CacheConfiguration cfg = ctx.config();
  
          if (!clazz.isAssignableFrom(cfg.getClass()))
              throw new IllegalArgumentException();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/50b36c41/modules/core/src/main/java/org/gridgain/grid/cache/GridCache.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/50b36c41/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/50b36c41/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
index e25949b,99d4cde..ecf2f1f
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
@@@ -2187,7 -2144,7 +2190,7 @@@ public abstract class GridCacheAdapter<
              @Override
              public IgniteFuture<V> op(IgniteTxLocalAdapter<K, V> tx) {
                  return tx.putAllAsync(ctx, F.t(key, val), true, entry, ttl, filter)
--                    .chain((IgniteClosure<IgniteFuture<GridCacheReturn<V>>, V>)RET2VAL);
++                    .chain((IgniteClosure<IgniteFuture<GridCacheReturn<V>>, V>) RET2VAL);
              }
  
              @Override
@@@ -2954,11 -2814,9 +2957,13 @@@
      }
  
      /** {@inheritDoc} */
-     @Override public void removeAll(@Nullable final Collection<? extends K> keys,
+     @Override public void removeAll(final Collection<? extends K> keys,
          final IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException {
 +        boolean statsEnabled = ctx.config().isStatisticsEnabled();
 +
 +        long start = statsEnabled ? System.nanoTime() : 0L;
++        
+         A.notNull(keys, "keys");
  
          ctx.denyOnLocalRead();
  
@@@ -5280,111 -5200,142 +5399,253 @@@
      /**
       *
       */
+     static class LoadKeysCallable<K, V> implements IgniteCallable<Void>, Externalizable{
+         /** */
+         private static final long serialVersionUID = 0L;
+ 
+         /** Cache name. */
+         private String cacheName;
+ 
+         /** Injected grid instance. */
+         @IgniteInstanceResource
+         private Ignite ignite;
+ 
+         /** Keys to load. */
+         private Collection<? extends K> keys;
+ 
+         /** Update flag. */
+         private boolean update;
+ 
+         /**
+          * Required by {@link Externalizable}.
+          */
+         public LoadKeysCallable() {
+             // No-op.
+         }
+ 
+         /**
+          * @param cacheName Cache name.
+          * @param keys Keys.
+          * @param update If {@code true} calls {@link #localLoadAndUpdate(Collection)}
+          *        otherwise {@link #localLoad(Collection)}.
+          */
+         LoadKeysCallable(String cacheName, Collection<? extends K> keys, boolean update) {
+             this.cacheName = cacheName;
+             this.keys = keys;
+             this.update = update;
+         }
+ 
+         /** {@inheritDoc} */
+         @Override public Void call() throws Exception {
+             GridCacheAdapter<K, V> cache = ((GridKernal)ignite).context().cache().internalCache(cacheName);
+ 
+             assert cache != null : cacheName;
+ 
+             cache.context().gate().enter();
+ 
+             try {
+                 if (update)
+                     cache.localLoadAndUpdate(keys);
+                 else
+                     cache.localLoad(keys);
+             }
+             finally {
+                 cache.context().gate().leave();
+             }
+ 
+             return null;
+         }
+ 
+         /** {@inheritDoc} */
+         @Override public void writeExternal(ObjectOutput out) throws IOException {
+             U.writeString(out, cacheName);
+ 
+             U.writeCollection(out, keys);
+ 
+             out.writeBoolean(update);
+         }
+ 
+         /** {@inheritDoc} */
+         @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+             cacheName = U.readString(in);
+ 
+             keys = U.readCollection(in);
+ 
+             update = in.readBoolean();
+         }
+     }
+ 
+     /**
+      *
+      */
+     private class LocalStoreLoadClosure extends CIX3<K, V, GridCacheVersion> {
+         /** */
+         final IgniteBiPredicate<K, V> p;
+ 
+         /** */
+         final Collection<Map.Entry<K, V>> col;
+ 
+         /** */
+         final IgniteDataLoader<K, V> ldr;
+ 
+         /** */
+         final long ttl;
+ 
+         /**
+          * @param p Key/value predicate.
+          * @param ldr Loader.
+          * @param ttl TTL.
+          */
+         private LocalStoreLoadClosure(@Nullable IgniteBiPredicate<K, V> p, IgniteDataLoader<K, V> ldr, long ttl) {
+             this.p = p;
+             this.ldr = ldr;
+             this.ttl = ttl;
+ 
+             col = new ArrayList<>(ldr.perNodeBufferSize());
+         }
+ 
+         /** {@inheritDoc} */
+         @Override public void applyx(K key, V val, GridCacheVersion ver) throws IgniteCheckedException {
+             assert ver != null;
+ 
+             if (p != null && !p.apply(key, val))
+                 return;
+ 
+             if (ctx.portableEnabled()) {
+                 key = (K)ctx.marshalToPortable(key);
+                 val = (V)ctx.marshalToPortable(val);
+             }
+ 
+             GridVersionedEntry<K,V> e = new GridRawVersionedEntry<>(key, null, val, null, ttl, 0, ver);
+ 
+             e.marshal(ctx.marshaller());
+ 
+             col.add(e);
+ 
+             if (col.size() == ldr.perNodeBufferSize()) {
+                 ldr.addData(col);
+ 
+                 col.clear();
+             }
+         }
+ 
+         /**
+          * Adds remaining data to loader.
+          */
+         void onDone() {
+             if (!col.isEmpty())
+                 ldr.addData(col);
+         }
+     }
++
++    /**
++     *
++     */
 +    protected static abstract class UpdateTimeStatClosure<T> implements CI1<IgniteFuture<T>> {
 +        /** */
 +        protected final CacheMetricsMxBeanImpl metrics;
 +
 +        /** */
 +        protected final long start;
 +
 +        /**
 +         * @param metrics Metrics.
 +         * @param start   Start time.
 +         */
 +        public UpdateTimeStatClosure(CacheMetricsMxBeanImpl metrics, long start) {
 +            this.metrics = metrics;
 +            this.start = start;
 +        }
 +
 +        /** {@inheritDoc} */
 +        @Override public void apply(IgniteFuture<T> fut) {
 +            try {
 +                if (!fut.isCancelled()) {
 +                    fut.get();
 +
 +                    updateTimeStat();
 +                }
 +            }
 +            catch (IgniteCheckedException ignore) {
 +                //No-op.
 +            }
 +        }
 +
 +        /**
 +         * Updates statistics.
 +         */
 +        abstract protected void updateTimeStat();
 +    }
 +
 +    /**
 +     *
 +     */
 +    protected static class UpdateGetTimeStatClosure<T> extends UpdateTimeStatClosure<T> {
 +        /**
 +         * @param metrics Metrics.
 +         * @param start   Start time.
 +         */
 +        public UpdateGetTimeStatClosure(CacheMetricsMxBeanImpl metrics, long start) {
 +            super(metrics, start);
 +        }
 +
 +        /** {@inheritDoc} */
 +        @Override protected void updateTimeStat() {
 +            metrics.addGetTimeNanos(System.nanoTime() - start);
 +        }
 +    }
 +
 +    /**
 +     *
 +     */
 +    protected static class UpdateRemoveTimeStatClosure<T> extends UpdateTimeStatClosure<T> {
 +        /**
 +         * @param metrics Metrics.
 +         * @param start   Start time.
 +         */
 +        public UpdateRemoveTimeStatClosure(CacheMetricsMxBeanImpl metrics, long start) {
 +            super(metrics, start);
 +        }
 +
 +        /** {@inheritDoc} */
 +        @Override protected void updateTimeStat() {
 +            metrics.addRemoveTimeNanos(System.nanoTime() - start);
 +        }
 +    }
 +
 +    /**
 +     *
 +     */
 +    protected static class UpdatePutTimeStatClosure<T> extends UpdateTimeStatClosure {
 +        /**
 +         * @param metrics Metrics.
 +         * @param start   Start time.
 +         */
 +        public UpdatePutTimeStatClosure(CacheMetricsMxBeanImpl metrics, long start) {
 +            super(metrics, start);
 +        }
 +
 +        /** {@inheritDoc} */
 +        @Override protected void updateTimeStat() {
 +            metrics.addPutTimeNanos(System.nanoTime() - start);
 +        }
 +    }
 +
 +    /**
 +     *
 +     */
 +    protected static class UpdatePutAndGetTimeStatClosure<T> extends UpdateTimeStatClosure {
 +        /**
 +         * @param metrics Metrics.
 +         * @param start   Start time.
 +         */
 +        public UpdatePutAndGetTimeStatClosure(CacheMetricsMxBeanImpl metrics, long start) {
 +            super(metrics, start);
 +        }
 +
 +        /** {@inheritDoc} */
 +        @Override protected void updateTimeStat() {
 +            metrics.addPutAndGetTimeNanos(System.nanoTime() - start);
 +        }
 +    }
  }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/50b36c41/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/50b36c41/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/50b36c41/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProxyImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/50b36c41/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTtlManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/50b36c41/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/50b36c41/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/50b36c41/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/50b36c41/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearCacheAdapter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/50b36c41/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetFuture.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/50b36c41/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/atomic/GridLocalAtomicCache.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/atomic/GridLocalAtomicCache.java
index bb65bc4,3fc4dd7..0e17bd5
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/atomic/GridLocalAtomicCache.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/atomic/GridLocalAtomicCache.java
@@@ -411,20 -407,15 +411,20 @@@ public class GridLocalAtomicCache<K, V
  
          ctx.denyOnLocalRead();
  
 -        return (Boolean)updateAllInternal(DELETE,
 +        Boolean removed = (Boolean)updateAllInternal(DELETE,
-                 Collections.singleton(key),
-                 null,
-                 null,
-                 expiryPerCall(),
-                 false,
-                 false,
-                 filter,
-                 ctx.isStoreEnabled());
+             Collections.singleton(key),
+             null,
+             null,
+             expiryPerCall(),
+             false,
+             false,
+             filter,
+             ctx.writeThrough());
 +
 +        if (statsEnabled && removed)
 +            metrics0().addRemoveTimeNanos(System.nanoTime() - start);
 +
 +        return  removed;
      }
  
      /** {@inheritDoc} */
@@@ -449,7 -440,7 +449,7 @@@
              Collections.singleton(key),
              null,
              null,
--            expiryPerCall(),
++                expiryPerCall(),
              false,
              false,
              ctx.equalsPeekArray(val),
@@@ -482,9 -473,9 +482,9 @@@
          String taskName = ctx.kernalContext().job().currentTaskName();
  
          Map<K, V> m = getAllInternal(Collections.singleton(key),
--            filter != null ? new IgnitePredicate[]{filter} : null,
++                filter != null ? new IgnitePredicate[]{filter} : null,
              ctx.isSwapOrOffheapEnabled(),
-             ctx.isStoreEnabled(),
+             ctx.readThrough(),
              ctx.hasFlag(CLONE),
              taskName,
              deserializePortable);
@@@ -502,9 -493,9 +502,9 @@@
          String taskName = ctx.kernalContext().job().currentTaskName();
  
          return getAllInternal(keys,
--            filter != null ? new IgnitePredicate[]{filter} : null,
++                filter != null ? new IgnitePredicate[]{filter} : null,
              ctx.isSwapOrOffheapEnabled(),
-             ctx.isStoreEnabled(),
+             ctx.readThrough(),
              ctx.hasFlag(CLONE),
              taskName,
              deserializePortable);
@@@ -817,32 -808,23 +817,32 @@@
          final boolean rawRetval,
          @Nullable final IgnitePredicate<GridCacheEntry<K, V>>[] filter
      ) {
+         final boolean writeThrough = ctx.writeThrough();
+ 
 +        final boolean statsEnabled = ctx.config().isStatisticsEnabled();
 +
 +        final long start = statsEnabled ? System.nanoTime() : 0L;
 +
-         final boolean storeEnabled = ctx.isStoreEnabled();
- 
          final ExpiryPolicy expiryPlc = expiryPerCall();
  
 -        return asyncOp(new Callable<Object>() {
 +        IgniteFuture fut = asyncOp(new Callable<Object>() {
              @Override public Object call() throws Exception {
                  return updateAllInternal(DELETE,
-                         keys,
-                         null,
-                         null,
-                         expiryPlc,
-                         retval,
-                         rawRetval,
-                         filter,
-                         storeEnabled);
+                     keys,
+                     null,
+                     null,
+                     expiryPlc,
+                     retval,
+                     rawRetval,
+                     filter,
+                     writeThrough);
              }
          });
 +
 +        if (statsEnabled)
 +            fut.listenAsync(new UpdateRemoveTimeStatClosure<>(metrics0(), start));
 +
 +        return fut;
      }
  
      /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/50b36c41/modules/core/src/test/java/org/gridgain/grid/kernal/GridDiscoverySelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/50b36c41/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/50b36c41/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMetricsSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/50b36c41/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java
----------------------------------------------------------------------


Mime
View raw message