You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2016/01/18 11:26:14 UTC
ignite git commit: IGNITE-2384
Repository: ignite
Updated Branches:
refs/heads/ignite-2384 43e7ae12f -> df56be914
IGNITE-2384
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/df56be91
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/df56be91
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/df56be91
Branch: refs/heads/ignite-2384
Commit: df56be914efcd76097e700b499875ba2d4d7257e
Parents: 43e7ae1
Author: sboikov <sb...@gridgain.com>
Authored: Mon Jan 18 13:26:08 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Jan 18 13:26:08 2016 +0300
----------------------------------------------------------------------
.../continuous/CacheContinuousQueryHandler.java | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/df56be91/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 97e4a99..fa54a6b 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
@@ -387,11 +387,12 @@ public class CacheContinuousQueryHandler<K, V> implements GridContinuousHandler
}
else {
if (!internal) {
- entry.markBackup();
-
// Skip init query and expire entries.
- if (entry.updateCounter() != -1L)
+ if (entry.updateCounter() != -1L) {
+ entry.markBackup();
+
backupQueue.add(entry);
+ }
}
}
}
@@ -730,6 +731,8 @@ public class CacheContinuousQueryHandler<K, V> implements GridContinuousHandler
* @param initCntr Update counters.
*/
public PartitionRecovery(IgniteLogger log, AffinityTopologyVersion topVer, @Nullable Long initCntr) {
+ assert topVer.topologyVersion() > 0 : topVer;
+
this.log = log;
if (initCntr != null) {
@@ -751,15 +754,6 @@ public class CacheContinuousQueryHandler<K, V> implements GridContinuousHandler
List<CacheContinuousQueryEntry> entries;
synchronized (pendingEvts) {
- // Received first event.
- if (curTop == AffinityTopologyVersion.NONE) {
- lastFiredEvt = entry.updateCounter();
-
- curTop = entry.topologyVersion();
-
- return F.asList(entry);
- }
-
if (curTop.compareTo(entry.topologyVersion()) < 0) {
if (entry.updateCounter() == 1L && !entry.isBackup()) {
entries = new ArrayList<>(pendingEvts.size());