ignite-sql-tests - compilation
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9a694ab1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9a694ab1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9a694ab1 Branch: refs/heads/ignite-sql-tests Commit: 9a694ab1192562b0b90c624b97d1cfd29eff63f8 Parents: 4829aab Author: S.Vladykin <svlady...@gridgain.com> Authored: Sat Feb 7 18:49:28 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Sat Feb 7 18:49:28 2015 +0300 ---------------------------------------------------------------------- .../GridCacheContinuousQueryAbstractSelfTest.java | 18 +++++++++--------- .../IgniteCacheAbstractFieldsQuerySelfTest.java | 2 +- ...IgniteCachePartitionedFieldsQuerySelfTest.java | 5 +---- .../IgniteCacheReplicatedFieldsQuerySelfTest.java | 1 + .../IgniteCacheReplicatedQuerySelfTest.java | 1 + 5 files changed, 13 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a694ab1/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java index ab65c33..7615f44 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java @@ -95,7 +95,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo cfg.setDiscoverySpi(disco); - cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); + cfg.setMarshaller(new OptimizedMarshaller(false)); return cfg; } @@ -1422,11 +1422,11 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo final CountDownLatch latch = new CountDownLatch(50); final CountDownLatch execLatch = new CountDownLatch(cacheMode() == REPLICATED ? 1 : gridCount()); - IgnitePredicate<IgniteEvent> lsnr = new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { - assert evt instanceof IgniteCacheQueryReadEvent; + IgnitePredicate<Event> lsnr = new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { + assert evt instanceof CacheQueryReadEvent; - IgniteCacheQueryReadEvent qe = (IgniteCacheQueryReadEvent)evt; + CacheQueryReadEvent qe = (CacheQueryReadEvent)evt; assertEquals(CONTINUOUS, qe.queryType()); assertNull(qe.cacheName()); @@ -1446,11 +1446,11 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo } }; - IgnitePredicate<IgniteEvent> execLsnr = new IgnitePredicate<IgniteEvent>() { - @Override public boolean apply(IgniteEvent evt) { - assert evt instanceof IgniteCacheQueryExecutedEvent; + IgnitePredicate<Event> execLsnr = new IgnitePredicate<Event>() { + @Override public boolean apply(Event evt) { + assert evt instanceof CacheQueryExecutedEvent; - IgniteCacheQueryExecutedEvent qe = (IgniteCacheQueryExecutedEvent)evt; + CacheQueryExecutedEvent qe = (CacheQueryExecutedEvent)evt; assertEquals(CONTINUOUS, qe.queryType()); assertNull(qe.cacheName()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a694ab1/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java index 4ce6e75..b62342c 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java @@ -65,7 +65,7 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); + cfg.setMarshaller(new OptimizedMarshaller(false)); if (hasCache) cfg.setCacheConfiguration(cache(null, null), cache(CACHE, null), cache(EMPTY_CACHE, null)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a694ab1/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCachePartitionedFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCachePartitionedFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCachePartitionedFieldsQuerySelfTest.java index 3c5741d..9803104 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCachePartitionedFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCachePartitionedFieldsQuerySelfTest.java @@ -18,13 +18,10 @@ package org.apache.ignite.internal.processors.cache.distributed.near; import org.apache.ignite.cache.*; -import org.apache.ignite.cache.affinity.*; -import org.apache.ignite.cache.query.*; +import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.*; import org.jetbrains.annotations.*; -import java.util.*; - import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a694ab1/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedFieldsQuerySelfTest.java index 0774f9b..9b39e20 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedFieldsQuerySelfTest.java @@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.cache.distributed.replicated; import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.cache.query.*; +import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.testframework.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a694ab1/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedQuerySelfTest.java index b80de17..7a9a52a 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedQuerySelfTest.java @@ -21,6 +21,7 @@ import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.cache.query.*; import org.apache.ignite.cache.query.annotations.*; +import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*;
