Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-297
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/344be347 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/344be347 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/344be347 Branch: refs/heads/ignite-297 Commit: 344be3474f6bad4710bafb08ae383a00c17ec7ea Parents: a2f6acd 826b09a Author: sboikov <sboi...@gridgain.com> Authored: Wed Feb 18 17:14:19 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Wed Feb 18 17:14:19 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAdapter.java | 36 +++- .../processors/cache/GridCacheContext.java | 10 ++ .../GridDistributedTxRemoteAdapter.java | 6 +- .../distributed/dht/GridDhtCacheAdapter.java | 6 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 1 + .../distributed/dht/GridDhtTxPrepareFuture.java | 13 +- .../near/GridNearTxPrepareFuture.java | 5 +- .../cache/transactions/IgniteTxAdapter.java | 5 +- .../cache/transactions/IgniteTxEntry.java | 17 +- .../transactions/IgniteTxLocalAdapter.java | 45 ++--- .../IgniteCacheExpiryStoreLoadSelfTest.java | 166 +++++++++++++++++++ .../cache/GridCacheQueryIndexSelfTest.java | 4 +- .../IgniteCacheExpiryPolicyTestSuite.java | 3 + .../cache/GridCacheQueryLoadSelfTest.java | 30 ++-- 14 files changed, 267 insertions(+), 80 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/344be347/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/344be347/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/344be347/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/344be347/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java ----------------------------------------------------------------------
