Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-883_1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0a4e7dd4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0a4e7dd4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0a4e7dd4 Branch: refs/heads/ignite-633 Commit: 0a4e7dd4c8321bb163cd8568494c97a1a4aef437 Parents: 50b0b49 59db4a5 Author: sboikov <sboi...@gridgain.com> Authored: Mon Jun 8 10:10:59 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Mon Jun 8 10:10:59 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/IgniteCache.java | 11 + .../apache/ignite/internal/IgniteKernal.java | 2 + .../ignite/internal/IgniteNodeAttributes.java | 5 +- .../cache/DynamicCacheDescriptor.java | 17 + .../processors/cache/GridCacheAdapter.java | 17 +- .../processors/cache/GridCacheContext.java | 13 + .../processors/cache/GridCacheProcessor.java | 37 ++- .../processors/cache/GridCacheProxyImpl.java | 14 +- .../processors/cache/IgniteCacheProxy.java | 23 ++ .../processors/cache/IgniteInternalCache.java | 11 +- .../dht/atomic/GridDhtAtomicCache.java | 4 + .../transactions/IgniteTxLocalAdapter.java | 28 ++ .../processors/igfs/IgfsMetaManager.java | 2 +- .../IgniteTxRollbackCheckedException.java | 9 + ...acheReadOnlyTransactionalClientSelfTest.java | 327 +++++++++++++++++++ .../cache/GridCacheAbstractFullApiSelfTest.java | 83 +++++ .../GridCacheExAbstractFullApiSelfTest.java | 103 ------ .../GridCacheExColocatedFullApiSelfTest.java | 33 -- .../near/GridCacheExNearFullApiSelfTest.java | 39 --- .../GridCacheExReplicatedFullApiSelfTest.java | 33 -- .../local/GridCacheExLocalFullApiSelfTest.java | 30 -- .../loadtests/hashmap/GridCacheTestContext.java | 1 + .../IgniteCacheFullApiSelfTestSuite.java | 6 - .../testsuites/IgniteCacheTestSuite4.java | 2 + 24 files changed, 591 insertions(+), 259 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a4e7dd4/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a4e7dd4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a4e7dd4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ----------------------------------------------------------------------
