# Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-41
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/02301341 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/02301341 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/02301341 Branch: refs/heads/ignite-41 Commit: 023013412b93d683f81ddb26fcb98ee43d94fc23 Parents: 22ad105 fb19130 Author: sboikov <sboi...@gridgain.com> Authored: Fri Dec 19 09:15:51 2014 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri Dec 19 09:15:51 2014 +0300 ---------------------------------------------------------------------- .../gridgain/grid/kernal/GridKernalContext.java | 2 +- .../grid/kernal/IgniteTransactionsEx.java | 33 +++++++++++++ .../processors/cache/GridCacheAdapter.java | 8 +++- .../processors/cache/GridCacheContext.java | 29 ++++++++---- .../processors/cache/GridCacheIoManager.java | 32 ++++++++----- .../processors/cache/GridCacheMvccManager.java | 4 +- .../GridCachePartitionExchangeManager.java | 12 +++-- .../processors/cache/GridCacheProcessor.java | 23 ++++----- .../cache/GridCacheSharedContext.java | 27 +++++++++-- .../processors/cache/GridCacheTxAdapter.java | 14 ++++++ .../kernal/processors/cache/GridCacheTxEx.java | 9 ++++ .../processors/cache/GridCacheTxHandler.java | 25 ++++++---- .../cache/GridCacheTxLocalAdapter.java | 37 +++++++++++---- .../processors/cache/GridCacheTxManager.java | 2 + .../kernal/processors/cache/GridCacheUtils.java | 13 +++-- .../cache/GridCacheVersionManager.java | 2 +- .../GridDistributedTxFinishRequest.java | 26 ++++++++++ .../GridDistributedTxPrepareRequest.java | 24 ++++++++++ .../GridDistributedTxRemoteAdapter.java | 3 ++ .../distributed/dht/GridDhtLockFuture.java | 6 +-- .../dht/GridDhtTransactionalCacheAdapter.java | 11 +++-- .../distributed/dht/GridDhtTxFinishFuture.java | 7 ++- .../distributed/dht/GridDhtTxFinishRequest.java | 50 ++++++++++---------- .../cache/distributed/dht/GridDhtTxLocal.java | 11 +++-- .../distributed/dht/GridDhtTxLocalAdapter.java | 8 ++-- .../distributed/dht/GridDhtTxPrepareFuture.java | 9 ++-- .../dht/GridDhtTxPrepareRequest.java | 48 +++++++++---------- .../cache/distributed/dht/GridDhtTxRemote.java | 12 +++-- .../colocated/GridDhtColocatedLockFuture.java | 5 +- .../GridDhtPartitionsExchangeFuture.java | 5 +- .../distributed/near/GridNearLockFuture.java | 5 +- .../near/GridNearTransactionalCache.java | 3 +- .../near/GridNearTxFinishFuture.java | 5 +- .../near/GridNearTxFinishRequest.java | 24 +++++----- .../cache/distributed/near/GridNearTxLocal.java | 5 +- .../near/GridNearTxPrepareFuture.java | 3 +- .../near/GridNearTxPrepareRequest.java | 32 ++++++------- .../distributed/near/GridNearTxRemote.java | 12 +++-- .../processors/cache/local/GridLocalTx.java | 4 +- .../transactions/IgniteTransactionsImpl.java | 41 ++++++++++++---- .../GridCacheInterceptorSelfTestSuite.java | 6 +-- .../GridCacheReplicatedPreloadSelfTest.java | 2 +- .../GridCacheQueryMultiThreadedSelfTest.java | 9 ++-- .../cache/jta/GridCacheJtaManager.java | 15 +++--- .../cache/spring/GridSpringCacheManager.java | 5 +- 45 files changed, 459 insertions(+), 209 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02301341/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02301341/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java index cb4337e,a15713e..82cac18 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java @@@ -172,9 -169,9 +171,12 @@@ public class GridCacheContext<K, V> imp /** Cache ID. */ private int cacheId; - /** */ + /** System cache flag. */ + private boolean sys; + ++ /** Default expiry policy. */ + private ExpiryPolicy expiryPlc; + /** * Empty constructor required for {@link Externalizable}. */ @@@ -281,19 -278,7 +283,21 @@@ else cacheId = 1; + sys = CU.UTILITY_CACHE_NAME.equals(cacheName); ++ + Factory<ExpiryPolicy> factory = cacheCfg.getExpiryPolicyFactory(); + + expiryPlc = factory != null ? factory.create() : null; + + if (expiryPlc instanceof EternalExpiryPolicy) + expiryPlc = null; + } + + /** + * @return Cache default {@link ExpiryPolicy}. + */ + @Nullable public ExpiryPolicy expiry() { + return expiryPlc; } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02301341/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheIoManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02301341/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02301341/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02301341/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02301341/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxLocalAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02301341/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02301341/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02301341/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02301341/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02301341/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java index f4946e9,21cccf0..931d40c --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java @@@ -99,9 -92,8 +99,10 @@@ public class GridDhtTxFinishRequest<K, * @param isolation Transaction isolation. * @param commit Commit flag. * @param invalidate Invalidate flag. + * @param sys System flag. * @param sysInvalidate System invalidation flag. + * @param syncCommit Synchronous commit flag. + * @param syncRollback Synchronous rollback flag. * @param baseVer Base version. * @param committedVers Committed versions. * @param rolledbackVers Rolled back versions. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02301341/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02301341/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxRemote.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02301341/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTransactionalCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02301341/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxLocal.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02301341/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxPrepareRequest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/02301341/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxRemote.java ----------------------------------------------------------------------
