ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ntikho...@apache.org
Subject ignite git commit: IGNITE-426 Fixed tests.
Date Tue, 03 Nov 2015 13:57:08 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-426-2-reb 20324bc0f -> 3aca97205


IGNITE-426 Fixed tests.


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

Branch: refs/heads/ignite-426-2-reb
Commit: 3aca97205c15ed6b33cc9ee6df4cf2821bb83191
Parents: 20324bc
Author: nikolay_tikhonov <ntikhonov@gridgain.com>
Authored: Tue Nov 3 16:57:05 2015 +0300
Committer: nikolay_tikhonov <ntikhonov@gridgain.com>
Committed: Tue Nov 3 16:57:05 2015 +0300

----------------------------------------------------------------------
 .../continuous/CacheContinuousQueryHandler.java     | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/3aca9720/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
index 3ddce94..bdca0f4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
@@ -250,7 +250,7 @@ class CacheContinuousQueryHandler<K, V> implements GridContinuousHandler
{
 
         GridCacheContext<K, V> cctx = cacheContext(ctx);
 
-        if (cctx != null && initUpdIdx != null) {
+        if (!internal && cctx != null && initUpdIdx != null) {
             Map<Integer, Long> map = cctx.topology().updateCounters();
 
             for (Map.Entry<Integer, Long> e : map.entrySet()) {
@@ -575,6 +575,13 @@ class CacheContinuousQueryHandler<K, V> implements GridContinuousHandler
{
         CacheContinuousQueryEntry e) {
         assert e != null;
 
+        if (internal) {
+            if (e.isFiltered())
+                return Collections.emptyList();
+            else
+                return F.asList(e);
+        }
+
         // Initial query entry or evicted entry.
         // This events should be fired immediately.
         if (e.updateIndex() == -1)
@@ -603,6 +610,13 @@ class CacheContinuousQueryHandler<K, V> implements GridContinuousHandler
{
         assert e != null;
         assert snds != null;
 
+        if (internal) {
+            if (e.isFiltered())
+                return null;
+            else
+                return e;
+        }
+
         // Initial query entry.
         // This events should be fired immediately.
         if (e.updateIndex() == -1)


Mime
View raw message