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 2016/04/26 11:40:57 UTC
ignite git commit: IGNITE-3004 Increase coverage.
Repository: ignite
Updated Branches:
refs/heads/ignite-3004 0e006d399 -> ef93975fd
IGNITE-3004 Increase coverage.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ef93975f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ef93975f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ef93975f
Branch: refs/heads/ignite-3004
Commit: ef93975fdb8223627219ddf5cdff8c9fbe37bcb4
Parents: 0e006d3
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Tue Apr 26 12:40:41 2016 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Tue Apr 26 12:40:41 2016 +0300
----------------------------------------------------------------------
.../continuous/CacheContinuousQueryHandler.java | 42 ++++++++++----------
.../CacheContinuousQueryVariationsTest.java | 8 +++-
2 files changed, 28 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ef93975f/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 b29f7cb..b0f4d62 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
@@ -787,27 +787,27 @@ public class CacheContinuousQueryHandler<K, V> implements GridContinuousHandler
U.error(ctx.log(getClass()), "Failed to send event notification to node: " + nodeId, ex);
}
-// if (recordIgniteEvt && notify) {
-// ctx.event().record(new CacheQueryReadEvent<>(
-// ctx.discovery().localNode(),
-// "Continuous query executed.",
-// EVT_CACHE_QUERY_OBJECT_READ,
-// CacheQueryType.CONTINUOUS.name(),
-// cacheName,
-// null,
-// null,
-// null,
-// getEventFilter() instanceof CacheEntryEventSerializableFilter ?
-// (CacheEntryEventSerializableFilter)getEventFilter() : null,
-// null,
-// nodeId,
-// taskName(),
-// evt.getKey(),
-// evt.getValue(),
-// evt.getOldValue(),
-// null
-// ));
-// }
+ if (recordIgniteEvt && notify) {
+ ctx.event().record(new CacheQueryReadEvent<>(
+ ctx.discovery().localNode(),
+ "Continuous query executed.",
+ EVT_CACHE_QUERY_OBJECT_READ,
+ CacheQueryType.CONTINUOUS.name(),
+ cacheName,
+ null,
+ null,
+ null,
+ getEventFilter() instanceof CacheEntryEventSerializableFilter ?
+ (CacheEntryEventSerializableFilter)getEventFilter() : null,
+ null,
+ nodeId,
+ taskName(),
+ evt.getKey(),
+ evt.getValue(),
+ evt.getOldValue(),
+ null
+ ));
+ }
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/ef93975f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryVariationsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryVariationsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryVariationsTest.java
index 7c9ec52..b92c7cc 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryVariationsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryVariationsTest.java
@@ -48,7 +48,6 @@ import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.binary.BinaryObject;
import org.apache.ignite.cache.CacheEntryEventSerializableFilter;
-import org.apache.ignite.cache.CacheMemoryMode;
import org.apache.ignite.cache.query.ContinuousQuery;
import org.apache.ignite.cache.query.QueryCursor;
import org.apache.ignite.configuration.CacheConfiguration;
@@ -149,6 +148,13 @@ public class CacheContinuousQueryVariationsTest extends IgniteCacheConfigVariati
/**
* @throws Exception If failed.
*/
+ public void testRandomOperationWithKeepBinary() throws Exception {
+ testRandomOperation(true, true, false, false, true);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
public void testRandomOperationWithAsyncCallback() throws Exception {
testRandomOperation(true, true, false, true, false);
}