Merge branches 'ignite-gg-10002' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10002
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/aabe5a9c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/aabe5a9c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/aabe5a9c Branch: refs/heads/ignite-gg-10002 Commit: aabe5a9c37421910bdb075b4289e21f8191219b9 Parents: 9a62962 ed6632a Author: S.Vladykin <svlady...@gridgain.com> Authored: Thu Apr 2 09:10:31 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Thu Apr 2 09:10:31 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/cache/CachingProvider.java | 2 +- .../processors/cache/CacheObjectContext.java | 14 +- .../processors/cache/CacheObjectImpl.java | 10 +- .../processors/cache/GridCacheMapEntry.java | 2 +- .../cache/query/GridCacheQueryManager.java | 16 +- .../IgniteCacheObjectProcessorImpl.java | 172 ++++++---- .../IgniteCacheAtomicLocalStoreValueTest.java | 49 +++ ...iteCacheAtomicNearEnabledStoreValueTest.java | 30 ++ ...maryWriteOrderNearEnabledStoreValueTest.java | 31 ++ ...heAtomicPrimaryWriteOrderStoreValueTest.java | 32 ++ .../cache/IgniteCacheAtomicStoreValueTest.java | 55 ++++ .../IgniteCacheStoreValueAbstractTest.java | 311 +++++++++++++++++++ .../cache/IgniteCacheTxLocalStoreValueTest.java | 49 +++ .../IgniteCacheTxNearEnabledStoreValueTest.java | 30 ++ .../cache/IgniteCacheTxStoreValueTest.java | 49 +++ .../junits/common/GridCommonAbstractTest.java | 2 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 9 + .../scala/org/apache/ignite/visor/visor.scala | 2 +- 18 files changed, 788 insertions(+), 77 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aabe5a9c/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java ----------------------------------------------------------------------
