ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [39/39] ignite git commit: Merge branch 'ignite-5075-cc' into ignite-5075-cc-debug
Date Fri, 26 May 2017 14:06:39 GMT
Merge branch 'ignite-5075-cc' into ignite-5075-cc-debug

# Conflicts:
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEventBuffer.java


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0e069af5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0e069af5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0e069af5

Branch: refs/heads/ignite-5075-cc-debug
Commit: 0e069af54d3d2443f51475cf3f1974f24bb443fb
Parents: 1f3ceeb
Author: sboikov <sboikov@gridgain.com>
Authored: Fri May 26 17:05:50 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Fri May 26 17:05:50 2017 +0300

----------------------------------------------------------------------
 .../CacheContinuousQueryFailoverAbstractSelfTest.java          | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/0e069af5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java
index e63e9bd..06dffb6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java
@@ -840,7 +840,7 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends
GridC
 
             IgniteCache<Object, Object> cache = ignite.cache(DEFAULT_CACHE_NAME);
 
-            List<Integer> keys = testKeys(cache, PARTS);
+            List<Integer> keys = testKeys(cache, 1);
 
             boolean first = true;
 
@@ -869,6 +869,8 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends
GridC
                         expEvts.add(new T3<>((Object)key, (Object)val, (Object)key));
                 }
 
+                TestDebugLog.addEntryMessage(ignite(4).affinity(DEFAULT_CACHE_NAME).partition(key),
filtered, "do put " + val);
+
                 cache.put(key, val);
 
                 if (first) {
@@ -1323,7 +1325,7 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends
GridC
 
         int[] nodeParts = aff.primaryPartitions(node);
 
-        final int KEYS_PER_PART = 50;
+        final int KEYS_PER_PART = 2;
 
         for (int i = 0; i < parts; i++) {
             int part = nodeParts[i];


Mime
View raw message