Repository: incubator-ignite Updated Branches: refs/heads/ignite-32 cea0b0864 -> 4afbdcb8b
Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-65 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/33d8950d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/33d8950d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/33d8950d Branch: refs/heads/ignite-32 Commit: 33d8950d60a040913059c1fe474201d579861d64 Parents: 8efb40e bfbb6d2 Author: avinogradov <avinogra...@gridgain.com> Authored: Wed Jan 21 14:51:04 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Wed Jan 21 14:51:04 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/IgniteCache.java | 24 +- .../apache/ignite/cache/CacheEntryEvent.java | 53 +- .../java/org/apache/ignite/cache/CacheLock.java | 62 ++ .../cache/CachePartialUpdateException.java | 22 +- .../processors/cache/CacheLockAsyncImpl.java | 141 +++ .../processors/cache/CacheLockImpl.java | 177 +++ .../processors/cache/IgniteCacheProxy.java | 130 +-- .../grid/cache/GridCacheConfiguration.java | 1 + .../cache/query/GridCacheContinuousQuery.java | 10 +- .../grid/kernal/GridEventConsumeHandler.java | 2 +- .../processors/cache/CacheInvokeEntry.java | 22 +- .../processors/cache/CacheInvokeResult.java | 22 +- .../processors/cache/GridCacheAdapter.java | 20 +- .../processors/cache/GridCacheMapEntry.java | 70 +- .../processors/cache/GridCacheProcessor.java | 1 - .../cache/IgniteCacheExpiryPolicy.java | 22 +- .../GridCacheDataStructuresManager.java | 6 +- .../distributed/GridCacheTtlUpdateRequest.java | 22 +- .../IgniteExternalizableExpiryPolicy.java | 22 +- .../GridCacheContinuousQueryAdapter.java | 42 +- .../GridCacheContinuousQueryEntry.java | 61 +- .../GridCacheContinuousQueryHandler.java | 96 +- .../GridCacheContinuousQueryHandlerV2.java | 83 -- .../GridCacheContinuousQueryHandlerV3.java | 61 -- .../GridCacheContinuousQueryHandlerV4.java | 61 -- .../GridCacheContinuousQueryManager.java | 513 ++++++++- .../continuous/GridContinuousMessage.java | 52 +- .../continuous/GridContinuousMessageType.java | 5 +- .../continuous/GridContinuousProcessor.java | 181 +++- .../service/GridServiceProcessor.java | 4 +- .../cache/IgniteCacheAbstractTest.java | 22 +- .../cache/IgniteCacheAtomicInvokeTest.java | 22 +- .../cache/IgniteCacheAtomicLocalInvokeTest.java | 22 +- ...niteCacheAtomicLocalWithStoreInvokeTest.java | 22 +- .../IgniteCacheAtomicNearEnabledInvokeTest.java | 22 +- ...eCacheAtomicPrimaryWriteOrderInvokeTest.java | 22 +- ...micPrimaryWriteOrderWithStoreInvokeTest.java | 22 +- .../IgniteCacheEntryListenerAbstractTest.java | 1005 ++++++++++++++++++ ...IgniteCacheEntryListenerAtomicLocalTest.java | 49 + ...eCacheEntryListenerAtomicReplicatedTest.java | 32 + .../IgniteCacheEntryListenerAtomicTest.java | 55 + ...eCacheEntryListenerEagerTtlDisabledTest.java | 30 + .../IgniteCacheEntryListenerTxLocalTest.java | 49 + ...gniteCacheEntryListenerTxReplicatedTest.java | 32 + .../cache/IgniteCacheEntryListenerTxTest.java | 49 + .../cache/IgniteCacheInvokeAbstractTest.java | 22 +- .../cache/IgniteCacheTxInvokeTest.java | 22 +- .../cache/IgniteCacheTxLocalInvokeTest.java | 22 +- .../IgniteCacheTxNearEnabledInvokeTest.java | 22 +- .../IgniteCacheAtomicExpiryPolicyTest.java | 22 +- .../IgniteCacheAtomicLocalExpiryPolicyTest.java | 22 +- ...AtomicPrimaryWriteOrderExpiryPolicyTest.java | 22 +- ...maryWriteOrderWithStoreExpiryPolicyTest.java | 22 +- ...teCacheAtomicReplicatedExpiryPolicyTest.java | 22 +- ...iteCacheAtomicWithStoreExpiryPolicyTest.java | 22 +- .../IgniteCacheExpiryPolicyAbstractTest.java | 22 +- .../IgniteCacheExpiryPolicyTestSuite.java | 22 +- .../expiry/IgniteCacheTxExpiryPolicyTest.java | 22 +- .../IgniteCacheTxLocalExpiryPolicyTest.java | 22 +- ...IgniteCacheTxReplicatedExpiryPolicyTest.java | 22 +- .../IgniteCacheTxWithStoreExpiryPolicyTest.java | 22 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 56 +- .../cache/GridCacheBasicApiAbstractTest.java | 80 ++ .../GridCacheMultiNodeLockAbstractTest.java | 61 +- .../dht/GridCacheColocatedDebugTest.java | 17 +- .../dht/GridCacheGlobalLoadTest.java | 22 +- .../near/GridCachePartitionedLockSelfTest.java | 17 +- .../GridCacheLocalMultithreadedSelfTest.java | 48 +- .../junits/common/GridCommonAbstractTest.java | 13 + .../bamboo/GridDataGridTestSuite.java | 8 + .../grid/cache/spring/GridSpringCache.java | 185 ++++ .../cache/spring/GridSpringCacheManager.java | 190 +--- .../spring/GridSpringDynamicCacheManager.java | 316 ++++++ .../spring/GridSpringCacheManagerSelfTest.java | 2 +- .../GridSpringDynamicCacheManagerSelfTest.java | 218 ++++ .../GridSpringDynamicCacheTestService.java | 62 ++ .../cache/spring/spring-dynamic-caching.xml | 43 + .../testsuites/bamboo/GridSpringTestSuite.java | 1 + 78 files changed, 4255 insertions(+), 879 deletions(-) ----------------------------------------------------------------------
