Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-59
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9b3cd61b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9b3cd61b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9b3cd61b Branch: refs/heads/ignite-86 Commit: 9b3cd61b945924434c50dc2d36a7cb3a641596f9 Parents: cd9a5ac cd86285 Author: sevdokimov <sevdoki...@gridgain.com> Authored: Mon Jan 19 21:15:09 2015 +0300 Committer: sevdokimov <sevdoki...@gridgain.com> Committed: Mon Jan 19 21:15:09 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/cache/CacheEntryEvent.java | 53 +- .../processors/cache/IgniteCacheProxy.java | 55 +- .../grid/cache/GridCacheConfiguration.java | 1 + .../cache/query/GridCacheContinuousQuery.java | 10 +- .../grid/kernal/GridEventConsumeHandler.java | 2 +- .../processors/cache/GridCacheMapEntry.java | 70 +- .../processors/cache/GridCacheProcessor.java | 1 - .../GridCacheDataStructuresManager.java | 6 +- .../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 +- .../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 + .../junits/common/GridCommonAbstractTest.java | 13 + .../bamboo/GridDataGridTestSuite.java | 8 + 29 files changed, 2345 insertions(+), 334 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9b3cd61b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ----------------------------------------------------------------------
