You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by nt...@apache.org on 2015/11/04 15:11:13 UTC
[30/36] ignite git commit: IGNITE-426 Fixed tests.
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/307ba350
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/307ba350
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/307ba350
Branch: refs/heads/ignite-462-2
Commit: 307ba3501f2eabae1c2a505d8d8a20a86b9a97e6
Parents: c2cdfc1
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Tue Nov 3 16:57:05 2015 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Wed Nov 4 17:02:52 2015 +0300
----------------------------------------------------------------------
.../continuous/CacheContinuousQueryHandler.java | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/307ba350/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)