ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: cc
Date Wed, 24 May 2017 11:08:07 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-5075-cc 3cc4f9f51 -> 3484d7a16


cc


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

Branch: refs/heads/ignite-5075-cc
Commit: 3484d7a16c996ce613d098fec7d8a9a287f647ad
Parents: 3cc4f9f
Author: sboikov <sboikov@gridgain.com>
Authored: Wed May 24 14:06:51 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Wed May 24 14:07:53 2017 +0300

----------------------------------------------------------------------
 .../cache/query/continuous/CacheContinuousQueryEventBuffer.java  | 4 ++--
 .../CacheContinuousQueryConcurrentPartitionUpdateTest.java       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/3484d7a1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEventBuffer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEventBuffer.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEventBuffer.java
index b7b3267..e3a8eda 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEventBuffer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEventBuffer.java
@@ -143,9 +143,9 @@ public class CacheContinuousQueryEventBuffer {
             for (Map.Entry<Long, Object> p : pending.headMap(batch.endCntr, true).entrySet())
{
                 long cntr = p.getKey();
 
-                assert cntr >= batch.startCntr : cntr;
+                assert cntr >= batch.startCntr && cntr <= batch.endCntr : cntr;
 
-                if (cntr <= batch.endCntr && pending.remove(p.getKey()) != null)
+                if (pending.remove(p.getKey()) != null)
                     res = batch.processEvent0(res, p.getKey(), p.getValue());
             }
         }

http://git-wip-us.apache.org/repos/asf/ignite/blob/3484d7a1/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryConcurrentPartitionUpdateTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryConcurrentPartitionUpdateTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryConcurrentPartitionUpdateTest.java
index 5cdcc98..643257a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryConcurrentPartitionUpdateTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryConcurrentPartitionUpdateTest.java
@@ -141,7 +141,7 @@ public class CacheContinuousQueryConcurrentPartitionUpdateTest extends
GridCommo
 
         final IgniteCache<Object, Object> srvCache = srv.cache(DEFAULT_CACHE_NAME);
 
-        for (int i = 0; i < 100; i++) {
+        for (int i = 0; i < 15; i++) {
             log.info("Iteration: " + i);
 
             GridTestUtils.runMultiThreaded(new Callable<Void>() {


Mime
View raw message