cc
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6c73a366 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6c73a366 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6c73a366 Branch: refs/heads/ignite-5075-cc-debug Commit: 6c73a36671d10db7739c76fc4018d4b43f83cb5b Parents: e24b538 Author: sboikov <sboi...@gridgain.com> Authored: Fri May 26 14:11:23 2017 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri May 26 14:11:23 2017 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheIoManager.java | 6 +++++- .../query/continuous/CacheContinuousQueryEventBuffer.java | 3 +-- 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6c73a366/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java index fdd29e4..bb31645 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java @@ -874,7 +874,11 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter { finally { // Reset thread local context. cctx.tm().resetContext(); - cctx.mvcc().contextReset(); + + GridCacheMvccManager mvcc = cctx.mvcc(); + + if (mvcc != null) + mvcc.contextReset(); // Unwind eviction notifications. if (msg instanceof IgniteTxStateAware) { http://git-wip-us.apache.org/repos/asf/ignite/blob/6c73a366/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 acc6d50..31b7ace 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 @@ -35,9 +35,8 @@ import org.jetbrains.annotations.Nullable; */ public class CacheContinuousQueryEventBuffer { /** */ - // TODO increase to 1000 private static final int BUF_SIZE = - IgniteSystemProperties.getInteger("IGNITE_CONTINUOUS_QUERY_SERVER_BUFFER_SIZE", 5); + IgniteSystemProperties.getInteger("IGNITE_CONTINUOUS_QUERY_SERVER_BUFFER_SIZE", 1000); /** */ private static final Object RETRY = new Object();
