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 2017/05/25 15:37:20 UTC
[17/18] ignite git commit: cc
cc
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9cc1daec
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9cc1daec
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9cc1daec
Branch: refs/heads/ignite-5075-cc-debug
Commit: 9cc1daeccd99223eaed66e64ddabe860c9eb5075
Parents: d2942a5 ff0a2dd
Author: sboikov <sb...@gridgain.com>
Authored: Thu May 25 16:56:14 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu May 25 16:56:14 2017 +0300
----------------------------------------------------------------------
.../CacheContinuousQueryEventBuffer.java | 29 ++++++++++++--------
.../CacheContinuousQueryPartitionRecovery.java | 22 ++++++++-------
2 files changed, 29 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/9cc1daec/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEventBuffer.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEventBuffer.java
index 264a6f1,f496c8c..d65731b
--- 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
@@@ -28,7 -28,6 +28,8 @@@ import java.util.concurrent.ConcurrentS
import java.util.concurrent.atomic.AtomicReference;
import org.apache.ignite.IgniteSystemProperties;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.spi.communication.tcp.TestDebugLog;
++import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.jetbrains.annotations.Nullable;
/**
@@@ -99,17 -96,7 +98,15 @@@ public class CacheContinuousQueryEventB
else
ret = entries;
+ if (ret != null) {
+ for (CacheContinuousQueryEntry e : ret)
+ TestDebugLog.addEntryMessage(part,
+ e.updateCounter(),
+ "filtered1 " + e.filteredCount() +
+ " reset backup");
+ }
- else
- TestDebugLog.addEntryMessage(part, part, "no backup");
+
- return entries;
+ return ret;
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/9cc1daec/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryPartitionRecovery.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryPartitionRecovery.java
index e031428,59252d2..e72f7b6
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryPartitionRecovery.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryPartitionRecovery.java
@@@ -277,14 -240,11 +277,16 @@@ class CacheContinuousQueryPartitionReco
iter.remove();
}
- else if (!pending.isFiltered()) {
- skip = true;
-
- TestDebugLog.addEntryMessage(entry.partition(),
- entry.updateCounter(),
- "stop process last=" + lastFiredEvt + " cntr=" + e.getKey() + " topVer=" + e.getValue().topologyVersion() + " f=" + pending.filteredCount());
-
- break;
+ else {
+ if (pending.isFiltered())
+ skippedFiltered = true;
- else
++ else {
++ TestDebugLog.addEntryMessage(entry.partition(),
++ entry.updateCounter(),
++ "stop process last=" + lastFiredEvt + " cntr=" + e.getKey() + " topVer=" + e.getValue().topologyVersion() + " f=" + pending.filteredCount());
++
+ break;
++ }
}
}