Merge remote-tracking branch 'community/ignite-2.1.2' into ignite-2.1.2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7f16e6fc Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7f16e6fc Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7f16e6fc Branch: refs/heads/ignite-2.1 Commit: 7f16e6fce3e69c39cdede955efde50336ef2e7f4 Parents: 2f1270e 1130a87 Author: sboikov <[email protected]> Authored: Thu Jul 6 14:53:42 2017 +0300 Committer: sboikov <[email protected]> Committed: Thu Jul 6 14:53:42 2017 +0300 ---------------------------------------------------------------------- .../processors/cache/ClusterCachesInfo.java | 4 + .../processors/cache/GridCacheAdapter.java | 62 ++++--- .../processors/cache/GridCacheAttributes.java | 7 + .../processors/cache/GridCacheEntryEx.java | 3 +- .../processors/cache/GridCacheMapEntry.java | 2 +- .../store/GridCacheStoreManagerAdapter.java | 1 + .../service/GridServiceProcessor.java | 18 +++ .../processors/service/GridServiceProxy.java | 9 +- .../cache/IgniteCacheAbstractTest.java | 17 ++ ...titionEvictionDuringReadThroughSelfTest.java | 160 +++++++++++++++++++ ...acheStoreSessionWriteBehindAbstractTest.java | 62 ++++--- ...TxStoreSessionWriteBehindCoalescingTest.java | 88 ++++++++++ ...ClientWriteBehindStoreNonCoalescingTest.java | 30 ++-- .../GridServiceProcessorProxySelfTest.java | 65 ++++++++ .../testsuites/IgniteCacheTestSuite4.java | 2 + .../testsuites/IgniteCacheTestSuite5.java | 3 + .../Cache/PersistentStoreTest.cs | 74 +++++++++ 17 files changed, 550 insertions(+), 57 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/7f16e6fc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/7f16e6fc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ----------------------------------------------------------------------
