Repository: ignite Updated Branches: refs/heads/ignite-5075-cc b6d938482 -> a1a5fa3e1
cc Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a1a5fa3e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a1a5fa3e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a1a5fa3e Branch: refs/heads/ignite-5075-cc Commit: a1a5fa3e1cb0e3c378d1f77d33939b19d743019b Parents: b6d9384 Author: sboikov <[email protected]> Authored: Mon May 29 14:10:00 2017 +0300 Committer: sboikov <[email protected]> Committed: Mon May 29 14:10:00 2017 +0300 ---------------------------------------------------------------------- .../cache/query/continuous/CacheContinuousQueryEntry.java | 5 +---- .../cache/query/continuous/CacheContinuousQueryEventBuffer.java | 2 ++ .../cache/query/continuous/CacheContinuousQueryHandler.java | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a1a5fa3e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java index d1af1b1..7e3f0b5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java @@ -209,9 +209,6 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable, Message { */ void markFiltered() { flags |= FILTERED_ENTRY; - key = null; - newVal = null; - oldVal = null; depInfo = null; } @@ -242,7 +239,7 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable, Message { * @return If entry filtered then will return light-weight <i><b>new entry</b></i> without values and key * (avoid to huge memory consumption), otherwise {@code this}. */ - CacheContinuousQueryEntry forBackupQueue() { + CacheContinuousQueryEntry copyWithDataReset() { if (!isFiltered()) return this; http://git-wip-us.apache.org/repos/asf/ignite/blob/a1a5fa3e/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 74b3ff8..336f650 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 @@ -429,6 +429,8 @@ public class CacheContinuousQueryEventBuffer { if (entries == null) return RETRY; + entry = entry.copyWithDataReset(); + entries[pos] = entry; int next = lastProc + 1; http://git-wip-us.apache.org/repos/asf/ignite/blob/a1a5fa3e/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 ebfbe4f..e5347c8 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 @@ -893,7 +893,7 @@ public class CacheContinuousQueryHandler<K, V> implements GridContinuousHandler CacheContinuousQueryEventBuffer buf = partitionBuffer(cctx, e.partition()); - buf.processEntry(e.forBackupQueue(), true); + buf.processEntry(e.copyWithDataReset(), true); } /**
