Merge branch 'ignite-42' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-32
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/82d54977 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/82d54977 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/82d54977 Branch: refs/heads/ignite-32 Commit: 82d54977d42d349ebdfc9707115eaab52227bb9b Parents: 410f9e5 2be29c8 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Thu Jan 22 10:34:23 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Thu Jan 22 10:34:23 2015 +0700 ---------------------------------------------------------------------- assembly/release-base.xml | 2 +- .../integration/GridClientAbstractSelfTest.java | 1 + .../main/java/org/apache/ignite/CacheLock.java | 61 --- .../java/org/apache/ignite/IgniteCache.java | 1 - .../apache/ignite/cache/CacheConfiguration.java | 18 + .../java/org/apache/ignite/cache/CacheLock.java | 62 +++ .../apache/ignite/cache/store/CacheStore.java | 12 + .../processors/cache/CacheLockAsyncImpl.java | 2 +- .../processors/cache/CacheLockImpl.java | 1 + .../processors/cache/GridCacheAdapter.java | 4 +- .../processors/cache/GridCacheAttributes.java | 44 +- .../processors/cache/GridCacheContext.java | 7 + .../processors/cache/GridCacheMapEntry.java | 4 +- .../processors/cache/GridCacheProcessor.java | 17 +- .../processors/cache/GridCacheStoreManager.java | 88 ++-- .../distributed/dht/GridDhtCacheAdapter.java | 8 +- .../cache/distributed/dht/GridDhtGetFuture.java | 7 + .../dht/GridDhtTransactionalCacheAdapter.java | 2 +- .../dht/GridPartitionedGetFuture.java | 7 + .../dht/atomic/GridDhtAtomicCache.java | 7 +- .../dht/colocated/GridDhtColocatedCache.java | 3 + .../distributed/near/GridNearCacheAdapter.java | 1 + .../distributed/near/GridNearGetFuture.java | 7 + .../distributed/near/GridNearGetRequest.java | 89 ++-- .../near/GridNearTransactionalCache.java | 2 + .../cache/distributed/near/GridNearTxLocal.java | 9 +- .../local/atomic/GridLocalAtomicCache.java | 6 +- .../transactions/IgniteTxLocalAdapter.java | 27 +- .../cache/transactions/IgniteTxLocalEx.java | 1 + ...CacheJdbcBlobStoreMultithreadedSelfTest.java | 1 + .../cache/IgniteCacheAbstractTest.java | 1 + .../IgniteCacheEntryListenerAbstractTest.java | 2 +- ...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 +++ .../IgniteCacheLoaderWriterAbstractTest.java | 157 +++---- ...iteCacheNoLoadPreviousValueAbstractTest.java | 213 +++++++++ .../IgniteCacheNoReadThroughAbstractTest.java | 322 ++++++++++++++ .../IgniteCacheNoWriteThroughAbstractTest.java | 345 +++++++++++++++ .../IgniteCacheStoreSessionAbstractTest.java | 303 +++++++++++++ .../IgniteCacheStoreSessionTest.java | 435 ------------------- ...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 | 285 ++++++++++++ .../GridCacheLoadOnlyStoreAdapterSelfTest.java | 1 + .../cache/GridCacheAbstractSelfTest.java | 1 + .../cache/GridCacheBasicStoreAbstractTest.java | 1 + ...acheBasicStoreMultithreadedAbstractTest.java | 1 + ...idCacheConfigurationConsistencySelfTest.java | 11 +- ...idCacheGetAndTransformStoreAbstractTest.java | 1 + .../GridCacheGroupLockAbstractSelfTest.java | 1 + .../cache/GridCacheLifecycleAwareSelfTest.java | 1 + .../cache/GridCachePartitionedWritesTest.java | 1 + .../cache/GridCacheReloadSelfTest.java | 1 + .../cache/GridCacheStorePutxSelfTest.java | 1 + .../cache/GridCacheSwapReloadSelfTest.java | 2 + .../GridCacheWriteBehindStoreAbstractTest.java | 1 + ...BehindStorePartitionedMultiNodeSelfTest.java | 1 + .../IgniteTxExceptionAbstractSelfTest.java | 1 + .../IgniteTxStoreExceptionAbstractSelfTest.java | 1 + ...actQueueFailoverDataConsistencySelfTest.java | 1 + ...CacheAtomicReferenceApiSelfAbstractTest.java | 2 + .../GridCacheClientModesAbstractSelfTest.java | 2 + .../GridCacheMultiNodeLockAbstractTest.java | 3 +- ...chePartitionedReloadAllAbstractSelfTest.java | 1 + .../IgniteTxPreloadAbstractTest.java | 6 +- ...heAbstractTransformWriteThroughSelfTest.java | 1 + .../dht/GridCacheColocatedDebugTest.java | 3 +- .../near/GridCacheGetStoreErrorSelfTest.java | 1 + .../near/GridCacheNearMultiNodeSelfTest.java | 1 + .../near/GridCacheNearOneNodeSelfTest.java | 1 + .../GridCacheNearPartitionedClearSelfTest.java | 1 + ...ePartitionedBasicStoreMultiNodeSelfTest.java | 1 + .../GridCachePartitionedLoadCacheSelfTest.java | 1 + .../GridCachePartitionedStorePutSelfTest.java | 1 + .../near/GridPartitionedBackupLoadSelfTest.java | 1 + .../GridCacheBatchEvictUnswapSelfTest.java | 1 + .../GridCacheEmptyEntriesAbstractSelfTest.java | 1 + .../GridCacheEvictionTouchSelfTest.java | 1 + .../local/GridCacheLocalLoadAllSelfTest.java | 1 + ...ridCacheContinuousQueryAbstractSelfTest.java | 1 + .../GridCacheWriteBehindStoreLoadTest.java | 1 + .../loadtests/hashmap/GridCacheTestContext.java | 8 +- .../swap/GridSwapEvictAllBenchmark.java | 1 + .../bamboo/GridDataGridTestSuite.java | 26 +- .../cache/GridCacheAbstractQuerySelfTest.java | 1 + .../cache/GridCacheQueryLoadSelfTest.java | 1 + .../grid/cache/spring/GridSpringCache.java | 185 ++++++++ .../cache/spring/GridSpringCacheManager.java | 190 +------- .../spring/GridSpringDynamicCacheManager.java | 316 ++++++++++++++ .../spring/GridSpringCacheManagerSelfTest.java | 2 +- .../GridSpringDynamicCacheManagerSelfTest.java | 219 ++++++++++ .../GridSpringDynamicCacheTestService.java | 62 +++ .../cache/spring/spring-dynamic-caching.xml | 43 ++ .../testsuites/bamboo/GridSpringTestSuite.java | 1 + 109 files changed, 3675 insertions(+), 857 deletions(-) ----------------------------------------------------------------------
