ignite-1016 Tests are fixed.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1c51bf6f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1c51bf6f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1c51bf6f Branch: refs/heads/pull-80-head Commit: 1c51bf6f9bf9d5bdc217f025a3b4b9ce200b7b1b Parents: a663f47 Author: agura <[email protected]> Authored: Thu Sep 10 15:37:26 2015 +0300 Committer: agura <[email protected]> Committed: Thu Sep 10 15:37:26 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/cache/affinity/fair/FairAffinityFunction.java | 2 +- .../cache/affinity/rendezvous/RendezvousAffinityFunction.java | 2 +- .../processors/cache/IgniteCacheAbstractQuerySelfTest.java | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/1c51bf6f/modules/core/src/main/java/org/apache/ignite/cache/affinity/fair/FairAffinityFunction.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/affinity/fair/FairAffinityFunction.java b/modules/core/src/main/java/org/apache/ignite/cache/affinity/fair/FairAffinityFunction.java index 1750d1e..e008470 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/affinity/fair/FairAffinityFunction.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/affinity/fair/FairAffinityFunction.java @@ -94,7 +94,7 @@ public class FairAffinityFunction implements AffinityFunction { /** Logger instance. */ @LoggerResource - private IgniteLogger log; + private transient IgniteLogger log; /** Optional backup filter. First node is primary, second node is a node being tested. */ private IgniteBiPredicate<ClusterNode, ClusterNode> backupFilter; http://git-wip-us.apache.org/repos/asf/ignite/blob/1c51bf6f/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java b/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java index ef0b25d..c7ee006 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java @@ -117,7 +117,7 @@ public class RendezvousAffinityFunction implements AffinityFunction, Externaliza /** Logger instance. */ @LoggerResource - private IgniteLogger log; + private transient IgniteLogger log; /** * Empty constructor with all defaults. http://git-wip-us.apache.org/repos/asf/ignite/blob/1c51bf6f/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java index cb39660..2a00973 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java @@ -47,6 +47,7 @@ import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cache.CachePeekMode; +import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction; import org.apache.ignite.cache.query.QueryCursor; import org.apache.ignite.cache.query.ScanQuery; import org.apache.ignite.cache.query.SqlFieldsQuery; @@ -178,6 +179,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac UUID.class, Person.class, IgniteCacheReplicatedQuerySelfTest.CacheKey.class, IgniteCacheReplicatedQuerySelfTest.CacheValue.class ); + cc.setAffinity(new RendezvousAffinityFunction(false)); // Explicitly set number of backups equal to number of grids. if (cacheMode() == CacheMode.PARTITIONED)
