You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2016/12/30 20:55:09 UTC
[1/3] ignite git commit: Fixed cache for query test
Repository: ignite
Updated Branches:
refs/heads/ignite-3477 81ba60fc3 -> f8a152ef9
Fixed cache for query test
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7b6e6444
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7b6e6444
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7b6e6444
Branch: refs/heads/ignite-3477
Commit: 7b6e6444d95445d88755804310417d5d5304599f
Parents: 81ba60f
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Fri Dec 30 19:59:36 2016 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Fri Dec 30 19:59:36 2016 +0300
----------------------------------------------------------------------
.../cache/IgniteCacheQueryMultiThreadedSelfTest.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7b6e6444/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java
index 0c3f076..244603f 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java
@@ -221,8 +221,14 @@ public class IgniteCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTes
for (Cache.Entry<Object, Object> e : c.localEntries())
c.remove(e.getKey());
}
+ }
+ }
- U.sleep(5000);
+ U.sleep(5000);
+
+ for (int i = 0; i < GRID_CNT; i++) {
+ for(String cacheName : grid(i).cacheNames()) {
+ IgniteCache<Object, Object> c = grid(i).cache(cacheName);
assertEquals(0, c.size(CachePeekMode.OFFHEAP));
assertEquals(0, c.size(CachePeekMode.PRIMARY));
@@ -743,7 +749,7 @@ public class IgniteCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTes
final Ignite g = grid(0);
// Put test values into cache.
- final IgniteCache<Integer, TestValue> c = g.cache(null);
+ final IgniteCache<Integer, TestValue> c = cache(Integer.class, TestValue.class);
for (int i = 0; i < keyCnt; i++)
c.put(i, new TestValue(i));
[3/3] ignite git commit: Added removeExplicitNodeLocks lost during a
merge.
Posted by ag...@apache.org.
Added removeExplicitNodeLocks lost during a merge.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f8a152ef
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f8a152ef
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f8a152ef
Branch: refs/heads/ignite-3477
Commit: f8a152ef931e4334bfa44fca30c5d32151a8b470
Parents: aa54b18
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Fri Dec 30 22:03:37 2016 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Fri Dec 30 22:03:37 2016 +0300
----------------------------------------------------------------------
.../distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/f8a152ef/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index e2c6b49..b7f6680 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@ -1862,6 +1862,8 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter<AffinityT
if (isDone() || !enterBusy())
return;
+ cctx.mvcc().removeExplicitNodeLocks(node.id(), topologyVersion());
+
try {
onDiscoveryEvent(new IgniteRunnable() {
@Override public void run() {
[2/3] ignite git commit: Fixed invalid commented method in TTL manager
Posted by ag...@apache.org.
Fixed invalid commented method in TTL manager
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/aa54b185
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/aa54b185
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/aa54b185
Branch: refs/heads/ignite-3477
Commit: aa54b185c31600e4ac0934f5bad2fd431ea3d51f
Parents: 7b6e644
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Fri Dec 30 19:59:54 2016 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Fri Dec 30 19:59:54 2016 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheSharedTtlCleanupManager.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/aa54b185/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedTtlCleanupManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedTtlCleanupManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedTtlCleanupManager.java
index 9f6cd0a..4b3b05b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedTtlCleanupManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedTtlCleanupManager.java
@@ -126,9 +126,8 @@ public class GridCacheSharedTtlCleanupManager extends GridCacheSharedManagerAdap
boolean expiredRemains = false;
for (GridCacheTtlManager mgr : mgrs) {
- // TODO
-// if (mgr.expire(CLEANUP_WORKER_ENTRIES_PROCESS_LIMIT))
-// expiredRemains = true;
+ if (mgr.expire(CLEANUP_WORKER_ENTRIES_PROCESS_LIMIT))
+ expiredRemains = true;
if (isCancelled())
return;