You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/01/09 09:51:51 UTC
[1/2] ignite git commit: Fixed GridCacheTtlManager.expire for case
when near cache is enabled.
Repository: ignite
Updated Branches:
refs/heads/ignite-3477 06de69947 -> a74d5ee23
Fixed GridCacheTtlManager.expire for case when near cache is enabled.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/48b26531
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/48b26531
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/48b26531
Branch: refs/heads/ignite-3477
Commit: 48b2653198070dd08ca1fdb878174b975c0b7fdc
Parents: ceff09c
Author: sboikov <sb...@gridgain.com>
Authored: Mon Jan 9 12:51:36 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Jan 9 12:51:36 2017 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/cache/GridCacheTtlManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/48b26531/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManager.java
index bc09066..f34ab90 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManager.java
@@ -163,7 +163,7 @@ public class GridCacheTtlManager extends GridCacheManagerAdapter {
EntryWrapper e = pendingEntries.firstx();
if (e == null || e.expireTime > now)
- return false; // All expired entries are processed.
+ break; // All expired entries are processed.
if (pendingEntries.remove(e)) {
if (obsoleteVer == null)
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-3477' into ignite-3477
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-3477' into ignite-3477
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a74d5ee2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a74d5ee2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a74d5ee2
Branch: refs/heads/ignite-3477
Commit: a74d5ee23ed7ec0d0421f490f2baa42f13d584ec
Parents: 48b2653 06de699
Author: sboikov <sb...@gridgain.com>
Authored: Mon Jan 9 12:51:58 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Jan 9 12:51:58 2017 +0300
----------------------------------------------------------------------
.../cache/CacheOffheapEvictionManager.java | 90 ++++++++++++++++++++
.../cache/CacheOfheapEvictionManager.java | 90 --------------------
.../processors/cache/GridCacheProcessor.java | 4 +-
.../processors/cache/GridCacheTtlManager.java | 1 +
.../cache/IgniteCacheOffheapManagerImpl.java | 16 ++--
.../cache/GridCacheAbstractTxReadTest.java | 2 -
.../cache/GridCacheBasicStoreAbstractTest.java | 2 +-
...cheLocalBasicStoreMultithreadedSelfTest.java | 1 +
8 files changed, 106 insertions(+), 100 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/a74d5ee2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManager.java
----------------------------------------------------------------------