ignite-sql-old - fixes after merge
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a8573b48 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a8573b48 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a8573b48 Branch: refs/heads/sprint-1 Commit: a8573b48ad454c7c27271e8eb2dd512ff9fb1f05 Parents: ddbfb71 Author: S.Vladykin <svlady...@gridgain.com> Authored: Sun Feb 15 06:11:40 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Sun Feb 15 06:11:40 2015 +0300 ---------------------------------------------------------------------- .../continuous/GridContinuousOperationsLoadTest.java | 13 +++++-------- .../near/GridCachePartitionedQuerySelfTest.java | 1 + .../testsuites/IgniteCacheQuerySelfTestSuite.java | 1 + 3 files changed, 7 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a8573b48/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java index ad49cae..75ece98 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java @@ -28,7 +28,6 @@ import org.apache.ignite.internal.util.typedef.internal.*; import org.jdk8.backport.*; import org.jetbrains.annotations.*; -import javax.cache.event.CacheEntryEvent; import javax.cache.event.*; import java.util.*; import java.util.concurrent.*; @@ -40,7 +39,6 @@ import static org.apache.ignite.testframework.GridLoadTestUtils.*; import static org.apache.ignite.testframework.GridTestUtils.*; /** - * Load test for {@link org.apache.ignite.cache.query.CacheContinuousQuery}. */ public class GridContinuousOperationsLoadTest { /** @@ -80,7 +78,6 @@ public class GridContinuousOperationsLoadTest { try (Ignite ignite = Ignition.start(cfgPath)) { final IgniteCache<Object, Object> cache = ignite.jcache(cacheName); - final GridCache<Object, Object> cache = ((IgniteKernal)ignite).cache(cacheName); if (cache == null) throw new IgniteCheckedException("Cache is not configured: " + cacheName); @@ -100,8 +97,8 @@ public class GridContinuousOperationsLoadTest { if (useQry) { ContinuousQuery<Object, Object> qry = Query.continuous(); - qry.setLocalListener(new CacheEntryUpdatedListener<Object, Object>() { - @Override public void onUpdated(Iterable<CacheEntryEvent<?, ?>> evts) { + qry.setLocalListener(new CacheEntryUpdatedListener<Object,Object>() { + @Override public void onUpdated(Iterable<CacheEntryEvent<?,?>> evts) { if (cbSleepMs > 0) { try { U.sleep(cbSleepMs); @@ -111,13 +108,13 @@ public class GridContinuousOperationsLoadTest { } } - for (CacheEntryEvent<?, ?> ignored : evts) + for (CacheEntryEvent<?,?> ignored : evts) cbCntr.incrementAndGet(); } }); - qry.setRemoteFilter(new CacheEntryEventFilter<Object, Object>() { - @Override public boolean evaluate(CacheEntryEvent<?, ?> evt) { + qry.setRemoteFilter(new CacheEntryEventFilter<Object,Object>() { + @Override public boolean evaluate(CacheEntryEvent<?,?> evt) { if (filterSleepMs > 0) { try { U.sleep(filterSleepMs); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a8573b48/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java index 91e4f7d..996be84 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java @@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache.distributed.near; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.internal.util.lang.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a8573b48/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java index cd2cf62..a13cf35 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java @@ -63,6 +63,7 @@ public class IgniteCacheQuerySelfTestSuite extends TestSuite { suite.addTestSuite(GridCacheQueryNodeRestartSelfTest.class); suite.addTestSuite(GridCacheReduceQueryMultithreadedSelfTest.class); suite.addTestSuite(GridCacheCrossCacheQuerySelfTest.class); + suite.addTestSuite(GridCacheCrossCacheQuerySelfTestNewApi.class); suite.addTestSuite(GridCacheSqlQueryMultiThreadedSelfTest.class); // Fields queries.
